X-Git-Url: http://www.privoxy.org/gitweb/?p=privoxy.git;a=blobdiff_plain;f=filters.c;h=9a079667562d8264a4973059dc3a2a97defd90c3;hp=cc06229d36799ca3011ef99c286e54f263132f16;hb=ab9670e583d3c3bdadf767d59908c8f0771284e3;hpb=2ed7b3cf5bffa4ca40fcce5158f802eb19ab1022 diff --git a/filters.c b/filters.c index cc06229d..9a079667 100644 --- a/filters.c +++ b/filters.c @@ -1,4 +1,4 @@ -const char filters_rcs[] = "$Id: filters.c,v 1.21 2001/07/13 13:59:53 oes Exp $"; +const char filters_rcs[] = "$Id: filters.c,v 1.27 2001/08/05 16:06:20 jongfoster Exp $"; /********************************************************************* * * File : $Source: /cvsroot/ijbswa/current/filters.c,v $ @@ -38,6 +38,33 @@ const char filters_rcs[] = "$Id: filters.c,v 1.21 2001/07/13 13:59:53 oes Exp $" * * Revisions : * $Log: filters.c,v $ + * Revision 1.27 2001/08/05 16:06:20 jongfoster + * Modifiying "struct map" so that there are now separate header and + * "map_entry" structures. This means that functions which modify a + * map no longer need to return a pointer to the modified map. + * Also, it no longer reverses the order of the entries (which may be + * important with some advanced template substitutions). + * + * Revision 1.26 2001/07/30 22:08:36 jongfoster + * Tidying up #defines: + * - All feature #defines are now of the form FEATURE_xxx + * - Permanently turned off WIN_GUI_EDIT + * - Permanently turned on WEBDAV and SPLIT_PROXY_ARGS + * + * Revision 1.25 2001/07/26 10:09:46 oes + * Made browser detection a little less naive + * + * Revision 1.24 2001/07/25 17:22:51 oes + * Added workaround for Netscape bug that prevents display of page when loading a component fails. + * + * Revision 1.23 2001/07/23 13:40:12 oes + * Fixed bug that caused document body to be dropped when pcrs joblist was empty. + * + * Revision 1.22 2001/07/18 12:29:34 oes + * - Made gif_deanimate_response respect + * csp->action->string[ACTION_STRING_DEANIMATE] + * - Logging cosmetics + * * Revision 1.21 2001/07/13 13:59:53 oes * - Introduced gif_deanimate_response which shares the * generic content modification interface of pcrs_filter_response @@ -275,7 +302,7 @@ const char filters_h_rcs[] = FILTERS_H_VERSION; #define ijb_isdigit(__X) isdigit((int)(unsigned char)(__X)) -#ifdef ACL_FILES +#ifdef FEATURE_ACL /********************************************************************* * * Function : block_acl @@ -409,7 +436,7 @@ int acl_addr(char *aspec, struct access_control_addr *aca) return(0); } -#endif /* def ACL_FILES */ +#endif /* def FEATURE_ACL */ /********************************************************************* @@ -426,9 +453,10 @@ int acl_addr(char *aspec, struct access_control_addr *aca) *********************************************************************/ struct http_response *block_url(struct client_state *csp) { +#ifdef FEATURE_IMAGE_BLOCKING char *p; +#endif /* def FEATURE_IMAGE_BLOCKING */ struct http_response *rsp; - struct map *exports = NULL; /* * If it's not blocked, don't block it ;-) @@ -450,7 +478,7 @@ struct http_response *block_url(struct client_state *csp) * If it's an image-url, send back an image or redirect * as specified by the relevant +image action */ -#ifdef IMAGE_BLOCKING +#ifdef FEATURE_IMAGE_BLOCKING if (((csp->action->flags & ACTION_IMAGE_BLOCKER) != 0) && is_imageurl(csp)) { @@ -479,29 +507,45 @@ struct http_response *block_url(struct client_state *csp) } } else -#endif /* def IMAGE_BLOCKING */ +#endif /* def FEATURE_IMAGE_BLOCKING */ /* * Else, generate an HTML "blocked" message: */ { - - exports = default_exports(csp, NULL); -#ifdef FORCE_LOAD - exports = map(exports, "force-prefix", 1, FORCE_PREFIX, 1); -#else - exports = map_block_killer(exports, "force-support"); -#endif /* ndef FORCE_LOAD */ - - exports = map(exports, "hostport", 1, csp->http->hostport, 1); - exports = map(exports, "hostport-html", 1, html_encode(csp->http->hostport), 0); - exports = map(exports, "path", 1, csp->http->path, 1); - exports = map(exports, "path-html", 1, html_encode(csp->http->path), 0); + struct map * exports = default_exports(csp, NULL); +#ifdef FEATURE_FORCE_LOAD + map(exports, "force-prefix", 1, FORCE_PREFIX, 1); +#else /* ifndef FEATURE_FORCE_LOAD */ + map_block_killer(exports, "force-support"); +#endif /* ndef FEATURE_FORCE_LOAD */ + + map(exports, "hostport", 1, csp->http->hostport, 1); + map(exports, "hostport-html", 1, html_encode(csp->http->hostport), 0); + map(exports, "path", 1, csp->http->path, 1); + map(exports, "path-html", 1, html_encode(csp->http->path), 0); rsp->body = fill_template(csp, "blocked", exports); free_map(exports); - rsp->status = strdup("403 Request for blocked URL"); + /* + * Workaround for stupid Netscape bug which prevents + * pages from being displayed if loading a referenced + * JavaScript or style sheet fails. So make it appear + * as if it succeeded. + */ + if (csp->http->user_agent + && !strncmpic(csp->http->user_agent, "mozilla", 7) + && !strstr(csp->http->user_agent, "compatible") + && !strstr(csp->http->user_agent, "Opera")) + { + rsp->status = strdup("200 Request for blocked URL"); + } + else + { + rsp->status = strdup("404 Request for blocked URL"); + } + } return(finish_http_response(rsp)); @@ -509,7 +553,7 @@ struct http_response *block_url(struct client_state *csp) } -#ifdef TRUST_FILES +#ifdef FEATURE_TRUST /********************************************************************* * * Function : trust_url FIXME: I should be called distrust_url @@ -526,7 +570,7 @@ struct http_response *block_url(struct client_state *csp) struct http_response *trust_url(struct client_state *csp) { struct http_response *rsp; - struct map *exports = NULL; + struct map * exports; char buf[BUFFER_SIZE], *p = NULL; struct url_spec **tl, *t; @@ -545,25 +589,26 @@ struct http_response *trust_url(struct client_state *csp) { return NULL; } + exports = default_exports(csp, NULL); /* * Export the host, port, and referrer information */ - exports = map(exports, "hostport", 1, csp->http->hostport, 1); - exports = map(exports, "path", 1, csp->http->path, 1); - exports = map(exports, "hostport-html", 1, html_encode(csp->http->hostport), 0); - exports = map(exports, "path-html", 1, html_encode(csp->http->path), 0); + map(exports, "hostport", 1, csp->http->hostport, 1); + map(exports, "path", 1, csp->http->path, 1); + map(exports, "hostport-html", 1, html_encode(csp->http->hostport), 0); + map(exports, "path-html", 1, html_encode(csp->http->path), 0); if (csp->referrer && strlen(csp->referrer) > 9) { - exports = map(exports, "referrer", 1, csp->referrer + 9, 1); - exports = map(exports, "referrer-html", 1, html_encode(csp->referrer + 9), 0); + map(exports, "referrer", 1, csp->referrer + 9, 1); + map(exports, "referrer-html", 1, html_encode(csp->referrer + 9), 0); } else { - exports = map(exports, "referrer", 1, "unknown", 1); - exports = map(exports, "referrer-html", 1, "unknown", 1); + map(exports, "referrer", 1, "unknown", 1); + map(exports, "referrer-html", 1, "unknown", 1); } /* @@ -574,7 +619,7 @@ struct http_response *trust_url(struct client_state *csp) sprintf(buf, "