X-Git-Url: http://www.privoxy.org/gitweb/?p=privoxy.git;a=blobdiff_plain;f=filters.c;h=ff70ac56a6bd954fd50ad6473f5b53f2e3f73c84;hp=dd7ccb4409680751b223dd97049d571a0985bf65;hb=4759fd3d2ee5758c45be960b1dadc71e2e16a555;hpb=5f390b415777db21894f1b856ab3d21c9c24f7c6
diff --git a/filters.c b/filters.c
index dd7ccb44..ff70ac56 100644
--- a/filters.c
+++ b/filters.c
@@ -1,4 +1,4 @@
-const char filters_rcs[] = "$Id: filters.c,v 1.38 2001/10/23 21:32:33 jongfoster Exp $";
+const char filters_rcs[] = "$Id: filters.c,v 1.57 2002/04/08 20:38:34 swa Exp $";
/*********************************************************************
*
* File : $Source: /cvsroot/ijbswa/current/filters.c,v $
@@ -6,13 +6,13 @@ const char filters_rcs[] = "$Id: filters.c,v 1.38 2001/10/23 21:32:33 jongfoster
* Purpose : Declares functions to parse/crunch headers and pages.
* Functions declared include:
* `acl_addr', `add_stats', `block_acl', `block_imageurl',
- * `block_url', `url_actions', `domaincmp', `dsplit',
+ * `block_url', `url_actions', `domain_split',
* `filter_popups', `forward_url', 'redirect_url',
* `ij_untrusted_url', `intercept_url', `pcrs_filter_respose',
- * `show_proxy_args', 'ijb_send_banner', and `trust_url'
+ * 'ijb_send_banner', and `trust_url'
*
* Copyright : Written by and Copyright (C) 2001 the SourceForge
- * IJBSWA team. http://ijbswa.sourceforge.net
+ * Privoxy team. http://www.privoxy.org/
*
* Based on the Internet Junkbuster originally written
* by and Copyright (C) 1997 Anonymous Coders and
@@ -38,6 +38,92 @@ const char filters_rcs[] = "$Id: filters.c,v 1.38 2001/10/23 21:32:33 jongfoster
*
* Revisions :
* $Log: filters.c,v $
+ * Revision 1.57 2002/04/08 20:38:34 swa
+ * fixed JB spelling
+ *
+ * Revision 1.56 2002/04/05 15:51:24 oes
+ * - bugfix: error-pages now get correct request protocol
+ * - fix for invalid HTML in trust info
+ *
+ * Revision 1.55 2002/04/02 16:13:51 oes
+ * Fix: No "Go there anyway" for SSL
+ *
+ * Revision 1.54 2002/04/02 14:55:56 oes
+ * Bugfix: is_untrusted_url() now depends on FEATURE_TRUST, not FEATURE_COOKIE_JAR
+ *
+ * Revision 1.53 2002/03/26 22:29:54 swa
+ * we have a new homepage!
+ *
+ * Revision 1.52 2002/03/24 16:35:57 jongfoster
+ * Removing logo
+ *
+ * Revision 1.51 2002/03/24 15:23:33 jongfoster
+ * Name changes
+ *
+ * Revision 1.50 2002/03/24 13:25:43 swa
+ * name change related issues
+ *
+ * Revision 1.49 2002/03/16 20:29:14 oes
+ * Cosmetics
+ *
+ * Revision 1.48 2002/03/13 20:25:34 oes
+ * Better logging for content filters
+ *
+ * Revision 1.47 2002/03/13 00:30:52 jongfoster
+ * Killing warnings
+ * Added option of always sending redirect for imageblock,
+ * currently disabled with #if 0.
+ *
+ * Revision 1.46 2002/03/12 01:42:49 oes
+ * Introduced modular filters
+ *
+ * Revision 1.45 2002/03/08 16:47:50 oes
+ * Added choice beween GIF and PNG built-in images
+ *
+ * Revision 1.44 2002/03/07 03:49:31 oes
+ * - Fixed compiler warnings etc
+ * - Changed built-in images from GIF to PNG
+ * (with regard to Unisys patent issue)
+ * - Added a 4x4 pattern PNG which is less intrusive
+ * than the logo but also clearly marks the deleted banners
+ *
+ * Revision 1.43 2002/01/22 23:51:59 jongfoster
+ * Replacing strsav() with the safer string_append().
+ *
+ * Adding missing html_encode() to error message generators. Where encoded
+ * and unencoded versions of a string were provided, removing the unencoded
+ * one.
+ *
+ * Revision 1.42 2002/01/17 21:00:32 jongfoster
+ * Moving all our URL and URL pattern parsing code to urlmatch.c.
+ *
+ * Using a single, simple url_match(pattern,url) function - rather than
+ * the 3-line match routine which was repeated all over the place.
+ *
+ * Renaming free_url to free_url_spec, since it frees a struct url_spec.
+ *
+ * Using parse_http_url() to parse URLs without faking a HTTP
+ * request line for parse_http_request().
+ *
+ * Revision 1.41 2001/11/13 00:14:07 jongfoster
+ * Fixing stupid bug now I've figured out what || means.
+ * (It always returns 0 or 1, not one of it's paramaters.)
+ *
+ * Revision 1.40 2001/10/26 17:37:55 oes
+ * - Re-enabled Netscape 200/404 bug workaround in block_url():
+ * - Removed OS/2 special case
+ * - Made block_url() independant from sed() having been run
+ * - Made trust_url independant from sed() having been run
+ * - Made is_imageurl independant from sed() having been run.
+ * It now checks User-Agent: and Accept: by itself.
+ *
+ *
+ * Revision 1.39 2001/10/25 03:40:48 david__schmidt
+ * Change in porting tactics: OS/2's EMX porting layer doesn't allow multiple
+ * threads to call select() simultaneously. So, it's time to do a real, live,
+ * native OS/2 port. See defines for __EMX__ (the porting layer) vs. __OS2__
+ * (native). Both versions will work, but using __OS2__ offers multi-threading.
+ *
* Revision 1.38 2001/10/23 21:32:33 jongfoster
* Adding error-checking to selected functions
*
@@ -287,7 +373,7 @@ const char filters_rcs[] = "$Id: filters.c,v 1.38 2001/10/23 21:32:33 jongfoster
* a lot! ;-)
*
* Revision 1.3 2001/05/20 16:44:47 jongfoster
- * Removing last hardcoded JunkBusters.com URLs.
+ * Removing last hardcoded Junkbusters.com URLs.
*
* Revision 1.2 2001/05/20 01:21:20 jongfoster
* Version 2.9.4 checkin.
@@ -343,6 +429,7 @@ const char filters_rcs[] = "$Id: filters.c,v 1.38 2001/10/23 21:32:33 jongfoster
#include "cgi.h"
#include "list.h"
#include "deanimate.h"
+#include "urlmatch.h"
#ifdef _WIN32
#include "win32.h"
@@ -425,7 +512,7 @@ int block_acl(struct access_control_addr *dst, struct client_state *csp)
*
* Function : acl_addr
*
- * Description : Called from `load_aclfile' to parse an ACL address.
+ * Description : Called from `load_config' to parse an ACL address.
*
* Parameters :
* 1 : aspec = String specifying ACL address.
@@ -442,7 +529,7 @@ int acl_addr(char *aspec, struct access_control_addr *aca)
masklength = 32;
port = 0;
- if ((p = strchr(aspec, '/')))
+ if ((p = strchr(aspec, '/')) != NULL)
{
*p++ = '\0';
@@ -458,7 +545,7 @@ int acl_addr(char *aspec, struct access_control_addr *aca)
return(-1);
}
- if ((p = strchr(aspec, ':')))
+ if ((p = strchr(aspec, ':')) != NULL)
{
*p++ = '\0';
@@ -473,9 +560,8 @@ int acl_addr(char *aspec, struct access_control_addr *aca)
aca->addr = ntohl(resolve_hostname_to_ip(aspec));
- if (aca->addr == -1)
+ if (aca->addr == INADDR_NONE)
{
- log_error(LOG_LEVEL_ERROR, "can't resolve address for %s", aspec);
return(-1);
}
@@ -623,18 +709,20 @@ struct http_response *block_url(struct client_state *csp)
/* determine HOW images should be blocked */
p = csp->action->string[ACTION_STRING_IMAGE_BLOCKER];
+#if 1 /* Two alternative strategies, use this one for now: */
+
/* and handle accordingly: */
- if ((p == NULL) || (0 == strcmpic(p, "logo")))
+ if ((p == NULL) || (0 == strcmpic(p, "pattern")))
{
- rsp->body = bindup(image_junkbuster_gif_data, image_junkbuster_gif_length);
+ rsp->body = bindup(image_pattern_data, image_pattern_length);
if (rsp->body == NULL)
{
free_http_response(rsp);
return cgi_error_memory();
}
- rsp->content_length = image_junkbuster_gif_length;
+ rsp->content_length = image_pattern_length;
- if (enlist_unique_header(rsp->headers, "Content-Type", "image/gif"))
+ if (enlist_unique_header(rsp->headers, "Content-Type", BUILTIN_IMAGE_MIMETYPE))
{
free_http_response(rsp);
return cgi_error_memory();
@@ -643,15 +731,15 @@ struct http_response *block_url(struct client_state *csp)
else if (0 == strcmpic(p, "blank"))
{
- rsp->body = bindup(image_blank_gif_data, image_blank_gif_length);
+ rsp->body = bindup(image_blank_data, image_blank_length);
if (rsp->body == NULL)
{
free_http_response(rsp);
return cgi_error_memory();
}
- rsp->content_length = image_blank_gif_length;
+ rsp->content_length = image_blank_length;
- if (enlist_unique_header(rsp->headers, "Content-Type", "image/gif"))
+ if (enlist_unique_header(rsp->headers, "Content-Type", BUILTIN_IMAGE_MIMETYPE))
{
free_http_response(rsp);
return cgi_error_memory();
@@ -660,7 +748,7 @@ struct http_response *block_url(struct client_state *csp)
else
{
- rsp->status = strdup("302 Local Redirect from Junkbuster");
+ rsp->status = strdup("302 Local Redirect from Privoxy");
if (rsp->status == NULL)
{
free_http_response(rsp);
@@ -673,6 +761,31 @@ struct http_response *block_url(struct client_state *csp)
return cgi_error_memory();
}
}
+
+#else /* Following code is disabled for now */
+
+ /* and handle accordingly: */
+ if ((p == NULL) || (0 == strcmpic(p, "pattern")))
+ {
+ p = CGI_PREFIX "send-banner?type=pattern";
+ }
+ else if (0 == strcmpic(p, "blank"))
+ {
+ p = CGI_PREFIX "send-banner?type=blank";
+ }
+ rsp->status = strdup("302 Local Redirect from Privoxy");
+ if (rsp->status == NULL)
+ {
+ free_http_response(rsp);
+ return cgi_error_memory();
+ }
+
+ if (enlist_unique_header(rsp->headers, "Location", p))
+ {
+ free_http_response(rsp);
+ return cgi_error_memory();
+ }
+#endif /* Preceeding code is disabled for now */
}
else
#endif /* def FEATURE_IMAGE_BLOCKING */
@@ -684,28 +797,17 @@ struct http_response *block_url(struct client_state *csp)
jb_err err;
struct map * exports;
- /* FIXME */
-#ifdef __EMX__
- /*
- * The entire OS/2 community will hit the stupid Netscape bug
- * (all three of us! :-) so we'll just keep ourselves out
- * of this contentious debate and special-case ourselves.
- * The problem is... a this point in parsing, we don't know
- * what the csp->http->user_agent is (yet). So we can't use
- * it to decide if we should work around the NS bug or not.
- */
- rsp->status = strdup("200 Request for blocked URL");
-#else
/*
* 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"))
+ if ( NULL != (p = get_header_value(csp->headers, "User-Agent:"))
+ && !strncmpic(p, "mozilla", 7) /* Catch Netscape but */
+ && !strstr(p, "Gecko") /* save Mozilla, */
+ && !strstr(p, "compatible") /* MSIE */
+ && !strstr(p, "Opera")) /* and Opera. */
{
rsp->status = strdup("200 Request for blocked URL");
}
@@ -713,7 +815,7 @@ struct http_response *block_url(struct client_state *csp)
{
rsp->status = strdup("404 Request for blocked URL");
}
-#endif /* __EMX__ */
+
if (rsp->status == NULL)
{
free_http_response(rsp);
@@ -729,14 +831,15 @@ struct http_response *block_url(struct client_state *csp)
#ifdef FEATURE_FORCE_LOAD
err = map(exports, "force-prefix", 1, FORCE_PREFIX, 1);
-#else /* ifndef FEATURE_FORCE_LOAD */
- err = map_block_killer(exports, "force-support");
+ if (csp->http->ssl != 0)
#endif /* ndef FEATURE_FORCE_LOAD */
+ {
+ err = map_block_killer(exports, "force-support");
+ }
- err = err || map(exports, "hostport", 1, csp->http->hostport, 1);
- err = err || map(exports, "hostport-html", 1, html_encode(csp->http->hostport), 0);
- err = err || map(exports, "path", 1, csp->http->path, 1);
- err = err || map(exports, "path-html", 1, html_encode(csp->http->path), 0);
+ if (!err) err = map(exports, "protocol", 1, csp->http->ssl ? "https://" : "http://", 1);
+ if (!err) err = map(exports, "hostport", 1, html_encode(csp->http->hostport), 0);
+ if (!err) err = map(exports, "path", 1, html_encode(csp->http->path), 0);
if (err)
{
@@ -806,22 +909,19 @@ struct http_response *trust_url(struct client_state *csp)
}
/*
- * Export the host, port, and referrer information
+ * Export the protocol, host, port, and referrer information
*/
- err = 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);
+ err = map(exports, "hostport", 1, csp->http->hostport, 1);
+ if (!err) err = map(exports, "protocol", 1, csp->http->ssl ? "https://" : "http://", 1);
+ if (!err) err = map(exports, "path", 1, csp->http->path, 1);
- if (csp->referrer && strlen(csp->referrer) > 9)
+ if (NULL != (p = get_header_value(csp->headers, "Referer:")))
{
- err = err || map(exports, "referrer", 1, csp->referrer + 9, 1);
- err = err || map(exports, "referrer-html", 1, html_encode(csp->referrer + 9), 0);
+ if (!err) err = map(exports, "referrer", 1, html_encode(p), 0);
}
else
{
- err = err || map(exports, "referrer", 1, "unknown", 1);
- err = err || map(exports, "referrer-html", 1, "unknown", 1);
+ if (!err) err = map(exports, "referrer", 1, "unknown", 1);
}
if (err)
@@ -835,7 +935,7 @@ struct http_response *trust_url(struct client_state *csp)
* Export the trust list
*/
p = strdup("");
- for (tl = csp->config->trust_list; (t = *tl) ; tl++)
+ for (tl = csp->config->trust_list; (t = *tl) != NULL ; tl++)
{
sprintf(buf, "%s\n", t->spec);
string_append(&p, buf);
@@ -859,7 +959,7 @@ struct http_response *trust_url(struct client_state *csp)
p = strdup("");
for (l = csp->config->trust_info->first; l ; l = l->next)
{
- sprintf(buf, " %s
\n",l->str, l->str);
+ sprintf(buf, " %s
\n",l->str, l->str);
string_append(&p, buf);
}
err = map(exports, "trust-info", 1, p, 0);
@@ -932,7 +1032,7 @@ struct http_response *redirect_url(struct client_state *csp)
/*
* find the last URL encoded in the request
*/
- while ((p = strstr(p, "http://")))
+ while ((p = strstr(p, "http://")) != NULL)
{
q = p++;
}
@@ -950,7 +1050,7 @@ struct http_response *redirect_url(struct client_state *csp)
}
if ( enlist_unique_header(rsp->headers, "Location", q)
- || (NULL == (rsp->status = strdup("302 Local Redirect from Junkbuster"))) )
+ || (NULL == (rsp->status = strdup("302 Local Redirect from Privoxy"))) )
{
free_http_response(rsp);
return cgi_error_memory();
@@ -987,17 +1087,23 @@ struct http_response *redirect_url(struct client_state *csp)
int is_imageurl(struct client_state *csp)
{
#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))
- {
- return 1;
- }
- else if ((csp->accept_types
- & (ACCEPT_TYPE_IS_MSIE|ACCEPT_TYPE_MSIE_IMAGE|ACCEPT_TYPE_MSIE_HTML))
- == (ACCEPT_TYPE_IS_MSIE|ACCEPT_TYPE_MSIE_HTML))
+ char *tmp;
+
+ tmp = get_header_value(csp->headers, "User-Agent:");
+ if (tmp && strstr(tmp, "MSIE"))
{
- return 0;
+ tmp = get_header_value(csp->headers, "Accept:");
+ if (tmp && strstr(tmp, "image/gif"))
+ {
+ /* Client will accept HTML. If this seems counterintuitive,
+ * blame Microsoft.
+ */
+ return(0);
+ }
+ else
+ {
+ return(1);
+ }
}
#endif /* def FEATURE_IMAGE_DETECT_MSIE */
@@ -1007,7 +1113,7 @@ int is_imageurl(struct client_state *csp)
#endif /* def FEATURE_IMAGE_BLOCKING */
-#ifdef FEATURE_COOKIE_JAR
+#ifdef FEATURE_TRUST
/*********************************************************************
*
* Function : is_untrusted_url
@@ -1029,163 +1135,121 @@ int is_untrusted_url(struct client_state *csp)
{
struct file_list *fl;
struct block_spec *b;
- struct url_spec url[1], **tl, *t;
+ struct url_spec **trusted_url;
struct http_request rhttp[1];
- char *p, *h;
+ const char * referer;
+ jb_err err;
/*
* If we don't have a trustlist, we trust everybody
*/
if (((fl = csp->tlist) == NULL) || ((b = fl->f) == NULL))
{
- return(0);
+ return 0;
}
+ memset(rhttp, '\0', sizeof(*rhttp));
/*
* Do we trust the request URL itself?
*/
- *url = dsplit(csp->http->host);
-
- /* if splitting the domain fails, punt */
- if (url->dbuf == NULL) return(0);
-
- memset(rhttp, '\0', sizeof(*rhttp));
-
for (b = b->next; b ; b = b->next)
{
- if ((b->url->port == 0) || (b->url->port == csp->http->port))
+ if (url_match(b->url, csp->http))
{
- if ((b->url->domain[0] == '\0') || (domaincmp(b->url, url) == 0))
- {
- if ((b->url->path == NULL) ||
-#ifdef REGEX
- (regexec(b->url->preg, csp->http->path, 0, NULL, 0) == 0)
-#else
- (strncmp(b->url->path, csp->http->path, b->url->pathlen) == 0)
-#endif
- )
- {
- freez(url->dbuf);
- freez(url->dvec);
-
- if (b->reject == 0) return(0);
-
- return(1);
- }
- }
+ return b->reject;
}
}
- freez(url->dbuf);
- freez(url->dvec);
-
- if ((csp->referrer == NULL)|| (strlen(csp->referrer) <= 9))
+ if (NULL == (referer = get_header_value(csp->headers, "Referer:")))
{
/* no referrer was supplied */
- return(1);
- }
-
- /* forge a URL from the referrer so we can use
- * convert_url() to parse it into its components.
- */
-
- p = NULL;
- p = strsav(p, "GET ");
- p = strsav(p, csp->referrer + 9); /* skip over "Referer: " */
- p = strsav(p, " HTTP/1.0");
-
- parse_http_request(p, rhttp, csp);
- freez(p);
-
- if (rhttp->cmd == NULL)
- {
- return(1);
+ return 1;
}
/*
* If not, do we maybe trust its referrer?
*/
- *url = dsplit(rhttp->host);
-
- /* if splitting the domain fails, punt */
- if (url->dbuf == NULL) return(1);
+ err = parse_http_url(referer, rhttp, csp);
+ if (err)
+ {
+ return 1;
+ }
- for (tl = csp->config->trust_list; (t = *tl) ; tl++)
+ for (trusted_url = csp->config->trust_list; *trusted_url != NULL; trusted_url++)
{
- if ((t->port == 0) || (t->port == rhttp->port))
+ if (url_match(*trusted_url, rhttp))
{
- if ((t->domain[0] == '\0') || domaincmp(t, url) == 0)
- {
- if ((t->path == NULL) ||
-#ifdef REGEX
- (regexec(t->preg, rhttp->path, 0, NULL, 0) == 0)
-#else
- (strncmp(t->path, rhttp->path, t->pathlen) == 0)
-#endif
- )
- {
- /* if the URL's referrer is from a trusted referrer, then
- * add the target spec to the trustfile as an unblocked
- * domain and return NULL (which means it's OK).
- */
+ /* if the URL's referrer is from a trusted referrer, then
+ * add the target spec to the trustfile as an unblocked
+ * domain and return NULL (which means it's OK).
+ */
+
+ FILE *fp;
- FILE *fp;
+ if (NULL != (fp = fopen(csp->config->trustfile, "a")))
+ {
+ char * path;
+ char * path_end;
+ char * new_entry = strdup("~");
- freez(url->dbuf);
- freez(url->dvec);
+ string_append(&new_entry, csp->http->hostport);
- if ((fp = fopen(csp->config->trustfile, "a")))
+ path = csp->http->path;
+ if ( (path[0] == '/')
+ && (path[1] == '~')
+ && ((path_end = strchr(path + 2, '/')) != NULL))
+ {
+ /* since this path points into a user's home space
+ * be sure to include this spec in the trustfile.
+ */
+ int path_len = path_end - path; /* save offset */
+ path = strdup(path); /* Copy string */
+ if (path != NULL)
{
- h = NULL;
-
- h = strsav(h, "~");
- h = strsav(h, csp->http->hostport);
-
- p = csp->http->path;
- if ((*p++ == '/')
- && (*p++ == '~'))
- {
- /* since this path points into a user's home space
- * be sure to include this spec in the trustfile.
- */
- if ((p = strchr(p, '/')))
- {
- *p = '\0';
- h = strsav(h, csp->http->path); /* FIXME: p?! */
- h = strsav(h, "/");
- }
- }
-
- fprintf(fp, "%s\n", h);
- freez(h);
- fclose(fp);
+ path_end = path + path_len; /* regenerate ptr to new buffer */
+ *(path_end + 1) = '\0'; /* Truncate path after '/' */
}
- return(0);
+ string_join(&new_entry, path);
+ }
+
+ if (new_entry != NULL)
+ {
+ fprintf(fp, "%s\n", new_entry);
+ free(new_entry);
}
+ else
+ {
+ /* FIXME: No way to handle out-of memory, so mostly ignoring it */
+ log_error(LOG_LEVEL_ERROR, "Out of memory adding pattern to trust file");
+ }
+
+ fclose(fp);
}
+ return 0;
}
}
- return(1);
+ return 1;
}
-#endif /* def FEATURE_COOKIE_JAR */
+#endif /* def FEATURE_TRUST */
/*********************************************************************
*
* Function : pcrs_filter_response
*
- * Description : Apply all the pcrs jobs from the joblist (re_filterfile)
- * to the text buffer that's been accumulated in
- * csp->iob->buf and set csp->content_length to the modified
- * size and raise the CSP_FLAG_MODIFIED flag if appropriate.
+ * Description : Ecexute all text substitutions from all applying
+ * +filter actions on the text buffer that's been accumulated
+ * in csp->iob->buf. If this changes the contents, set
+ * csp->content_length to the modified size and raise the
+ * CSP_FLAG_MODIFIED flag.
*
* 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
+ * or NULL if there were no hits or something went wrong
*
*********************************************************************/
char *pcrs_filter_response(struct client_state *csp)
@@ -1198,14 +1262,23 @@ char *pcrs_filter_response(struct client_state *csp)
struct file_list *fl;
struct re_filterfile_spec *b;
+ struct list_entry *filtername;
- /* Sanity first */
+ /*
+ * Sanity first
+ */
if (csp->iob->cur >= csp->iob->eod)
{
return(NULL);
}
size = csp->iob->eod - csp->iob->cur;
+ if ( ( NULL == (fl = csp->rlist) ) || ( NULL == fl->f) )
+ {
+ log_error(LOG_LEVEL_ERROR, "Unable to get current state of regexp filtering.");
+ return(NULL);
+ }
+
/*
* If the body has a "chunked" transfer-encoding,
* get rid of it first, adjusting size and iob->eod
@@ -1221,30 +1294,42 @@ char *pcrs_filter_response(struct client_state *csp)
csp->flags |= CSP_FLAG_MODIFIED;
}
- if ( ( NULL == (fl = csp->rlist) ) || ( NULL == (b = fl->f) ) )
+ /*
+ * For all applying +filter actions, look if a filter by that
+ * name exists and if yes, execute it's pcrs_joblist on the
+ * buffer.
+ */
+ for (b = fl->f; b; b = b->next)
{
- log_error(LOG_LEVEL_ERROR, "Unable to get current state of regexp filtering.");
- return(NULL);
- }
+ for (filtername = csp->action->multi[ACTION_MULTI_FILTER]->first;
+ filtername ; filtername = filtername->next)
+ {
+ if (strcmp(b->name, filtername->str) == 0)
+ {
+ int current_hits = 0;
- if ( NULL == b->joblist )
- {
- log_error(LOG_LEVEL_RE_FILTER, "Empty joblist. Nothing to do.");
- return(NULL);
- }
+ if ( NULL == b->joblist )
+ {
+ log_error(LOG_LEVEL_RE_FILTER, "Filter %s has empty joblist. Nothing to do.", b->name);
+ return(NULL);
+ }
- log_error(LOG_LEVEL_RE_FILTER, "re_filtering %s%s (size %d) ...",
- csp->http->hostport, csp->http->path, size);
+ log_error(LOG_LEVEL_RE_FILTER, "re_filtering %s%s (size %d) with filter %s...",
+ csp->http->hostport, csp->http->path, size, b->name);
- /* Apply all jobs from the joblist */
- for (job = b->joblist; NULL != job; job = job->next)
- {
- hits += pcrs_execute(job, old, size, &new, &size);
- if (old != csp->iob->cur) free(old);
- old=new;
- }
+ /* Apply all jobs from the joblist */
+ for (job = b->joblist; NULL != job; job = job->next)
+ {
+ current_hits += pcrs_execute(job, old, size, &new, &size);
+ if (old != csp->iob->cur) free(old);
+ old=new;
+ }
- log_error(LOG_LEVEL_RE_FILTER, " produced %d hits (new size %d).", hits, size);
+ log_error(LOG_LEVEL_RE_FILTER, " ...produced %d hits (new size %d).", current_hits, size);
+ hits += current_hits;
+ }
+ }
+ }
/*
* If there were no hits, destroy our copy and let
@@ -1284,7 +1369,7 @@ char *gif_deanimate_response(struct client_state *csp)
{
struct binbuffer *in, *out;
char *p;
- int size = csp->iob->eod - csp->iob->cur;
+ size_t size = csp->iob->eod - csp->iob->cur;
/*
* If the body has a "chunked" transfer-encoding,
@@ -1320,7 +1405,14 @@ char *gif_deanimate_response(struct client_state *csp)
}
else
{
- log_error(LOG_LEVEL_DEANIMATE, "Success! GIF shrunk from %d bytes to %d.", size, out->offset);
+ if ((int)size == out->offset)
+ {
+ log_error(LOG_LEVEL_DEANIMATE, "GIF not changed.");
+ }
+ else
+ {
+ log_error(LOG_LEVEL_DEANIMATE, "Success! GIF shrunk from %d bytes to %d.", size, out->offset);
+ }
csp->content_length = out->offset;
csp->flags |= CSP_FLAG_MODIFIED;
p = out->buffer;
@@ -1409,16 +1501,21 @@ void url_actions(struct http_request *http,
{
struct file_list *fl;
struct url_actions *b;
+ int i;
init_current_action(csp->action);
- if (((fl = csp->actions_list) == NULL) || ((b = fl->f) == NULL))
+ for (i = 0; i < MAX_ACTION_FILES; i++)
{
- return;
- }
+ if (((fl = csp->actions_list[i]) == NULL) || ((b = fl->f) == NULL))
+ {
+ return;
+ }
- apply_url_actions(csp->action, http, b);
+ apply_url_actions(csp->action, http, b);
+ }
+ return;
}
@@ -1440,44 +1537,19 @@ void apply_url_actions(struct current_action_spec *action,
struct http_request *http,
struct url_actions *b)
{
- struct url_spec url[1];
-
if (b == NULL)
{
/* Should never happen */
return;
}
- *url = dsplit(http->host);
-
- /* if splitting the domain fails, punt */
- if (url->dbuf == NULL)
- {
- return;
- }
-
for (b = b->next; NULL != b; b = b->next)
{
- if ((b->url->port == 0) || (b->url->port == http->port))
+ if (url_match(b->url, http))
{
- if ((b->url->domain[0] == '\0') || (domaincmp(b->url, url) == 0))
- {
- if ((b->url->path == NULL) ||
-#ifdef REGEX
- (regexec(b->url->preg, http->path, 0, NULL, 0) == 0)
-#else
- (strncmp(b->url->path, http->path, b->url->pathlen) == 0)
-#endif
- )
- {
- merge_current_action(action, b->action);
- }
- }
+ merge_current_action(action, b->action);
}
}
-
- freez(url->dbuf);
- freez(url->dvec);
}
@@ -1499,251 +1571,22 @@ const struct forward_spec * forward_url(struct http_request *http,
{
static const struct forward_spec fwd_default[1] = { FORWARD_SPEC_INITIALIZER };
struct forward_spec *fwd = csp->config->forward;
- struct url_spec url[1];
if (fwd == NULL)
{
- return(fwd_default);
- }
-
- *url = dsplit(http->host);
-
- /* if splitting the domain fails, punt */
- if (url->dbuf == NULL)
- {
- return(fwd_default);
+ return fwd_default;
}
while (fwd != NULL)
{
- if ((fwd->url->port == 0) || (fwd->url->port == http->port))
+ if (url_match(fwd->url, http))
{
- if ((fwd->url->domain[0] == '\0') || (domaincmp(fwd->url, url) == 0))
- {
- if ((fwd->url->path == NULL) ||
-#ifdef REGEX
- (regexec(fwd->url->preg, http->path, 0, NULL, 0) == 0)
-#else
- (strncmp(fwd->url->path, http->path, fwd->url->pathlen) == 0)
-#endif
- )
- {
- freez(url->dbuf);
- freez(url->dvec);
- return(fwd);
- }
- }
+ return fwd;
}
fwd = fwd->next;
}
- freez(url->dbuf);
- freez(url->dvec);
- return(fwd_default);
-
-}
-
-
-/*********************************************************************
- *
- * Function : dsplit
- *
- * Description : Takes a domain and returns a pointer to a url_spec
- * structure populated with dbuf, dcnt and dvec. The
- * other fields in the structure that is returned are zero.
- *
- * Parameters :
- * 1 : domain = a URL address
- *
- * Returns : url_spec structure populated with dbuf, dcnt and dvec.
- * On error, the dbuf field will be set to NULL. (As
- * will all the others, but you don't need to check
- * them).
- *
- * FIXME: Returning a structure is horribly inefficient, please can
- * this structure take a (struct url_spec * dest)
- * pointer instead?
- *
- *********************************************************************/
-struct url_spec dsplit(char *domain)
-{
- struct url_spec ret[1];
- char *v[BUFFER_SIZE];
- int size;
- char *p;
-
- memset(ret, '\0', sizeof(*ret));
-
- if (domain[strlen(domain) - 1] == '.')
- {
- ret->unanchored |= ANCHOR_RIGHT;
- }
-
- if (domain[0] == '.')
- {
- ret->unanchored |= ANCHOR_LEFT;
- }
-
- ret->dbuf = strdup(domain);
- if (NULL == ret->dbuf)
- {
- return *ret;
- }
-
- /* map to lower case */
- for (p = ret->dbuf; *p ; p++)
- {
- *p = tolower((int)(unsigned char)*p);
- }
-
- /* split the domain name into components */
- ret->dcnt = ssplit(ret->dbuf, ".", v, SZ(v), 1, 1);
-
- if (ret->dcnt < 0)
- {
- free(ret->dbuf);
- memset(ret, '\0', sizeof(ret));
- return *ret;
- }
- else if (ret->dcnt == 0)
- {
- return *ret;
- }
-
- /* save a copy of the pointers in dvec */
- size = ret->dcnt * sizeof(*ret->dvec);
-
- ret->dvec = (char **)malloc(size);
- if (NULL == ret->dvec)
- {
- free(ret->dbuf);
- memset(ret, '\0', sizeof(ret));
- return *ret;
- }
-
- memcpy(ret->dvec, v, size);
-
- return *ret;
-
-}
-
-
-/*********************************************************************
- *
- * Function : simple_domaincmp
- *
- * Description : Domain-wise Compare fqdn's. The comparison is
- * both left- and right-anchored. The individual
- * domain names are compared with simplematch().
- * This is only used by domaincmp.
- *
- * Parameters :
- * 1 : pv = array of patterns to compare
- * 2 : fv = array of domain components to compare
- * 3 : len = length of the arrays (both arrays are the
- * same length - if they weren't, it couldn't
- * possibly be a match).
- *
- * Returns : 0 => domains are equivalent, else no match.
- *
- *********************************************************************/
-static int simple_domaincmp(char **pv, char **fv, int len)
-{
- int n;
-
- for (n = 0; n < len; n++)
- {
- if (simplematch(pv[n], fv[n]))
- {
- return 1;
- }
- }
-
- return 0;
-
-}
-
-
-/*********************************************************************
- *
- * Function : domaincmp
- *
- * Description : Domain-wise Compare fqdn's. Governed by the bimap in
- * pattern->unachored, the comparison is un-, left-,
- * right-anchored, or both.
- * The individual domain names are compared with
- * simplematch().
- *
- * Parameters :
- * 1 : pattern = a domain that may contain a '*' as a wildcard.
- * 2 : fqdn = domain name against which the patterns are compared.
- *
- * Returns : 0 => domains are equivalent, else no match.
- *
- *********************************************************************/
-int domaincmp(struct url_spec *pattern, struct url_spec *fqdn)
-{
- char **pv, **fv; /* vectors */
- int plen, flen;
- int unanchored = pattern->unanchored & (ANCHOR_RIGHT | ANCHOR_LEFT);
-
- plen = pattern->dcnt;
- flen = fqdn->dcnt;
-
- if (flen < plen)
- {
- /* fqdn is too short to match this pattern */
- return 1;
- }
-
- pv = pattern->dvec;
- fv = fqdn->dvec;
-
- if (unanchored == ANCHOR_LEFT)
- {
- /*
- * Right anchored.
- *
- * Convert this into a fully anchored pattern with
- * the fqdn and pattern the same length
- */
- fv += (flen - plen); /* flen - plen >= 0 due to check above */
- return simple_domaincmp(pv, fv, plen);
- }
- else if (unanchored == 0)
- {
- /* Fully anchored, check length */
- if (flen != plen)
- {
- return 1;
- }
- return simple_domaincmp(pv, fv, plen);
- }
- else if (unanchored == ANCHOR_RIGHT)
- {
- /* Left anchored, ignore all extra in fqdn */
- return simple_domaincmp(pv, fv, plen);
- }
- else
- {
- /* Unanchored */
- int n;
- int maxn = flen - plen;
- for (n = 0; n <= maxn; n++)
- {
- if (!simple_domaincmp(pv, fv, plen))
- {
- return 0;
- }
- /*
- * Doesn't match from start of fqdn
- * Try skipping first part of fqdn
- */
- fv++;
- }
- return 1;
- }
-
+ return fwd_default;
}