-const char loaders_rcs[] = "$Id: loaders.c,v 1.52 2006/07/18 14:48:46 david__schmidt 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 $
* 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
*
* 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
+ * enough for now, but should be replaced with a real
+ * solution after the next release.
+ *
* Revision 1.52 2006/07/18 14:48:46 david__schmidt
* Reorganizing the repository: swapping out what was HEAD (the old 3.1 branch)
* with what was really the latest development (the v_3_0_branch branch)
#include "errlog.h"
#include "actions.h"
#include "urlmatch.h"
+#include "encode.h"
const char loaders_h_rcs[] = LOADERS_H_VERSION;
NULL, NULL, NULL, NULL, NULL
};
+/*
+ * Pseudo filter type for load_one_re_filterfile
+ */
+#define NO_NEW_FILTER -1
/*********************************************************************
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);
return JB_ERR_OK;
}
- *p++ = ch;
+ *p++ = (char)ch;
if (++len >= buflen)
{
{
*tl++ = b->url;
}
- else
- {
- /*
- * 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.
- */
- log_error(LOG_LEVEL_ERROR,
- "Too many trusted referrers, %s will not show up in the blocking message.",
- *b->url);
- }
}
}
+ if(trusted_referrers >= MAX_TRUSTED_REFERRERS)
+ {
+ /*
+ * FIXME: ... after Privoxy 3.0.4 is out.
+ */
+ 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);
+ }
+
*tl = NULL;
fclose(fp);
*/
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
{
}
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);
}
}
projects / privoxy.git / blobdiff