X-Git-Url: http://www.privoxy.org/gitweb/?a=blobdiff_plain;f=filters.c;h=fc6917e53abe984f6891ab3be32dd0425369aa98;hb=83a36343155a2f17d29ff1c706809bf56382a9ec;hp=e268d6ddcd2659c7aa121d5575d44b80e6381bc0;hpb=c4f3088d0fc3e1d5d4cd211295e641816ed11979;p=privoxy.git
diff --git a/filters.c b/filters.c
index e268d6dd..fc6917e5 100644
--- a/filters.c
+++ b/filters.c
@@ -1,4 +1,4 @@
-const char filters_rcs[] = "$Id: filters.c,v 1.24 2001/07/25 17:22:51 oes Exp $";
+const char filters_rcs[] = "$Id: filters.c,v 1.32 2001/09/16 13:21:27 jongfoster Exp $";
/*********************************************************************
*
* File : $Source: /cvsroot/ijbswa/current/filters.c,v $
@@ -38,6 +38,44 @@ const char filters_rcs[] = "$Id: filters.c,v 1.24 2001/07/25 17:22:51 oes Exp $"
*
* Revisions :
* $Log: filters.c,v $
+ * Revision 1.32 2001/09/16 13:21:27 jongfoster
+ * Changes to use new list functions.
+ *
+ * Revision 1.31 2001/09/16 11:38:02 jongfoster
+ * Splitting fill_template() into 2 functions:
+ * template_load() loads the file
+ * template_fill() performs the PCRS regexps.
+ * This is because the CGI edit interface has a "table row"
+ * template which is used many times in the page - this
+ * change means it's only loaded from disk once.
+ *
+ * Revision 1.30 2001/09/16 11:00:10 jongfoster
+ * New function alloc_http_response, for symmetry with free_http_response
+ *
+ * Revision 1.29 2001/09/13 23:32:40 jongfoster
+ * Moving image data to cgi.c rather than cgi.h
+ * Fixing a GPF under Win32 (and any other OS that protects global
+ * constants from being written to).
+ *
+ * Revision 1.28 2001/09/10 10:18:51 oes
+ * Silenced compiler warnings
+ *
+ * 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.
*
@@ -256,12 +294,8 @@ const char filters_rcs[] = "$Id: filters.c,v 1.24 2001/07/25 17:22:51 oes Exp $"
#include "project.h"
#include "filters.h"
#include "encode.h"
-#include "jcc.h"
-#include "showargs.h"
#include "parsers.h"
#include "ssplit.h"
-#include "gateway.h"
-#include "jbsockets.h"
#include "errlog.h"
#include "jbsockets.h"
#include "miscutil.h"
@@ -286,7 +320,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
@@ -420,7 +454,7 @@ int acl_addr(char *aspec, struct access_control_addr *aca)
return(0);
}
-#endif /* def ACL_FILES */
+#endif /* def FEATURE_ACL */
/*********************************************************************
@@ -437,9 +471,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 ;-)
@@ -452,7 +487,7 @@ struct http_response *block_url(struct client_state *csp)
/*
* Else, prepare a response
*/
- if (NULL == ( rsp = (struct http_response *)zalloc(sizeof(*rsp))))
+ if (NULL == (rsp = alloc_http_response()))
{
return NULL;
}
@@ -461,7 +496,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))
{
@@ -471,15 +506,15 @@ struct http_response *block_url(struct client_state *csp)
/* and handle accordingly: */
if ((p == NULL) || (0 == strcmpic(p, "logo")))
{
- rsp->body = bindup(JBGIF, sizeof(JBGIF));
- rsp->content_length = sizeof(JBGIF);
+ rsp->body = bindup(image_junkbuster_gif_data, image_junkbuster_gif_length);
+ rsp->content_length = image_junkbuster_gif_length;
enlist_unique_header(rsp->headers, "Content-Type", "image/gif");
}
else if (0 == strcmpic(p, "blank"))
{
- rsp->body = bindup(BLANKGIF, sizeof(BLANKGIF));
- rsp->content_length = sizeof(BLANKGIF);
+ rsp->body = bindup(image_blank_gif_data, image_blank_gif_length);
+ rsp->content_length = image_blank_gif_length;
enlist_unique_header(rsp->headers, "Content-Type", "image/gif");
}
@@ -490,26 +525,26 @@ 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);
-
- rsp->body = fill_template(csp, "blocked", exports);
+ 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 = template_load(csp, "blocked");
+ template_fill(&rsp->body, exports);
free_map(exports);
/*
@@ -537,7 +572,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
@@ -554,7 +589,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;
@@ -569,29 +604,30 @@ struct http_response *trust_url(struct client_state *csp)
/*
* Else, prepare a response:
*/
- if (NULL == ( rsp = (struct http_response *)zalloc(sizeof(*rsp))))
+ if (NULL == (rsp = alloc_http_response()))
{
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);
}
/*
@@ -602,50 +638,51 @@ 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;
/*
* Export the trust info, if available
*/
- if (csp->config->trust_info->next)
+ if (csp->config->trust_info->first)
{
- struct list *l;
+ struct list_entry *l;
- for (l = csp->config->trust_info->next; l ; l = l->next)
+ for (l = csp->config->trust_info->first; l ; l = l->next)
{
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
*/
- rsp->body = fill_template(csp, "untrusted", exports);
+ rsp->body = template_load(csp, "untrusted");
+ template_fill(&rsp->body, exports);
free_map(exports);
return(finish_http_response(rsp));
}
-#endif /* def TRUST_FILES */
+#endif /* def FEATURE_TRUST */
-#ifdef FAST_REDIRECTS
+#ifdef FEATURE_FAST_REDIRECTS
/*********************************************************************
*
* Function : redirect_url
@@ -670,7 +707,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://")))
{
q = p++;
}
@@ -682,7 +719,7 @@ struct http_response *redirect_url(struct client_state *csp)
{
log_error(LOG_LEVEL_REDIRECTS, "redirecting to: %s", q);
- if (NULL == ( rsp = zalloc(sizeof(*rsp))))
+ if (NULL == (rsp = alloc_http_response()))
{
return NULL;
}
@@ -698,18 +735,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...)
@@ -720,7 +757,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))
@@ -733,15 +770,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
@@ -903,7 +940,7 @@ int is_untrusted_url(struct client_state *csp)
}
return(1);
}
-#endif /* def TRUST_FILES */
+#endif /* def FEATURE_COOKIE_JAR */
/*********************************************************************
@@ -1130,7 +1167,7 @@ void apply_url_actions(struct current_action_spec *action,
const struct forward_spec * forward_url(struct http_request *http,
struct client_state *csp)
{
- static const struct forward_spec fwd_default[1] = { 0 }; /* All zeroes */
+ static const struct forward_spec fwd_default[1] = { FORWARD_SPEC_INITIALIZER };
struct forward_spec *fwd = csp->config->forward;
struct url_spec url[1];