X-Git-Url: http://www.privoxy.org/gitweb/?p=privoxy.git;a=blobdiff_plain;f=parsers.c;h=f2364d479307172d07c357fac306d7b94894fa85;hp=6d655b5dbd5b0a20f8f6ac0a1c7d6ffdd2bbeaac;hb=f5d6e754e859b3ca0345ed124249a2e482ea29ac;hpb=43da0ce639b1cf540198b2f63e790d9127725343 diff --git a/parsers.c b/parsers.c index 6d655b5d..f2364d47 100644 --- a/parsers.c +++ b/parsers.c @@ -1,4 +1,4 @@ -const char parsers_rcs[] = "$Id: parsers.c,v 1.4 2001/05/22 18:46:04 oes Exp $"; +const char parsers_rcs[] = "$Id: parsers.c,v 1.29 2001/09/24 21:09:24 jongfoster Exp $"; /********************************************************************* * * File : $Source: /cvsroot/ijbswa/current/parsers.c,v $ @@ -11,7 +11,7 @@ const char parsers_rcs[] = "$Id: parsers.c,v 1.4 2001/05/22 18:46:04 oes Exp $"; * `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 @@ -41,6 +41,139 @@ const char parsers_rcs[] = "$Id: parsers.c,v 1.4 2001/05/22 18:46:04 oes Exp $"; * * Revisions : * $Log: parsers.c,v $ + * Revision 1.29 2001/09/24 21:09:24 jongfoster + * Fixing 2 memory leaks that Guy spotted, where the paramater to + * enlist() was not being free()d. + * + * Revision 1.28 2001/09/22 16:32:28 jongfoster + * Removing unused #includes. + * + * Revision 1.27 2001/09/20 15:45:25 steudten + * + * add casting from size_t to int for printf() + * remove local variable shadow s2 + * + * Revision 1.26 2001/09/16 17:05:14 jongfoster + * Removing unused #include showarg.h + * + * Revision 1.25 2001/09/16 13:21:27 jongfoster + * Changes to use new list functions. + * + * Revision 1.24 2001/09/13 23:05:50 jongfoster + * Changing the string paramater to the header parsers a "const". + * + * Revision 1.23 2001/09/12 18:08:19 steudten + * + * In parse_http_request() header rewriting miss the host value, so + * from http://www.mydomain.com the result was just " / " not + * http://www.mydomain.com/ in case we forward. + * + * Revision 1.22 2001/09/10 10:58:53 oes + * Silenced compiler warnings + * + * Revision 1.21 2001/07/31 14:46:00 oes + * - Persistant connections now suppressed + * - sed() no longer appends empty header to csp->headers + * + * Revision 1.20 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.19 2001/07/25 17:21:54 oes + * client_uagent now saves copy of User-Agent: header value + * + * Revision 1.18 2001/07/13 14:02:46 oes + * - Included fix to repair broken HTTP requests that + * don't contain a path, not even '/'. + * - Removed all #ifdef PCRS + * - content_type now always inspected and classified as + * text, gif or other. + * - formatting / comments + * + * Revision 1.17 2001/06/29 21:45:41 oes + * Indentation, CRLF->LF, Tab-> Space + * + * Revision 1.16 2001/06/29 13:32:42 oes + * - Fixed a comment + * - Adapted free_http_request + * - Removed logentry from cancelled commit + * + * Revision 1.15 2001/06/03 19:12:38 oes + * deleted const struct interceptors + * + * Revision 1.14 2001/06/01 18:49:17 jongfoster + * Replaced "list_share" with "list" - the tiny memory gain was not + * worth the extra complexity. + * + * Revision 1.13 2001/05/31 21:30:33 jongfoster + * Removed list code - it's now in list.[ch] + * Renamed "permission" to "action", and changed many features + * to use the actions file rather than the global config. + * + * Revision 1.12 2001/05/31 17:33:13 oes + * + * CRLF -> LF + * + * Revision 1.11 2001/05/29 20:11:19 joergs + * '/ * inside comment' warning removed. + * + * Revision 1.10 2001/05/29 09:50:24 jongfoster + * Unified blocklist/imagelist/permissionslist. + * File format is still under discussion, but the internal changes + * are (mostly) done. + * + * Also modified interceptor behaviour: + * - We now intercept all URLs beginning with one of the following + * prefixes (and *only* these prefixes): + * * http://i.j.b/ + * * http://ijbswa.sf.net/config/ + * * http://ijbswa.sourceforge.net/config/ + * - New interceptors "home page" - go to http://i.j.b/ to see it. + * - Internal changes so that intercepted and fast redirect pages + * are not replaced with an image. + * - Interceptors now have the option to send a binary page direct + * to the client. (i.e. ijb-send-banner uses this) + * - Implemented show-url-info interceptor. (Which is why I needed + * the above interceptors changes - a typical URL is + * "http://i.j.b/show-url-info?url=www.somesite.com/banner.gif". + * The previous mechanism would not have intercepted that, and + * if it had been intercepted then it then it would have replaced + * it with an image.) + * + * Revision 1.9 2001/05/28 17:26:33 jongfoster + * Fixing segfault if last header was crunched. + * Fixing Windows build (snprintf() is _snprintf() under Win32, but we + * can use the cross-platform sprintf() instead.) + * + * Revision 1.8 2001/05/27 22:17:04 oes + * + * - re_process_buffer no longer writes the modified buffer + * to the client, which was very ugly. It now returns the + * buffer, which it is then written by chat. + * + * - content_length now adjusts the Content-Length: header + * for modified documents rather than crunch()ing it. + * (Length info in csp->content_length, which is 0 for + * unmodified documents) + * + * - For this to work, sed() is called twice when filtering. + * + * 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 @@ -110,10 +243,13 @@ const char parsers_rcs[] = "$Id: parsers.c,v 1.4 2001/05/22 18:46:04 oes Exp $"; #include "config.h" +#ifndef _WIN32 #include #include #include #include +#endif + #include #ifndef _WIN32 @@ -121,12 +257,9 @@ const char parsers_rcs[] = "$Id: parsers.c,v 1.4 2001/05/22 18:46:04 oes Exp $"; #endif #include "project.h" +#include "list.h" #include "parsers.h" #include "encode.h" -#include "filters.h" -#include "loaders.h" -#include "showargs.h" -#include "jcc.h" #include "ssplit.h" #include "errlog.h" #include "jbsockets.h" @@ -155,36 +288,29 @@ const struct parsers client_patterns[] = { { "from:", 5, client_from }, { "cookie:", 7, client_send_cookie }, { "x-forwarded-for:", 16, client_x_forwarded }, - { "proxy-connection:", 17, crumble }, -#ifdef DENY_GZIP +#ifdef FEATURE_DENY_GZIP { "Accept-Encoding: gzip", 21, crumble }, -#endif /* def DENY_GZIP */ -#if defined(DETECT_MSIE_IMAGES) +#endif /* def FEATURE_DENY_GZIP */ +#if defined(FEATURE_IMAGE_DETECT_MSIE) { "Accept:", 7, client_accept }, -#endif /* defined(DETECT_MSIE_IMAGES) */ -#ifdef FORCE_LOAD +#endif /* defined(FEATURE_IMAGE_DETECT_MSIE) */ +#ifdef FEATURE_FORCE_LOAD { "Host:", 5, client_host }, -#endif /* def FORCE_LOAD */ +#endif /* def FEATURE_FORCE_LOAD */ /* { "if-modified-since:", 18, crumble }, */ + { "Keep-Alive:", 11, crumble }, + { "connection:", 11, crumble }, + { "proxy-connection:", 17, crumble }, { NULL, 0, NULL } }; -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", 15, ij_untrusted_url }, -#endif /* def TRUST_FILES */ - { NULL, 0, NULL } -}; const struct parsers server_patterns[] = { + { "HTTP/1.1 ", 9, server_http11 }, { "set-cookie:", 11, server_set_cookie }, { "connection:", 11, crumble }, -#if defined(PCRS) || defined(KILLPOPUPS) { "Content-Type:", 13, content_type }, - { "Content-Length:", 15, crumble }, -#endif /* defined(PCRS) || defined(KILLPOPUPS) */ + { "Content-Length:", 15, content_length }, { NULL, 0, NULL } }; @@ -193,52 +319,17 @@ void (* const add_client_headers[])(struct client_state *) = { client_cookie_adder, client_x_forwarded_adder, client_xtra_adder, + connection_close_adder, NULL }; void (* const add_server_headers[])(struct client_state *) = { + connection_close_adder, 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 @@ -395,125 +486,6 @@ char *get_header(struct client_state *csp) } -/********************************************************************* - * - * Function : enlist - * - * Description : Append a string into a specified string list. - * - * Parameters : - * 1 : h = pointer to list 'dummy' header - * 2 : s = string to add to the list - * - * Returns : N/A - * - *********************************************************************/ -void enlist(struct list *h, const char *s) -{ - struct list *n = (struct list *)malloc(sizeof(*n)); - struct list *l; - - if (n) - { - n->str = strdup(s); - n->next = NULL; - - if ((l = h->last)) - { - l->next = n; - } - else - { - h->next = n; - } - - h->last = n; - } - -} - - -/********************************************************************* - * - * Function : destroy_list - * - * Description : Destroy a string list (opposite of enlist) - * - * Parameters : - * 1 : h = pointer to list 'dummy' header - * - * Returns : N/A - * - *********************************************************************/ -void destroy_list(struct list *h) -{ - struct list *p, *n; - - for (p = h->next; p ; p = n) - { - n = p->next; - freez(p->str); - freez(p); - } - - memset(h, '\0', sizeof(*h)); - -} - - -/********************************************************************* - * - * Function : list_to_text - * - * Description : "Flaten" a string list into 1 long \r\n delimited string. - * - * Parameters : - * 1 : h = pointer to list 'dummy' header - * - * Returns : NULL on malloc error, else new long string. - * - *********************************************************************/ -static char *list_to_text(struct list *h) -{ - struct list *p; - char *ret = NULL; - char *s; - int size; - - size = 0; - - for (p = h->next; p ; p = p->next) - { - if (p->str) - { - size += strlen(p->str) + 2; - } - } - - if ((ret = (char *)malloc(size + 1)) == NULL) - { - return(NULL); - } - - ret[size] = '\0'; - - s = ret; - - for (p = h->next; p ; p = p->next) - { - if (p->str) - { - strcpy(s, p->str); - s += strlen(s); - *s++ = '\r'; *s++ = '\n'; - } - } - - return(ret); - -} - - /********************************************************************* * * Function : sed @@ -537,22 +509,27 @@ static char *list_to_text(struct list *h) *********************************************************************/ char *sed(const struct parsers pats[], void (* const more_headers[])(struct client_state *), struct client_state *csp) { - struct list *p; + struct list_entry *p; const struct parsers *v; 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->first; 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((char *)p->str); /* FIXME: Yuck! patching a list...*/ + p->str = hdr; + } + } } /* place any additional headers on the csp->headers list */ @@ -561,9 +538,6 @@ char *sed(const struct parsers pats[], void (* const more_headers[])(struct clie (*f)(csp); } - /* add the blank line at the end of the header */ - enlist(csp->headers, ""); - hdr = list_to_text(csp->headers); return(hdr); @@ -591,6 +565,8 @@ void free_http_request(struct http_request *http) freez(http->hostport); freez(http->path); freez(http->ver); + freez(http->host_ip_addr_str); + freez(http->user_agent); } @@ -612,7 +588,7 @@ void free_http_request(struct http_request *http) *********************************************************************/ void parse_http_request(char *req, struct http_request *http, struct client_state *csp) { - char *buf, *v[10], *url, *p; + char *buf, *v[10], *url, *p, *save_url; int n; memset(http, '\0', sizeof(*http)); @@ -620,7 +596,6 @@ void parse_http_request(char *req, struct http_request *http, struct client_stat http->cmd = strdup(req); buf = strdup(req); - n = ssplit(buf, " \r\n", v, SZ(v), 1, 1); if (n == 3) @@ -634,41 +609,41 @@ void parse_http_request(char *req, struct http_request *http, struct client_stat http->ver = strdup(v[2]); } -#ifdef WEBDAV - -/* This next line is a little ugly, but it simplifies the if statement below. */ -/* Basically if using webDAV, we want the OR condition to use these too. */ - -/* - * by haroon - * These are the headers as defined in RFC2518 to add webDAV support - */ - -#define OR_WEBDAV || \ - (0 == strcmpic(v[0], "propfind")) || \ - (0 == strcmpic(v[0], "proppatch")) || \ - (0 == strcmpic(v[0], "move")) || \ - (0 == strcmpic(v[0], "copy")) || \ - (0 == strcmpic(v[0], "mkcol")) || \ - (0 == strcmpic(v[0], "lock")) || \ - (0 == strcmpic(v[0], "unlock")) - -#else /* No webDAV support is enabled. Provide an empty OR_WEBDAV macro. */ - -#define OR_WEBDAV - -#endif - /* or it could be a GET or a POST (possibly webDAV too) */ - if ((strcmpic(v[0], "get") == 0) || - (strcmpic(v[0], "head") == 0) OR_WEBDAV || - (strcmpic(v[0], "post") == 0)) + if ((0 == strcmpic(v[0], "get")) + || (0 == strcmpic(v[0], "head")) + || (0 == strcmpic(v[0], "post")) + /* These are the headers as defined in RFC2518 to add webDAV support: */ + || (0 == strcmpic(v[0], "propfind")) + || (0 == strcmpic(v[0], "proppatch")) + || (0 == strcmpic(v[0], "move")) + || (0 == strcmpic(v[0], "copy")) + || (0 == strcmpic(v[0], "mkcol")) + || (0 == strcmpic(v[0], "lock")) + || (0 == strcmpic(v[0], "unlock")) + ) { - http->ssl = 0; - http->gpc = strdup(v[0]); - url = v[1]; - http->ver = strdup(v[2]); + http->ssl = 0; + http->gpc = strdup(v[0]); + url = v[1]; + /* since we don't support HTTP/1.1 we must not send it */ + if (!strcmpic(v[2], "HTTP/1.1")) + { + http->ver = strdup("HTTP/1.0"); + /* change cmd too (forwaring) */ + freez(http->cmd); + http->cmd = strsav(http->cmd, http->gpc); + http->cmd = strsav(http->cmd, " "); + http->cmd = strsav(http->cmd, url); + http->cmd = strsav(http->cmd, " "); + http->cmd = strsav(http->cmd, http->ver); + } + else + { + http->ver = strdup(v[2]); + } + save_url = url; if (strncmpic(url, "http://", 7) == 0) { url += 7; @@ -682,11 +657,31 @@ void parse_http_request(char *req, struct http_request *http, struct client_stat url = NULL; } - if (url && (p = strchr(url, '/'))) + if (url) { - http->path = strdup(p); - *p = '\0'; - http->hostport = strdup(url); + if ((p = strchr(url, '/'))) + { + http->path = strdup(p); + *p = '\0'; + http->hostport = strdup(url); + } + /* + * Repair broken HTTP requests that don't contain a path + */ + else + { + /* Repair hostport & path */ + http->path = strdup("/"); + http->hostport = strdup(url); + + /* Even repair cmd in case we're just forwarding. Boy are we nice ;-) */ + freez(http->cmd); + http->cmd = strsav(http->cmd, http->gpc); + http->cmd = strsav(http->cmd, " "); + http->cmd = strsav(http->cmd, save_url); + http->cmd = strsav(http->cmd, "/ "); + http->cmd = strsav(http->cmd, http->ver); + } } } } @@ -760,7 +755,7 @@ void parse_http_request(char *req, struct http_request *http, struct client_stat * Returns : Always NULL. * *********************************************************************/ -char *crumble(const struct parsers *v, char *s, struct client_state *csp) +char *crumble(const struct parsers *v, const char *s, struct client_state *csp) { log_error(LOG_LEVEL_HEADER, "crunch!"); return(NULL); @@ -768,13 +763,11 @@ char *crumble(const struct parsers *v, char *s, struct client_state *csp) } -#if defined(PCRS) || defined(KILLPOPUPS) - /********************************************************************* * * Function : content_type * - * Description : Is this a text/* or javascript MIME Type? + * Description : Is this a text/.* or javascript MIME Type? * * Parameters : * 1 : v = ignored @@ -784,18 +777,51 @@ char *crumble(const struct parsers *v, char *s, struct client_state *csp) * Returns : A duplicate string pointer to this header (ie. pass thru) * *********************************************************************/ -char *content_type(const struct parsers *v, char *s, struct client_state *csp) +char *content_type(const struct parsers *v, const char *s, struct client_state *csp) { - if (strstr (s, " text/") || strstr (s, "application/x-javascript")) - csp->is_text = 1; + if (strstr(s, " text/") || strstr(s, "application/x-javascript")) + csp->content_type = CT_TEXT; + else if (strstr(s, " image/gif")) + csp->content_type = CT_GIF; else - csp->is_text = 0; + csp->content_type = 0; return(strdup(s)); } -#endif /* defined(PCRS) || defined(KILLPOPUPS) */ + +/********************************************************************* + * + * Function : content_length + * + * Description : Adjust Content-Length header if we modified + * the body. + * + * 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, const char *s, struct client_state *csp) +{ + if (csp->content_length != 0) /* Content has been modified */ + { + char * s2 = (char *) zalloc(100); + sprintf(s2, "Content-Length: %d", (int) csp->content_length); + + log_error(LOG_LEVEL_HEADER, "Adjust Content-Length to %d", (int) csp->content_length); + return(s2); + } + else + { + return(strdup(s)); + } + +} /********************************************************************* @@ -814,70 +840,90 @@ char *content_type(const struct parsers *v, char *s, struct client_state *csp) * or modified header * *********************************************************************/ -char *client_referrer(const struct parsers *v, char *s, struct client_state *csp) +char *client_referrer(const struct parsers *v, const char *s, struct client_state *csp) { -#ifdef FORCE_LOAD + const char * newval; + char * s2; +#ifdef FEATURE_FORCE_LOAD /* Since the referrer can include the prefix even * even if the request itself is non-forced, we must * clean it unconditionally */ strclean(s, FORCE_PREFIX); -#endif /* def FORCE_LOAD */ +#endif /* def FEATURE_FORCE_LOAD */ +#ifdef FEATURE_TRUST csp->referrer = strdup(s); +#endif /* def FEATURE_TRUST */ - if (csp->config->referrer == NULL) + /* + * Are we sending referer? + */ + if ((csp->action->flags & ACTION_HIDE_REFERER) == 0) { - log_error(LOG_LEVEL_HEADER, "crunch!"); - return(NULL); + return(strdup(s)); } - if (*csp->config->referrer == '.') + newval = csp->action->string[ACTION_STRING_REFERER]; + + /* + * Are we blocking referer? + */ + if ((newval == NULL) || (0 == strcmpic(newval, "block")) ) { - return(strdup(s)); + log_error(LOG_LEVEL_HEADER, "crunch!"); + return(NULL); } - if (*csp->config->referrer == '@') + /* + * Are we forging referer? + */ + if (0 == strcmpic(newval, "forge")) { - if (csp->permissions & PERMIT_COOKIE_READ) - { - return(strdup(s)); - } - else - { - log_error(LOG_LEVEL_HEADER, "crunch!"); - return(NULL); - } + /* + * Forge a referer as http://[hostname:port of REQUEST]/ + * to fool stupid checks for in-site links + */ + log_error(LOG_LEVEL_HEADER, "crunch+forge!"); + s2 = strsav(NULL, "Referer: "); + s2 = strsav(s2, "http://"); + s2 = strsav(s2, csp->http->hostport); + s2 = strsav(s2, "/"); + return(s2); } /* - * New option § or L: Forge a referer as http://[hostname:port of REQUEST]/ - * to fool stupid checks for in-site links + * Have we got a fixed referer? */ - - if (*csp->config->referrer == '§' || *csp->config->referrer == 'L') + if (0 == strncmpic(newval, "http://", 7)) { - if (csp->permissions & PERMIT_COOKIE_READ) - { - return(strdup(s)); - } - else - { - log_error(LOG_LEVEL_HEADER, "crunch+forge!"); - s = strsav(NULL, "Referer: "); - s = strsav(s, "http://"); - s = strsav(s, csp->http->hostport); - s = strsav(s, "/"); - return(s); - } - } + /* + * We have a specific (fixed) referer we want to send. + */ + char * s3; - log_error(LOG_LEVEL_HEADER, "modified"); + log_error(LOG_LEVEL_HEADER, "modified"); + + s3 = strsav( NULL, "Referer: " ); + s3 = strsav( s3, newval ); + return(s3); + } - s = strsav( NULL, "Referer: " ); - s = strsav( s, csp->config->referrer ); - return(s); + /* Should never get here! */ + log_error(LOG_LEVEL_ERROR, "Bad parameter: +referer{%s}", newval); + /* + * Forge is probably the best default. + * + * Forge a referer as http://[hostname:port of REQUEST]/ + * to fool stupid checks for in-site links + */ + log_error(LOG_LEVEL_HEADER, "crunch+forge!"); + s2 = strsav(NULL, "Referer: "); + s2 = strsav(s2, "http://"); + s2 = strsav(s2, csp->http->hostport); + s2 = strsav(s2, "/"); + return(s2); } @@ -885,8 +931,9 @@ char *client_referrer(const struct parsers *v, char *s, struct client_state *csp * * Function : client_uagent * - * Description : Handle the "user-agent" config setting properly. - * Called from `sed'. + * Description : Handle the "user-agent" config setting properly + * and remember its original value to enable browser + * bug workarounds. Called from `sed'. * * Parameters : * 1 : v = ignored @@ -897,9 +944,18 @@ char *client_referrer(const struct parsers *v, char *s, struct client_state *csp * a malloc'ed string pointer to this header (ie. pass thru). * *********************************************************************/ -char *client_uagent(const struct parsers *v, char *s, struct client_state *csp) +char *client_uagent(const struct parsers *v, const char *s, struct client_state *csp) { -#ifdef DETECT_MSIE_IMAGES + const char * newval; + char * s2; + + /* Save the client's User-Agent: value */ + if (strlen(s) >= 12) + { + csp->http->user_agent = strdup(s + 12); + } + +#ifdef FEATURE_IMAGE_DETECT_MSIE if (strstr (s, "MSIE ")) { /* This is Microsoft Internet Explorer. @@ -907,37 +963,24 @@ char *client_uagent(const struct parsers *v, char *s, struct client_state *csp) */ csp->accept_types |= ACCEPT_TYPE_IS_MSIE; } -#endif /* def DETECT_MSIE_IMAGES */ - - if (csp->config->uagent == NULL) - { - log_error(LOG_LEVEL_HEADER, "default"); - return(strdup(DEFAULT_USER_AGENT)); - } +#endif /* def FEATURE_IMAGE_DETECT_MSIE */ - if (*csp->config->uagent == '.') + if ((csp->action->flags & ACTION_HIDE_USER_AGENT) == 0) { return(strdup(s)); } - if (*csp->config->uagent == '@') + newval = csp->action->string[ACTION_STRING_USER_AGENT]; + if (newval == NULL) { - if (csp->permissions & PERMIT_COOKIE_READ) - { - return(strdup(s)); - } - else - { - log_error(LOG_LEVEL_HEADER, "default"); - return(strdup(DEFAULT_USER_AGENT)); - } + return(strdup(s)); } log_error(LOG_LEVEL_HEADER, "modified"); - s = strsav( NULL, "User-Agent: " ); - s = strsav( s, csp->config->uagent ); - return(s); + s2 = strsav( NULL, "User-Agent: " ); + s2 = strsav( s2, newval ); + return(s2); } @@ -956,35 +999,17 @@ char *client_uagent(const struct parsers *v, char *s, struct client_state *csp) * Returns : NULL if crunched, or a malloc'ed string to original header * *********************************************************************/ -char *client_ua(const struct parsers *v, char *s, struct client_state *csp) +char *client_ua(const struct parsers *v, const char *s, struct client_state *csp) { - if (csp->config->uagent == NULL) - { - log_error(LOG_LEVEL_HEADER, "crunch!"); - return(NULL); - } - - if (*csp->config->uagent == '.') + if ((csp->action->flags & ACTION_HIDE_USER_AGENT) == 0) { return(strdup(s)); } - - if (*csp->config->uagent == '@') + else { - if (csp->permissions & PERMIT_COOKIE_READ) - { - return(strdup(s)); - } - else - { - log_error(LOG_LEVEL_HEADER, "crunch!"); - return(NULL); - } + log_error(LOG_LEVEL_HEADER, "crunch!"); + return(NULL); } - - log_error(LOG_LEVEL_HEADER, "crunch!"); - return(NULL); - } @@ -1004,25 +1029,32 @@ char *client_ua(const struct parsers *v, char *s, struct client_state *csp) * modified/original header. * *********************************************************************/ -char *client_from(const struct parsers *v, char *s, struct client_state *csp) +char *client_from(const struct parsers *v, const char *s, struct client_state *csp) { - /* if not set, zap it */ - if (csp->config->from == NULL) + const char * newval; + char * s2; + + if ((csp->action->flags & ACTION_HIDE_FROM) == 0) { - log_error(LOG_LEVEL_HEADER, "crunch!"); - return(NULL); + return(strdup(s)); } - if (*csp->config->from == '.') + newval = csp->action->string[ACTION_STRING_FROM]; + + /* + * Are we blocking referer? + */ + if ((newval == NULL) || (0 == strcmpic(newval, "block")) ) { - return(strdup(s)); + log_error(LOG_LEVEL_HEADER, "crunch!"); + return(NULL); } log_error(LOG_LEVEL_HEADER, " modified"); - s = strsav( NULL, "From: " ); - s = strsav( s, csp->config->from ); - return(s); + s2 = strsav( NULL, "From: " ); + s2 = strsav( s2, newval ); + return(s2); } @@ -1043,9 +1075,9 @@ char *client_from(const struct parsers *v, char *s, struct client_state *csp) * Returns : Always NULL. * *********************************************************************/ -char *client_send_cookie(const struct parsers *v, char *s, struct client_state *csp) +char *client_send_cookie(const struct parsers *v, const char *s, struct client_state *csp) { - if (csp->permissions & PERMIT_COOKIE_READ) + if ((csp->action->flags & ACTION_NO_COOKIE_READ) == 0) { enlist(csp->cookie_list, s + v->len + 1); } @@ -1078,10 +1110,11 @@ char *client_send_cookie(const struct parsers *v, char *s, struct client_state * * Returns : Always NULL. * *********************************************************************/ -char *client_x_forwarded(const struct parsers *v, char *s, struct client_state *csp) +char *client_x_forwarded(const struct parsers *v, const char *s, struct client_state *csp) { - if (csp->config->add_forwarded) + if ((csp->action->flags & ACTION_HIDE_FORWARDED) == 0) { + /* Save it so we can re-add it later */ csp->x_forwarded = strdup(s); } @@ -1094,7 +1127,7 @@ char *client_x_forwarded(const struct parsers *v, char *s, struct client_state * } -#if defined(DETECT_MSIE_IMAGES) +#if defined(FEATURE_IMAGE_DETECT_MSIE) /********************************************************************* * * Function : client_accept @@ -1112,9 +1145,9 @@ char *client_x_forwarded(const struct parsers *v, char *s, struct client_state * * Returns : Duplicate of argument s. * *********************************************************************/ -char *client_accept(const struct parsers *v, char *s, struct client_state *csp) +char *client_accept(const struct parsers *v, const char *s, struct client_state *csp) { -#ifdef DETECT_MSIE_IMAGES +#ifdef FEATURE_IMAGE_DETECT_MSIE if (strstr (s, "image/gif")) { /* Client will accept HTML. If this seems counterintuitive, @@ -1126,12 +1159,12 @@ char *client_accept(const struct parsers *v, char *s, struct client_state *csp) { csp->accept_types |= ACCEPT_TYPE_MSIE_IMAGE; } -#endif /* def DETECT_MSIE_IMAGES */ +#endif /* def FEATURE_IMAGE_DETECT_MSIE */ return(strdup(s)); } -#endif /* defined(DETECT_MSIE_IMAGES) */ +#endif /* defined(FEATURE_IMAGE_DETECT_MSIE) */ @@ -1152,27 +1185,27 @@ char *client_accept(const struct parsers *v, char *s, struct client_state *csp) *********************************************************************/ void client_cookie_adder(struct client_state *csp) { - struct list *l; + struct list_entry *lst; char *tmp = NULL; char *e; - for (l = csp->cookie_list->next; l ; l = l->next) + for (lst = csp->cookie_list->first; lst ; lst = lst->next) { if (tmp) { tmp = strsav(tmp, "; "); } - tmp = strsav(tmp, l->str); + tmp = strsav(tmp, lst->str); } - for (l = csp->config->wafer_list->next; l ; l = l->next) + for (lst = csp->action->multi[ACTION_MULTI_WAFER]->first; lst ; lst = lst->next) { if (tmp) { tmp = strsav(tmp, "; "); } - if ((e = cookie_encode(l->str))) + if ((e = cookie_encode(lst->str))) { tmp = strsav(tmp, e); freez(e); @@ -1208,12 +1241,13 @@ void client_cookie_adder(struct client_state *csp) *********************************************************************/ void client_xtra_adder(struct client_state *csp) { - struct list *l; + struct list_entry *lst; - for (l = csp->config->xtra_list->next; l ; l = l->next) + for (lst = csp->action->multi[ACTION_MULTI_ADD_HEADER]->first; + lst ; lst = lst->next) { - log_error(LOG_LEVEL_HEADER, "addh: %s", l->str); - enlist(csp->headers, l->str); + log_error(LOG_LEVEL_HEADER, "addh: %s", lst->str); + enlist(csp->headers, lst->str); } } @@ -1235,9 +1269,9 @@ void client_x_forwarded_adder(struct client_state *csp) { char *p = NULL; - if (csp->config->add_forwarded == 0) - { - return; + if ((csp->action->flags & ACTION_HIDE_FORWARDED) != 0) + { + return; } if (csp->x_forwarded) @@ -1255,6 +1289,54 @@ void client_x_forwarded_adder(struct client_state *csp) log_error(LOG_LEVEL_HEADER, "addh: %s", p); enlist(csp->headers, p); + freez(p); +} + + +/********************************************************************* + * + * Function : connection_close_adder + * + * Description : Adds a "Connection: close" header to csp->headers + * as a temporary fix for the needed but missing HTTP/1.1 + * support. Called from `sed'. + * FIXME: This whole function shouldn't be neccessary! + * + * Parameters : + * 1 : csp = Current client state (buffers, headers, etc...) + * + * Returns : N/A + * + *********************************************************************/ +void connection_close_adder(struct client_state *csp) +{ + enlist(csp->headers, "Connection: close"); +} + + +/********************************************************************* + * + * Function : server_http11 + * + * Description : Rewrite HTTP/1.1 answers to HTTP/1.0 until we add + * HTTP/1.1 support. Called from `sed'. + * + * Parameters : + * 1 : v = parser pattern that matched this header + * 2 : s = header that matched this pattern + * 3 : csp = Current client state (buffers, headers, etc...) + * + * Returns : "HTTP/1.0" answer. + * + *********************************************************************/ +char *server_http11(const struct parsers *v, const char *s, struct client_state *csp) +{ + char *ret; + + ret = strdup(s); + ret[7] = '0'; /* "HTTP/1.1 ..." -> "HTTP/1.0 ..." */ + + return ret; } @@ -1274,16 +1356,16 @@ void client_x_forwarded_adder(struct client_state *csp) * Returns : `crumble' or a newly malloc'ed string. * *********************************************************************/ -char *server_set_cookie(const struct parsers *v, char *s, struct client_state *csp) +char *server_set_cookie(const struct parsers *v, const char *s, struct client_state *csp) { -#ifdef JAR_FILES +#ifdef FEATURE_COOKIE_JAR if (csp->config->jar) { fprintf(csp->config->jar, "%s\t%s\n", csp->http->host, (s + v->len + 1)); } -#endif /* def JAR_FILES */ +#endif /* def FEATURE_COOKIE_JAR */ - if (!(csp->permissions & PERMIT_COOKIE_SET)) + if ((csp->action->flags & ACTION_NO_COOKIE_SET) != 0) { return(crumble(v, s, csp)); } @@ -1293,7 +1375,7 @@ char *server_set_cookie(const struct parsers *v, char *s, struct client_state *c } -#ifdef FORCE_LOAD +#ifdef FEATURE_FORCE_LOAD /********************************************************************* * * Function : client_host @@ -1309,19 +1391,21 @@ char *server_set_cookie(const struct parsers *v, char *s, struct client_state *c * Returns : A malloc'ed pointer to the cleaned host header * *********************************************************************/ -char *client_host(const struct parsers *v, char *s, struct client_state *csp) +char *client_host(const struct parsers *v, const char *s, struct client_state *csp) { char *cleanhost = strdup(s); if(csp->force) + { strclean(cleanhost, FORCE_PREFIX); + } return(cleanhost); } -#endif /* def FORCE_LOAD */ +#endif /* def FEATURE_FORCE_LOAD */ -#ifdef FORCE_LOAD +#ifdef FEATURE_FORCE_LOAD /********************************************************************* * * Function : strclean @@ -1355,7 +1439,7 @@ int strclean(const char *string, const char *substring) return(hits); } -#endif /* def FORCE_LOAD */ +#endif /* def FEATURE_FORCE_LOAD */ /*