X-Git-Url: http://www.privoxy.org/gitweb/?a=blobdiff_plain;f=loaders.c;h=422b2aed3806544f72a564ff6467cc5b71a3adf8;hb=dff931c69ff33b6fab2c44da2f8d85f0f96c0acb;hp=406398d839d70e49c57784cc9af258641996e86b;hpb=3db608d678dddf5a31ce0913d3b352089ac44e31;p=privoxy.git diff --git a/loaders.c b/loaders.c index 406398d8..422b2aed 100644 --- a/loaders.c +++ b/loaders.c @@ -1,4 +1,4 @@ -const char loaders_rcs[] = "$Id: loaders.c,v 1.53 2006/08/31 16:25:06 fabiankeil Exp $"; +const char loaders_rcs[] = "$Id: loaders.c,v 1.60 2007/03/20 15:16:34 fabiankeil Exp $"; /********************************************************************* * * File : $Source: /cvsroot/ijbswa/current/loaders.c,v $ @@ -8,7 +8,7 @@ const char loaders_rcs[] = "$Id: loaders.c,v 1.53 2006/08/31 16:25:06 fabiankeil * the list of active loaders, and to automatically * unload files that are no longer in use. * - * Copyright : Written by and Copyright (C) 2001 the SourceForge + * Copyright : Written by and Copyright (C) 2001-2007 the SourceForge * Privoxy team. http://www.privoxy.org/ * * Based on the Internet Junkbuster originally written @@ -35,6 +35,37 @@ const char loaders_rcs[] = "$Id: loaders.c,v 1.53 2006/08/31 16:25:06 fabiankeil * * Revisions : * $Log: loaders.c,v $ + * Revision 1.60 2007/03/20 15:16:34 fabiankeil + * Use dedicated header filter actions instead of abusing "filter". + * Replace "filter-client-headers" and "filter-client-headers" + * with "server-header-filter" and "client-header-filter". + * + * Revision 1.59 2007/01/25 13:38:20 fabiankeil + * Freez csp->error_message in sweep(). + * + * Revision 1.58 2006/12/31 14:25:20 fabiankeil + * Fix gcc43 compiler warnings. + * + * Revision 1.57 2006/12/21 12:22:22 fabiankeil + * html_encode filter descriptions. + * + * Have "Ignoring job ..." error messages + * print the filter file name correctly. + * + * Revision 1.56 2006/09/07 10:40:30 fabiankeil + * Turns out trusted referrers above our arbitrary + * limit are downgraded too ordinary trusted URLs. + * Adjusted error message. + * + * Revision 1.55 2006/09/07 10:25:39 fabiankeil + * Fix typo. + * + * Revision 1.54 2006/09/07 10:22:20 fabiankeil + * If too many trusted referrers are used, + * print only one error message instead of logging + * every single trusted referrer above the arbitrary + * limit. + * * Revision 1.53 2006/08/31 16:25:06 fabiankeil * Work around a buffer overflow that caused Privoxy to * segfault if too many trusted referrers were used. Good @@ -333,6 +364,7 @@ const char loaders_rcs[] = "$Id: loaders.c,v 1.53 2006/08/31 16:25:06 fabiankeil #include "errlog.h" #include "actions.h" #include "urlmatch.h" +#include "encode.h" const char loaders_h_rcs[] = LOADERS_H_VERSION; @@ -352,6 +384,10 @@ static struct file_list *current_re_filterfile[MAX_AF_FILES] = { NULL, NULL, NULL, NULL, NULL }; +/* + * Pseudo filter type for load_one_re_filterfile + */ +#define NO_NEW_FILTER -1 /********************************************************************* @@ -454,10 +490,12 @@ void sweep(void) freez(csp->my_hostname); freez(csp->x_forwarded); freez(csp->iob->buf); + freez(csp->error_message); free_http_request(csp->http); destroy_list(csp->headers); + destroy_list(csp->tags); destroy_list(csp->cookie_list); free_current_action(csp->action); @@ -687,7 +725,7 @@ jb_err simple_read_line(FILE *fp, char **dest, int *newline) return JB_ERR_OK; } - *p++ = ch; + *p++ = (char)ch; if (++len >= buflen) { @@ -1198,16 +1236,10 @@ int load_trustfile(struct client_state *csp) if(trusted_referrers >= MAX_TRUSTED_REFERRERS) { /* - * FIXME: csp->config->trust_list is only needed - * to print the trusted referrers in Privoxy's blocking - * message. Not printing all of them is certainly better - * than writing them into memory that doesn't belong to us, - * but when Privoxy 3.0.4 is out, we should look for a real - * solution. + * FIXME: ... after Privoxy 3.0.4 is out. */ - log_error(LOG_LEVEL_ERROR, "Too many trusted referrers for Privoxy's webinterface to handle.\n" - " Current limit is %d, you are using %d. Additonal trusted referrers are recognized, " - "but will not show up in the blocking message.\n" + log_error(LOG_LEVEL_ERROR, "Too many trusted referrers. Current limit is %d, you are using %d.\n" + " Additional trusted referrers are treated like ordinary trusted URLs.\n" " (You can increase this limit by changing MAX_TRUSTED_REFERRERS in project.h and recompiling).", MAX_TRUSTED_REFERRERS, trusted_referrers); } @@ -1401,24 +1433,62 @@ int load_one_re_filterfile(struct client_state *csp, int fileid) */ while (read_config_line(buf, sizeof(buf), fp, &linenum) != NULL) { + int new_filter = NO_NEW_FILTER; + + if (strncmp(buf, "FILTER:", 7) == 0) + { + new_filter = FT_CONTENT_FILTER; + } + else if (strncmp(buf, "SERVER-HEADER-FILTER:", 21) == 0) + { + new_filter = FT_SERVER_HEADER_FILTER; + } + else if (strncmp(buf, "CLIENT-HEADER-FILTER:", 21) == 0) + { + new_filter = FT_CLIENT_HEADER_FILTER; + } + else if (strncmp(buf, "CLIENT-HEADER-TAGGER:", 21) == 0) + { + new_filter = FT_CLIENT_HEADER_TAGGER; + } + else if (strncmp(buf, "SERVER-HEADER-TAGGER:", 21) == 0) + { + new_filter = FT_SERVER_HEADER_TAGGER; + } + /* * If this is the head of a new filter block, make it a * re_filterfile spec of its own and chain it to the list: */ - if (strncmp(buf, "FILTER:", 7) == 0) + if (new_filter != NO_NEW_FILTER) { new_bl = (struct re_filterfile_spec *)zalloc(sizeof(*bl)); if (new_bl == NULL) { goto load_re_filterfile_error; } + if (new_filter == FT_CONTENT_FILTER) + { + new_bl->name = chomp(buf + 7); + } + else + { + new_bl->name = chomp(buf + 21); + } + new_bl->type = new_filter; - new_bl->name = chomp(buf + 7); - + /* + * If a filter description is available, + * encode it to HTML and save it. + */ if (NULL != (new_bl->description = strpbrk(new_bl->name, " \t"))) { *new_bl->description++ = '\0'; - new_bl->description = strdup(chomp(new_bl->description)); + new_bl->description = html_encode(chomp(new_bl->description)); + if (NULL == new_bl->description) + { + new_bl->description = strdup("Out of memory while encoding this filter's description to HTML"); + } } else { @@ -1477,7 +1547,8 @@ int load_one_re_filterfile(struct client_state *csp, int fileid) } else { - log_error(LOG_LEVEL_ERROR, "Ignoring job %s outside filter block in %s, line %d", buf, csp->config->re_filterfile, linenum); + log_error(LOG_LEVEL_ERROR, "Ignoring job %s outside filter block in %s, line %d", + buf, csp->config->re_filterfile[fileid], linenum); } }