X-Git-Url: http://www.privoxy.org/gitweb/?p=privoxy.git;a=blobdiff_plain;f=filters.c;h=c22d0b1a0c25733d661d5e979f121482e92a2ac5;hp=3586be0bc618e8bce0862b9aaa3ccc731e8d4b27;hb=4101601d163aad202638f7bb002bdc4fa71649d3;hpb=8eb4a58566a5aa38aa94f372a3fdeed87bcef2f2
diff --git a/filters.c b/filters.c
index 3586be0b..c22d0b1a 100644
--- a/filters.c
+++ b/filters.c
@@ -1,4 +1,4 @@
-const char filters_rcs[] = "$Id: filters.c,v 1.17 2001/06/09 10:55:28 jongfoster Exp $";
+const char filters_rcs[] = "$Id: filters.c,v 1.26 2001/07/30 22:08:36 jongfoster Exp $";
/*********************************************************************
*
* File : $Source: /cvsroot/ijbswa/current/filters.c,v $
@@ -8,7 +8,7 @@ const char filters_rcs[] = "$Id: filters.c,v 1.17 2001/06/09 10:55:28 jongfoster
* `acl_addr', `add_stats', `block_acl', `block_imageurl',
* `block_url', `url_actions', `domaincmp', `dsplit',
* `filter_popups', `forward_url', 'redirect_url',
- * `ij_untrusted_url', `intercept_url', `re_process_buffer',
+ * `ij_untrusted_url', `intercept_url', `pcrs_filter_respose',
* `show_proxy_args', 'ijb_send_banner', and `trust_url'
*
* Copyright : Written by and Copyright (C) 2001 the SourceForge
@@ -38,6 +38,66 @@ const char filters_rcs[] = "$Id: filters.c,v 1.17 2001/06/09 10:55:28 jongfoster
*
* Revisions :
* $Log: filters.c,v $
+ * 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
+ * and acts as a wrapper to deanimate.c:gif_deanimate()
+ * - Renamed re_process_buffer to pcrs_filter_response
+ * - pcrs_filter_response now returns NULL on failiure
+ * - Removed all #ifdef PCRS
+ *
+ * Revision 1.20 2001/07/01 17:01:04 oes
+ * Added comments and missing return statement in is_untrusted_url()
+ *
+ * Revision 1.19 2001/06/29 21:45:41 oes
+ * Indentation, CRLF->LF, Tab-> Space
+ *
+ * Revision 1.18 2001/06/29 13:27:38 oes
+ * - Cleaned up, renamed and reorderd functions
+ * and improved comments
+ *
+ * - block_url:
+ * - Ported to CGI platform. Now delivers
+ * http_response or NULL
+ * - Unified HTML and GIF generation (moved image detection
+ * and GIF generation here from jcc.c:chat())
+ * - Fixed HTTP status to:
+ * - 403 (Forbidden) for the "blocked" HTML message
+ * - 200 (OK) for GIF answers
+ * - 302 (Redirect) for redirect to GIF
+ *
+ * - trust_url:
+ * - Ported to CGI platform. Now delivers
+ * http_response or NULL
+ * - Separated detection of untrusted URL into
+ * (bool)is_untrusted_url
+ * - Added enforcement of untrusted requests
+ *
+ * - Moved redirect_url() from cgi.c to here
+ * and ported it to the CGI platform
+ *
+ * - Removed logentry from cancelled commit
+ *
* Revision 1.17 2001/06/09 10:55:28 jongfoster
* Changing BUFSIZ ==> BUFFER_SIZE
*
@@ -217,6 +277,7 @@ const char filters_rcs[] = "$Id: filters.c,v 1.17 2001/06/09 10:55:28 jongfoster
#include "actions.h"
#include "cgi.h"
#include "list.h"
+#include "deanimate.h"
#ifdef _WIN32
#include "win32.h"
@@ -234,7 +295,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
@@ -251,8 +312,7 @@ const char filters_h_rcs[] = FILTERS_H_VERSION;
* Returns : 0 = FALSE (don't block) and 1 = TRUE (do block)
*
*********************************************************************/
-int block_acl(struct access_control_addr *dst,
- struct client_state *csp)
+int block_acl(struct access_control_addr *dst, struct client_state *csp)
{
struct access_control_list *acl = csp->config->acl;
@@ -369,7 +429,7 @@ int acl_addr(char *aspec, struct access_control_addr *aca)
return(0);
}
-#endif /* def ACL_FILES */
+#endif /* def FEATURE_ACL */
/*********************************************************************
@@ -386,9 +446,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;
- struct http_response *rsp;
- struct map *exports = NULL;
+#endif /* def FEATURE_IMAGE_BLOCKING */
+ struct http_response *rsp;
/*
* If it's not blocked, don't block it ;-)
@@ -410,11 +471,11 @@ 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
- if (((csp->action->flags & ACTION_IMAGE_BLOCKER) != 0)
+#ifdef FEATURE_IMAGE_BLOCKING
+ if (((csp->action->flags & ACTION_IMAGE_BLOCKER) != 0)
&& is_imageurl(csp))
- {
- /* determine HOW images should be blocked */
+ {
+ /* determine HOW images should be blocked */
p = csp->action->string[ACTION_STRING_IMAGE_BLOCKER];
/* and handle accordingly: */
@@ -439,29 +500,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));
@@ -469,7 +546,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
@@ -486,7 +563,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;
@@ -495,7 +572,7 @@ struct http_response *trust_url(struct client_state *csp)
*/
if (!is_untrusted_url(csp))
{
- return NULL;
+ return NULL;
}
/*
@@ -505,25 +582,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);
}
/*
@@ -534,7 +612,7 @@ struct http_response *trust_url(struct client_state *csp)
sprintf(buf, "%s\n", t->spec);
p = strsav(p, buf);
}
- exports = map(exports, "trusted-referrers", 1, p, 0);
+ map(exports, "trusted-referrers", 1, p, 0);
p = NULL;
/*
@@ -546,26 +624,24 @@ struct http_response *trust_url(struct client_state *csp)
for (l = csp->config->trust_info->next; l ; l = l->next)
{
- sprintf(buf,
- " %s
\n",
- l->str, l->str);
+ sprintf(buf, " %s
\n",l->str, l->str);
p = strsav(p, buf);
}
- exports = map(exports, "trust-info", 1, p, 0);
+ map(exports, "trust-info", 1, p, 0);
}
else
- {
- exports = map_block_killer(exports, "have-trust-info");
- }
+ {
+ map_block_killer(exports, "have-trust-info");
+ }
/*
* Export the force prefix or the force conditional block killer
*/
-#ifdef FORCE_LOAD
- exports = map(exports, "force-prefix", 1, FORCE_PREFIX, 1);
-#else
- exports = map_block_killer(exports, "force-support");
-#endif /* ndef FORCE_LOAD */
+#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 */
/*
* Build the response
@@ -576,10 +652,10 @@ struct http_response *trust_url(struct client_state *csp)
return(finish_http_response(rsp));
}
-#endif /* def TRUST_FILES */
+#endif /* def FEATURE_TRUST */
-#ifdef FAST_REDIRECTS
+#ifdef FEATURE_FAST_REDIRECTS
/*********************************************************************
*
* Function : redirect_url
@@ -632,18 +708,18 @@ struct http_response *redirect_url(struct client_state *csp)
}
}
-#endif /* def FAST_REDIRECTS */
+#endif /* def FEATURE_FAST_REDIRECTS */
-#ifdef IMAGE_BLOCKING
+#ifdef FEATURE_IMAGE_BLOCKING
/*********************************************************************
*
* Function : is_imageurl
*
* Description : Given a URL, decide whether it is an image or not,
* using either the info from a previous +image action
- * or, #ifdef DETECT_MSIE_IMAGES, the info from the
- * browser's accept header.
+ * or, #ifdef FEATURE_IMAGE_DETECT_MSIE, the info from
+ * the browser's accept header.
*
* Parameters :
* 1 : csp = Current client state (buffers, headers, etc...)
@@ -654,7 +730,7 @@ struct http_response *redirect_url(struct client_state *csp)
*********************************************************************/
int is_imageurl(struct client_state *csp)
{
-#ifdef DETECT_MSIE_IMAGES
+#ifdef FEATURE_IMAGE_DETECT_MSIE
if ((csp->accept_types
& (ACCEPT_TYPE_IS_MSIE|ACCEPT_TYPE_MSIE_IMAGE|ACCEPT_TYPE_MSIE_HTML))
== (ACCEPT_TYPE_IS_MSIE|ACCEPT_TYPE_MSIE_IMAGE))
@@ -667,15 +743,15 @@ int is_imageurl(struct client_state *csp)
{
return 0;
}
-#endif
+#endif /* def FEATURE_IMAGE_DETECT_MSIE */
return ((csp->action->flags & ACTION_IMAGE) != 0);
}
-#endif /* def IMAGE_BLOCKING */
+#endif /* def FEATURE_IMAGE_BLOCKING */
-#ifdef TRUST_FILES
+#ifdef FEATURE_COOKIE_JAR
/*********************************************************************
*
* Function : is_untrusted_url
@@ -701,11 +777,18 @@ int is_untrusted_url(struct client_state *csp)
struct http_request rhttp[1];
char *p, *h;
+ /*
+ * If we don't have a trustlist, we trust everybody
+ */
if (((fl = csp->tlist) == NULL) || ((b = fl->f) == NULL))
{
return(0);
}
+
+ /*
+ * Do we trust the request URL itself?
+ */
*url = dsplit(csp->http->host);
/* if splitting the domain fails, punt */
@@ -744,7 +827,7 @@ int is_untrusted_url(struct client_state *csp)
if ((csp->referrer == NULL)|| (strlen(csp->referrer) <= 9))
{
/* no referrer was supplied */
- return(1);
+ return(1);
}
/* forge a URL from the referrer so we can use
@@ -764,6 +847,10 @@ int is_untrusted_url(struct client_state *csp)
return(1);
}
+
+ /*
+ * If not, do we maybe trust its referrer?
+ */
*url = dsplit(rhttp->host);
/* if splitting the domain fails, punt */
@@ -824,15 +911,14 @@ int is_untrusted_url(struct client_state *csp)
}
}
}
-
+ return(1);
}
-#endif /* def TRUST_FILES */
+#endif /* def FEATURE_COOKIE_JAR */
-#ifdef PCRS
/*********************************************************************
*
- * Function : re_process_buffer
+ * Function : pcrs_filter_response
*
* Description : Apply all the pcrs jobs from the joblist (re_filterfile)
* to the text buffer that's been accumulated in
@@ -843,10 +929,10 @@ int is_untrusted_url(struct client_state *csp)
* 1 : csp = Current client state (buffers, headers, etc...)
*
* Returns : a pointer to the (newly allocated) modified buffer.
- * or an empty string in case something went wrong
+ * or NULL in case something went wrong
*
*********************************************************************/
-char *re_process_buffer(struct client_state *csp)
+char *pcrs_filter_response(struct client_state *csp)
{
int hits=0;
int size = csp->iob->eod - csp->iob->cur;
@@ -860,13 +946,19 @@ char *re_process_buffer(struct client_state *csp)
/* Sanity first ;-) */
if (size <= 0)
{
- return(strdup(""));
+ return(NULL);
}
if ( ( NULL == (fl = csp->rlist) ) || ( NULL == (b = fl->f) ) )
{
log_error(LOG_LEVEL_ERROR, "Unable to get current state of regexp filtering.");
- return(strdup(""));
+ return(NULL);
+ }
+
+ if ( NULL == b->joblist )
+ {
+ log_error(LOG_LEVEL_RE_FILTER, "Empty joblist. Nothing to do.");
+ return(NULL);
}
log_error(LOG_LEVEL_RE_FILTER, "re_filtering %s%s (size %d) ...",
@@ -889,7 +981,57 @@ char *re_process_buffer(struct client_state *csp)
return(new);
}
-#endif /* def PCRS */
+
+
+/*********************************************************************
+ *
+ * Function : gif_deanimate_response
+ *
+ * Description : Deanimate the GIF image that has been accumulated in
+ * csp->iob->buf and set csp->content_length to the modified
+ * size.
+ *
+ * Parameters :
+ * 1 : csp = Current client state (buffers, headers, etc...)
+ *
+ * Returns : a pointer to the (newly allocated) modified buffer.
+ * or NULL in case something went wrong.
+ *
+ *********************************************************************/
+char *gif_deanimate_response(struct client_state *csp)
+{
+ struct binbuffer *in, *out;
+ char *p;
+ int size = csp->iob->eod - csp->iob->cur;
+
+ if ( (NULL == (in = (struct binbuffer *)zalloc(sizeof *in )))
+ || (NULL == (out = (struct binbuffer *)zalloc(sizeof *out))) )
+ {
+ log_error(LOG_LEVEL_DEANIMATE, "failed! (no mem)");
+ return NULL;
+ }
+
+ in->buffer = csp->iob->cur;
+ in->size = size;
+
+ if (gif_deanimate(in, out, strncmp("last", csp->action->string[ACTION_STRING_DEANIMATE], 4)))
+ {
+ log_error(LOG_LEVEL_DEANIMATE, "failed! (gif parsing)");
+ free(in);
+ buf_free(out);
+ return(NULL);
+ }
+ else
+ {
+ log_error(LOG_LEVEL_DEANIMATE, "Success! GIF shrunk from %d bytes to %d.", size, out->offset);
+ csp->content_length = out->offset;
+ p = out->buffer;
+ free(in);
+ free(out);
+ return(p);
+ }
+
+}
/*********************************************************************
@@ -919,6 +1061,7 @@ void url_actions(struct http_request *http,
}
apply_url_actions(csp->action, http, b);
+
}
@@ -1069,12 +1212,13 @@ struct url_spec dsplit(char *domain)
if (domain[strlen(domain) - 1] == '.')
{
- ret->unanchored |= ANCHOR_RIGHT;
- }
- if (domain[0] == '.')
+ ret->unanchored |= ANCHOR_RIGHT;
+ }
+
+ if (domain[0] == '.')
{
- ret->unanchored |= ANCHOR_LEFT;
- }
+ ret->unanchored |= ANCHOR_LEFT;
+ }
ret->dbuf = strdup(domain);
@@ -1098,7 +1242,6 @@ struct url_spec dsplit(char *domain)
memcpy(ret->dvec, v, size);
}
-
return(*ret);
}
@@ -1136,6 +1279,7 @@ static int simple_domaincmp(char **pv, char **fv, int len)
}
return 0;
+
}
@@ -1218,8 +1362,8 @@ int domaincmp(struct url_spec *pattern, struct url_spec *fqdn)
}
return 1;
}
-}
+}
/*