-const char parsers_rcs[] = "$Id: parsers.c,v 1.2 2001/05/17 23:02:36 oes Exp $";
+const char parsers_rcs[] = "$Id: parsers.c,v 1.7 2001/05/27 13:19:06 oes Exp $";
/*********************************************************************
*
* File : $Source: /cvsroot/ijbswa/current/parsers.c,v $
* `client_x_forwarded_adder', `client_xtra_adder',
* `content_type', `crumble', `destroy_list', `enlist',
* `flush_socket', `free_http_request', `get_header',
- * `list_to_text', `match', `parse_http_request', `sed',
+ * `list_to_text', `parse_http_request', `sed',
* and `server_set_cookie'.
*
* Copyright : Written by and Copyright (C) 2001 the SourceForge
*
* Revisions :
* $Log: parsers.c,v $
+ * Revision 1.7 2001/05/27 13:19:06 oes
+ * Patched Joergs solution for the content-length in.
+ *
+ * Revision 1.6 2001/05/26 13:39:32 jongfoster
+ * Only crunches Content-Length header if applying RE filtering.
+ * Without this fix, Microsoft Windows Update wouldn't work.
+ *
+ * Revision 1.5 2001/05/26 00:28:36 jongfoster
+ * Automatic reloading of config file.
+ * Removed obsolete SIGHUP support (Unix) and Reload menu option (Win32).
+ * Most of the global variables have been moved to a new
+ * struct configuration_spec, accessed through csp->config->globalname
+ * Most of the globals remaining are used by the Win32 GUI.
+ *
+ * Revision 1.4 2001/05/22 18:46:04 oes
+ *
+ * - Enabled filtering banners by size rather than URL
+ * by adding patterns that replace all standard banner
+ * sizes with the "Junkbuster" gif to the re_filterfile
+ *
+ * - Enabled filtering WebBugs by providing a pattern
+ * which kills all 1x1 images
+ *
+ * - Added support for PCRE_UNGREEDY behaviour to pcrs,
+ * which is selected by the (nonstandard and therefore
+ * capital) letter 'U' in the option string.
+ * It causes the quantifiers to be ungreedy by default.
+ * Appending a ? turns back to greedy (!).
+ *
+ * - Added a new interceptor ijb-send-banner, which
+ * sends back the "Junkbuster" gif. Without imagelist or
+ * MSIE detection support, or if tinygif = 1, or the
+ * URL isn't recognized as an imageurl, a lame HTML
+ * explanation is sent instead.
+ *
+ * - Added new feature, which permits blocking remote
+ * script redirects and firing back a local redirect
+ * to the browser.
+ * The feature is conditionally compiled, i.e. it
+ * can be disabled with --disable-fast-redirects,
+ * plus it must be activated by a "fast-redirects"
+ * line in the config file, has its own log level
+ * and of course wants to be displayed by show-proxy-args
+ * Note: Boy, all the #ifdefs in 1001 locations and
+ * all the fumbling with configure.in and acconfig.h
+ * were *way* more work than the feature itself :-(
+ *
+ * - Because a generic redirect template was needed for
+ * this, tinygif = 3 now uses the same.
+ *
+ * - Moved GIFs, and other static HTTP response templates
+ * to project.h
+ *
+ * - Some minor fixes
+ *
+ * - Removed some >400 CRs again (Jon, you really worked
+ * a lot! ;-)
+ *
+ * Revision 1.3 2001/05/20 01:21:20 jongfoster
+ * Version 2.9.4 checkin.
+ * - Merged popupfile and cookiefile, and added control over PCRS
+ * filtering, in new "permissionsfile".
+ * - Implemented LOG_LEVEL_FATAL, so that if there is a configuration
+ * file error you now get a message box (in the Win32 GUI) rather
+ * than the program exiting with no explanation.
+ * - Made killpopup use the PCRS MIME-type checking and HTTP-header
+ * skipping.
+ * - Removed tabs from "config"
+ * - Moved duplicated url parsing code in "loaders.c" to a new funcition.
+ * - Bumped up version number.
+ *
* Revision 1.2 2001/05/17 23:02:36 oes
* - Made referrer option accept 'L' as a substitute for '§'
*
const struct interceptors intercept_patterns[] = {
{ "show-proxy-args", 14, show_proxy_args },
+ { "ijb-send-banner", 14, ijb_send_banner },
#ifdef TRUST_FILES
- { "ij-untrusted-url", 14, ij_untrusted_url },
+ { "ij-untrusted-url", 15, ij_untrusted_url },
#endif /* def TRUST_FILES */
{ NULL, 0, NULL }
};
{ "connection:", 11, crumble },
#if defined(PCRS) || defined(KILLPOPUPS)
{ "Content-Type:", 13, content_type },
- { "Content-Length:", 15, crumble },
#endif /* defined(PCRS) || defined(KILLPOPUPS) */
+#ifdef PCRS
+ { "Content-Length:", 15, content_length },
+#endif /* def PCRS */
{ NULL, 0, NULL }
};
};
-/*********************************************************************
- *
- * Function : match
- *
- * Description : Do a `strncmpic' on every pattern in pats.
- *
- * Parameters :
- * 1 : buf = a string to match to a list of patterns
- * 2 : pats = list of strings to compare against buf.
- *
- * Returns : Return the matching "struct parsers *",
- * or NULL if no pattern matches.
- *
- *********************************************************************/
-static const struct parsers *match(char *buf, const struct parsers *pats)
-{
- const struct parsers *v;
-
- if (buf == NULL)
- {
- /* hit me */
- log_error(LOG_LEVEL_ERROR, "NULL parameter to match()");
- return(NULL);
- }
-
- for (v = pats; v->str ; v++)
- {
- if (strncmpic(buf, v->str, v->len) == 0)
- {
- return(v);
- }
- }
- return(NULL);
-
-}
-
-
/*********************************************************************
*
* Function : flush_socket
char *hdr;
void (* const *f)();
- for (p = csp->headers->next; p ; p = p->next)
+ for (v = pats; v->str ; v++)
{
- log_error(LOG_LEVEL_HEADER, "scan: %s", p->str);
-
- if ((v = match(p->str, pats)))
+ for (p = csp->headers->next; p ; p = p->next)
{
- hdr = v->parser(v, p->str, csp);
- freez(p->str);
- p->str = hdr;
- }
+ /* Header crunch()ed in previous run? -> ignore */
+ if (p->str == NULL) continue;
+
+ if (v == pats) log_error(LOG_LEVEL_HEADER, "scan: %s", p->str);
+ if (strncmpic(p->str, v->str, v->len) == 0)
+ {
+ hdr = v->parser(v, p->str, csp);
+ freez(p->str);
+ p->str = hdr;
+ }
+ }
}
/* place any additional headers on the csp->headers list */
(*f)(csp);
}
- /* add the blank line at the end of the header */
- enlist(csp->headers, "");
+ /* add the blank line at the end of the header, if necessary */
+ if(strlen(csp->headers->last->str) != 0)
+ {
+ enlist(csp->headers, "");
+ }
hdr = list_to_text(csp->headers);
return(strdup(s));
}
-
#endif /* defined(PCRS) || defined(KILLPOPUPS) */
+#ifdef PCRS
+/*********************************************************************
+ *
+ * Function : content_length
+ *
+ * Description : Crunch Content-Length header if & only if we are
+ * filtering this page through PCRS.
+ *
+ * Parameters :
+ * 1 : v = ignored
+ * 2 : s = header string we are "considering"
+ * 3 : csp = Current client state (buffers, headers, etc...)
+ *
+ * Returns : A duplicate string pointer to this header (ie. pass thru)
+ *
+ *********************************************************************/
+char *content_length(const struct parsers *v, char *s, struct client_state *csp)
+{
+ if (csp->content_length != 0) /* Content has been modified */
+ {
+ s = (char *) zalloc(100);
+ snprintf(s, 100, "Content-Length: %d", csp->content_length);
+ log_error(LOG_LEVEL_HEADER, "Adjust Content-Length to %d", csp->content_length);
+ return(s);
+ }
+ else
+ {
+ return(strdup(s));
+ }
+}
+
+#endif /* def PCRS */
+
+
/*********************************************************************
*
* Function : client_referrer
csp->referrer = strdup(s);
- if (referrer == NULL)
+ if (csp->config->referrer == NULL)
{
log_error(LOG_LEVEL_HEADER, "crunch!");
return(NULL);
}
- if (*referrer == '.')
+ if (*csp->config->referrer == '.')
{
return(strdup(s));
}
- if (*referrer == '@')
+ if (*csp->config->referrer == '@')
{
if (csp->permissions & PERMIT_COOKIE_READ)
{
* to fool stupid checks for in-site links
*/
- if (*referrer == '§' || *referrer == 'L')
+ if (*csp->config->referrer == '§' || *csp->config->referrer == 'L')
{
if (csp->permissions & PERMIT_COOKIE_READ)
{
log_error(LOG_LEVEL_HEADER, "modified");
s = strsav( NULL, "Referer: " );
- s = strsav( s, referrer );
+ s = strsav( s, csp->config->referrer );
return(s);
}
}
#endif /* def DETECT_MSIE_IMAGES */
- if (uagent == NULL)
+ if (csp->config->uagent == NULL)
{
log_error(LOG_LEVEL_HEADER, "default");
return(strdup(DEFAULT_USER_AGENT));
}
- if (*uagent == '.')
+ if (*csp->config->uagent == '.')
{
return(strdup(s));
}
- if (*uagent == '@')
+ if (*csp->config->uagent == '@')
{
if (csp->permissions & PERMIT_COOKIE_READ)
{
log_error(LOG_LEVEL_HEADER, "modified");
s = strsav( NULL, "User-Agent: " );
- s = strsav( s, uagent );
+ s = strsav( s, csp->config->uagent );
return(s);
}
*********************************************************************/
char *client_ua(const struct parsers *v, char *s, struct client_state *csp)
{
- if (uagent == NULL)
+ if (csp->config->uagent == NULL)
{
log_error(LOG_LEVEL_HEADER, "crunch!");
return(NULL);
}
- if (*uagent == '.')
+ if (*csp->config->uagent == '.')
{
return(strdup(s));
}
- if (*uagent == '@')
+ if (*csp->config->uagent == '@')
{
if (csp->permissions & PERMIT_COOKIE_READ)
{
char *client_from(const struct parsers *v, char *s, struct client_state *csp)
{
/* if not set, zap it */
- if (from == NULL)
+ if (csp->config->from == NULL)
{
log_error(LOG_LEVEL_HEADER, "crunch!");
return(NULL);
}
- if (*from == '.')
+ if (*csp->config->from == '.')
{
return(strdup(s));
}
log_error(LOG_LEVEL_HEADER, " modified");
s = strsav( NULL, "From: " );
- s = strsav( s, from );
+ s = strsav( s, csp->config->from );
return(s);
}
*********************************************************************/
char *client_x_forwarded(const struct parsers *v, char *s, struct client_state *csp)
{
- if (add_forwarded)
+ if (csp->config->add_forwarded)
{
csp->x_forwarded = strdup(s);
}
tmp = strsav(tmp, l->str);
}
- for (l = wafer_list->next; l ; l = l->next)
+ for (l = csp->config->wafer_list->next; l ; l = l->next)
{
if (tmp)
{
{
struct list *l;
- for (l = xtra_list->next; l ; l = l->next)
+ for (l = csp->config->xtra_list->next; l ; l = l->next)
{
log_error(LOG_LEVEL_HEADER, "addh: %s", l->str);
enlist(csp->headers, l->str);
{
char *p = NULL;
- if (add_forwarded == 0) return;
+ if (csp->config->add_forwarded == 0)
+ {
+ return;
+ }
if (csp->x_forwarded)
{
char *server_set_cookie(const struct parsers *v, char *s, struct client_state *csp)
{
#ifdef JAR_FILES
- if (jar)
+ if (csp->config->jar)
{
- fprintf(jar, "%s\t%s\n", csp->http->host, (s + v->len + 1));
+ fprintf(csp->config->jar, "%s\t%s\n", csp->http->host, (s + v->len + 1));
}
#endif /* def JAR_FILES */
projects / privoxy.git / blobdiff