X-Git-Url: http://www.privoxy.org/gitweb/?p=privoxy.git;a=blobdiff_plain;f=parsers.c;h=eef1fd613bd427503a26893df9e21663fe9afdcf;hp=11b511e6000fe20704dcc433110359b289f3d8f7;hb=eaf36cae45ade9aabc5651da1735766b692fcf15;hpb=4d8b69fc32edd48072ac1dedc02a24b98fe1e6e5 diff --git a/parsers.c b/parsers.c index 11b511e6..eef1fd61 100644 --- a/parsers.c +++ b/parsers.c @@ -1,4 +1,4 @@ -const char parsers_rcs[] = "$Id: parsers.c,v 1.17 2001/06/29 21:45:41 oes Exp $"; +const char parsers_rcs[] = "$Id: parsers.c,v 1.35 2001/10/09 22:39:21 jongfoster Exp $"; /********************************************************************* * * File : $Source: /cvsroot/ijbswa/current/parsers.c,v $ @@ -41,6 +41,104 @@ const char parsers_rcs[] = "$Id: parsers.c,v 1.17 2001/06/29 21:45:41 oes Exp $" * * Revisions : * $Log: parsers.c,v $ + * Revision 1.35 2001/10/09 22:39:21 jongfoster + * assert.h is also required under Win32, so moving out of #ifndef _WIN32 + * block. + * + * Revision 1.34 2001/10/07 18:50:55 oes + * Added server_content_encoding, renamed server_transfer_encoding + * + * Revision 1.33 2001/10/07 18:04:49 oes + * Changed server_http11 to server_http and its pattern to "HTTP". + * Additional functionality: it now saves the HTTP status into + * csp->http->status and sets CT_TABOO for Status 206 (partial range) + * + * Revision 1.32 2001/10/07 15:43:28 oes + * Removed FEATURE_DENY_GZIP and replaced it with client_accept_encoding, + * client_te and client_accept_encoding_adder, triggered by the new + * +no-compression action. For HTTP/1.1 the Accept-Encoding header is + * changed to allow only identity and chunked, and the TE header is + * crunched. For HTTP/1.0, Accept-Encoding is crunched. + * + * parse_http_request no longer does anything than parsing. The rewriting + * of http->cmd and version mangling are gone. It now also recognizes + * the put and delete methods and saves the url in http->url. Removed + * unused variable. + * + * renamed content_type and content_length to have the server_ prefix + * + * server_content_type now only works if csp->content_type != CT_TABOO + * + * added server_transfer_encoding, which + * - Sets CT_TABOO to prohibit filtering if encoding compresses + * - Raises the CSP_FLAG_CHUNKED flag if Encoding is "chunked" + * - Change from "chunked" to "identity" if body was chunked + * but has been de-chunked for filtering. + * + * added server_content_md5 which crunches any Content-MD5 headers + * if the body was modified. + * + * made server_http11 conditional on +downgrade action + * + * Replaced 6 boolean members of csp with one bitmap (csp->flags) + * + * Revision 1.31 2001/10/05 14:25:02 oes + * Crumble Keep-Alive from Server + * + * Revision 1.30 2001/09/29 12:56:03 joergs + * IJB now changes HTTP/1.1 to HTTP/1.0 in requests and answers. + * + * 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 * @@ -66,7 +164,7 @@ const char parsers_rcs[] = "$Id: parsers.c,v 1.17 2001/06/29 21:45:41 oes Exp $" * CRLF -> LF * * Revision 1.11 2001/05/29 20:11:19 joergs - * '/* inside comment' warning removed. + * '/ * inside comment' warning removed. * * Revision 1.10 2001/05/29 09:50:24 jongfoster * Unified blocklist/imagelist/permissionslist. @@ -192,10 +290,14 @@ const char parsers_rcs[] = "$Id: parsers.c,v 1.17 2001/06/29 21:45:41 oes Exp $" #include "config.h" +#ifndef _WIN32 #include #include #include #include +#endif + +#include #include #ifndef _WIN32 @@ -206,15 +308,10 @@ const char parsers_rcs[] = "$Id: parsers.c,v 1.17 2001/06/29 21:45:41 oes Exp $" #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" #include "miscutil.h" -#include "cgi.h" const char parsers_h_rcs[] = PARSERS_H_VERSION; @@ -239,39 +336,47 @@ 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 - { "Accept-Encoding: gzip", 21, crumble }, -#endif /* def DENY_GZIP */ -#if defined(DETECT_MSIE_IMAGES) + { "Accept-Encoding:", 16, client_accept_encoding }, + { "TE:", 3, client_te }, +#if defined(FEATURE_IMAGE_DETECT_MSIE) { "Accept:", 7, client_accept }, -#endif /* defined(DETECT_MSIE_IMAGES) */ -#ifdef FORCE_LOAD - { "Host:", 5, client_host }, -#endif /* def FORCE_LOAD */ +#endif /* defined(FEATURE_IMAGE_DETECT_MSIE) */ + { "Host:", 5, crumble }, /* { "if-modified-since:", 18, crumble }, */ + { "Keep-Alive:", 11, crumble }, + { "connection:", 11, crumble }, + { "proxy-connection:", 17, crumble }, { NULL, 0, NULL } }; const struct parsers server_patterns[] = { + { "HTTP", 4, server_http }, { "set-cookie:", 11, server_set_cookie }, { "connection:", 11, crumble }, - { "Content-Type:", 13, content_type }, - { "Content-Length:", 15, content_length }, + { "Content-Type:", 13, server_content_type }, + { "Content-Length:", 15, server_content_length }, + { "Content-MD5:", 12, server_content_md5 }, + { "Content-Encoding:", 17, server_content_encoding }, + { "Transfer-Encoding:", 18, server_transfer_coding }, + { "Keep-Alive:", 11, crumble }, { NULL, 0, NULL } }; void (* const add_client_headers[])(struct client_state *) = { + client_host_adder, client_cookie_adder, client_x_forwarded_adder, client_xtra_adder, + client_accept_encoding_adder, + connection_close_adder, NULL }; void (* const add_server_headers[])(struct client_state *) = { + connection_close_adder, NULL }; @@ -455,14 +560,14 @@ char *get_header(struct client_state *csp) *********************************************************************/ 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 (v = pats; v->str ; v++) { - for (p = csp->headers->next; p ; p = p->next) + for (p = csp->headers->first; p ; p = p->next) { /* Header crunch()ed in previous run? -> ignore */ if (p->str == NULL) continue; @@ -472,7 +577,7 @@ char *sed(const struct parsers pats[], void (* const more_headers[])(struct clie if (strncmpic(p->str, v->str, v->len) == 0) { hdr = v->parser(v, p->str, csp); - freez(p->str); + freez((char *)p->str); /* FIXME: Yuck! patching a list...*/ p->str = hdr; } } @@ -484,14 +589,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, if necessary */ - if ( (csp->headers->last == NULL) - || (csp->headers->last->str == NULL) - || (*csp->headers->last->str != '\0') ) - { - enlist(csp->headers, ""); - } - hdr = list_to_text(csp->headers); return(hdr); @@ -513,13 +610,17 @@ char *sed(const struct parsers pats[], void (* const more_headers[])(struct clie *********************************************************************/ void free_http_request(struct http_request *http) { + assert(http); + freez(http->cmd); freez(http->gpc); freez(http->host); + freez(http->url); freez(http->hostport); freez(http->path); freez(http->ver); freez(http->host_ip_addr_str); + freez(http->user_agent); } @@ -545,8 +646,7 @@ void parse_http_request(char *req, struct http_request *http, struct client_stat int n; memset(http, '\0', sizeof(*http)); - - http->cmd = strdup(req); + http->cmd = strdup(req); buf = strdup(req); n = ssplit(buf, " \r\n", v, SZ(v), 1, 1); @@ -562,41 +662,29 @@ 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)) + /* or it could be any other basic HTTP request type */ + if ((0 == strcmpic(v[0], "get")) + || (0 == strcmpic(v[0], "head")) + || (0 == strcmpic(v[0], "post")) + || (0 == strcmpic(v[0], "put")) + || (0 == strcmpic(v[0], "delete")) + + /* or a webDAV extension (RFC2518) */ + || (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]); + http->url = strdup(v[1]); + http->ver = strdup(v[2]); + url = v[1]; if (strncmpic(url, "http://", 7) == 0) { url += 7; @@ -612,7 +700,7 @@ void parse_http_request(char *req, struct http_request *http, struct client_stat if (url) { - if (p = strchr(url, '/')) + if ((p = strchr(url, '/'))) { http->path = strdup(p); *p = '\0'; @@ -623,15 +711,8 @@ void parse_http_request(char *req, struct http_request *http, struct client_stat */ 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, http->ver); } } } @@ -682,7 +763,7 @@ void parse_http_request(char *req, struct http_request *http, struct client_stat if (http->path == NULL) { - http->path = strdup(""); + http->path = strdup("/"); } } @@ -706,7 +787,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); @@ -716,9 +797,11 @@ char *crumble(const struct parsers *v, char *s, struct client_state *csp) /********************************************************************* * - * Function : content_type + * Function : server_content_type * - * Description : Is this a text/.* or javascript MIME Type? + * Description : Set the content-type for filterable types (text/.*, + * javascript and image/gif) unless filtering has been + * forbidden (CT_TABOO) while parsing earlier headers. * * Parameters : * 1 : v = ignored @@ -728,14 +811,66 @@ 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 *server_content_type(const struct parsers *v, const char *s, struct client_state *csp) { - 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->content_type = 0; + if (csp->content_type != CT_TABOO) + { + 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->content_type = 0; + } + + return(strdup(s)); + +} + + +/********************************************************************* + * + * Function : server_transfer_coding + * + * Description : - Prohibit filtering (CT_TABOO) if transfer coding compresses + * - Raise the CSP_FLAG_CHUNKED flag if coding is "chunked" + * - Change from "chunked" to "identity" if body was chunked + * but has been de-chunked for filtering. + * + * 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 *server_transfer_coding(const struct parsers *v, const char *s, struct client_state *csp) +{ + /* + * Turn off pcrs and gif filtering if body compressed + */ + if (strstr(s, "gzip") || strstr(s, "compress") || strstr(s, "deflate")) + { + csp->content_type = CT_TABOO; + } + + /* + * Raise flag if body chunked + */ + if (strstr(s, "chunked")) + { + csp->flags |= CSP_FLAG_CHUNKED; + + /* + * If the body was modified, it has been + * de-chunked first, so adjust the header: + */ + if (csp->flags & CSP_FLAG_MODIFIED) + { + return(strdup("Transfer-Encoding: identity")); + } + } return(strdup(s)); @@ -744,7 +879,36 @@ char *content_type(const struct parsers *v, char *s, struct client_state *csp) /********************************************************************* * - * Function : content_length + * Function : server_content_encoding + * + * Description : Prohibit filtering (CT_TABOO) if content encoding compresses + * + * 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 *server_content_encoding(const struct parsers *v, const char *s, struct client_state *csp) +{ + /* + * Turn off pcrs and gif filtering if body compressed + */ + if (strstr(s, "gzip") || strstr(s, "compress") || strstr(s, "deflate")) + { + csp->content_type = CT_TABOO; + } + + return(strdup(s)); + +} + + +/********************************************************************* + * + * Function : server_content_length * * Description : Adjust Content-Length header if we modified * the body. @@ -757,15 +921,15 @@ char *content_type(const struct parsers *v, char *s, struct client_state *csp) * Returns : A duplicate string pointer to this header (ie. pass thru) * *********************************************************************/ -char *content_length(const struct parsers *v, char *s, struct client_state *csp) +char *server_content_length(const struct parsers *v, const char *s, struct client_state *csp) { - if (csp->content_length != 0) /* Content has been modified */ + if (csp->content_length != 0) /* Content length has been modified */ { - s = (char *) zalloc(100); - sprintf(s, "Content-Length: %d", csp->content_length); + char * s2 = (char *) zalloc(100); + sprintf(s2, "Content-Length: %d", (int) csp->content_length); - log_error(LOG_LEVEL_HEADER, "Adjust Content-Length to %d", csp->content_length); - return(s); + log_error(LOG_LEVEL_HEADER, "Adjust Content-Length to %d", (int) csp->content_length); + return(s2); } else { @@ -775,6 +939,104 @@ char *content_length(const struct parsers *v, char *s, struct client_state *csp) } +/********************************************************************* + * + * Function : server_content_md5 + * + * Description : Crumble any Content-MD5 headers if the document was + * modified. FIXME: Should we re-compute instead? + * + * 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 *server_content_md5(const struct parsers *v, const char *s, struct client_state *csp) +{ + if (csp->flags & CSP_FLAG_MODIFIED) + { + log_error(LOG_LEVEL_HEADER, "Crunching Content-MD5"); + return(NULL); + } + else + { + return(strdup(s)); + } + +} + + +/********************************************************************* + * + * Function : client_accept_encoding + * + * Description : Rewrite the client's Accept-Encoding header so that + * if doesn't allow compression, if the action applies. + * Note: For HTTP/1.0 the absence of the header is enough. + * + * Parameters : + * 1 : v = ignored + * 2 : s = header string we are "considering" + * 3 : csp = Current client state (buffers, headers, etc...) + * + * Returns : A copy of the client's original or the modified header. + * + *********************************************************************/ +char *client_accept_encoding(const struct parsers *v, const char *s, struct client_state *csp) +{ + if ((csp->action->flags & ACTION_NO_COMPRESSION) == 0) + { + return(strdup(s)); + } + else + { + log_error(LOG_LEVEL_HEADER, "Supressed offer to compress content"); + + if (!strcmpic(csp->http->ver, "HTTP/1.1")) + { + return(strdup("Accept-Encoding: identity;q=1.0, *;q=0")); + } + else + { + return(NULL); + } + } + +} + + +/********************************************************************* + * + * Function : client_te + * + * Description : Rewrite the client's TE header so that + * if doesn't allow compression, if the action applies. + * + * Parameters : + * 1 : v = ignored + * 2 : s = header string we are "considering" + * 3 : csp = Current client state (buffers, headers, etc...) + * + * Returns : A copy of the client's original or the modified header. + * + *********************************************************************/ +char *client_te(const struct parsers *v, const char *s, struct client_state *csp) +{ + if ((csp->action->flags & ACTION_NO_COMPRESSION) == 0) + { + return(strdup(s)); + } + else + { + log_error(LOG_LEVEL_HEADER, "Supressed offer to compress transfer"); + return(NULL); + } + +} + /********************************************************************* * * Function : client_referrer @@ -791,20 +1053,21 @@ char *content_length(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) { const char * newval; -#ifdef FORCE_LOAD + 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 TRUST_FILES +#ifdef FEATURE_TRUST csp->referrer = strdup(s); -#endif /* def TRUST_FILES */ +#endif /* def FEATURE_TRUST */ /* * Are we sending referer? @@ -835,11 +1098,11 @@ char *client_referrer(const struct parsers *v, char *s, struct client_state *csp * to fool stupid checks for in-site links */ 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); + s2 = strsav(NULL, "Referer: "); + s2 = strsav(s2, "http://"); + s2 = strsav(s2, csp->http->hostport); + s2 = strsav(s2, "/"); + return(s2); } /* @@ -850,12 +1113,13 @@ char *client_referrer(const struct parsers *v, char *s, struct client_state *csp /* * We have a specific (fixed) referer we want to send. */ + char * s3; log_error(LOG_LEVEL_HEADER, "modified"); - s = strsav( NULL, "Referer: " ); - s = strsav( s, newval ); - return(s); + s3 = strsav( NULL, "Referer: " ); + s3 = strsav( s3, newval ); + return(s3); } /* Should never get here! */ @@ -868,11 +1132,11 @@ char *client_referrer(const struct parsers *v, char *s, struct client_state *csp * to fool stupid checks for in-site links */ 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); + s2 = strsav(NULL, "Referer: "); + s2 = strsav(s2, "http://"); + s2 = strsav(s2, csp->http->hostport); + s2 = strsav(s2, "/"); + return(s2); } @@ -880,8 +1144,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 @@ -892,11 +1157,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) { const char * newval; + char * s2; + + /* Save the client's User-Agent: value */ + if (strlen(s) >= 12) + { + csp->http->user_agent = strdup(s + 12); + } -#ifdef DETECT_MSIE_IMAGES +#ifdef FEATURE_IMAGE_DETECT_MSIE if (strstr (s, "MSIE ")) { /* This is Microsoft Internet Explorer. @@ -904,7 +1176,7 @@ 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 */ +#endif /* def FEATURE_IMAGE_DETECT_MSIE */ if ((csp->action->flags & ACTION_HIDE_USER_AGENT) == 0) { @@ -919,9 +1191,9 @@ char *client_uagent(const struct parsers *v, char *s, struct client_state *csp) log_error(LOG_LEVEL_HEADER, "modified"); - s = strsav( NULL, "User-Agent: " ); - s = strsav( s, newval ); - return(s); + s2 = strsav( NULL, "User-Agent: " ); + s2 = strsav( s2, newval ); + return(s2); } @@ -940,7 +1212,7 @@ 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->action->flags & ACTION_HIDE_USER_AGENT) == 0) { @@ -970,9 +1242,10 @@ 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) { const char * newval; + char * s2; if ((csp->action->flags & ACTION_HIDE_FROM) == 0) { @@ -992,9 +1265,9 @@ char *client_from(const struct parsers *v, char *s, struct client_state *csp) log_error(LOG_LEVEL_HEADER, " modified"); - s = strsav( NULL, "From: " ); - s = strsav( s, newval ); - return(s); + s2 = strsav( NULL, "From: " ); + s2 = strsav( s2, newval ); + return(s2); } @@ -1015,7 +1288,7 @@ 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->action->flags & ACTION_NO_COOKIE_READ) == 0) { @@ -1050,7 +1323,7 @@ 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->action->flags & ACTION_HIDE_FORWARDED) == 0) { @@ -1067,7 +1340,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 @@ -1085,9 +1358,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, @@ -1099,18 +1372,44 @@ 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) */ /* the following functions add headers directly to the header list */ +/********************************************************************* + * + * Function : client_host_adder + * + * Description : (re)adds the host header. Called from `sed'. + * + * Parameters : + * 1 : csp = Current client state (buffers, headers, etc...) + * + * Returns : N/A + * + *********************************************************************/ +void client_host_adder(struct client_state *csp) +{ + char *p = NULL; + + p = strsav(p, "Host: "); + p = strsav(p, csp->http->hostport); + + log_error(LOG_LEVEL_HEADER, "addh: %s", p); + enlist(csp->headers, p); + + freez(p); +} + + /********************************************************************* * * Function : client_cookie_adder @@ -1125,11 +1424,11 @@ char *client_accept(const struct parsers *v, char *s, struct client_state *csp) *********************************************************************/ void client_cookie_adder(struct client_state *csp) { - struct list *lst; + struct list_entry *lst; char *tmp = NULL; char *e; - for (lst = csp->cookie_list->next; lst ; lst = lst->next) + for (lst = csp->cookie_list->first; lst ; lst = lst->next) { if (tmp) { @@ -1138,7 +1437,7 @@ void client_cookie_adder(struct client_state *csp) tmp = strsav(tmp, lst->str); } - for (lst = csp->action->multi[ACTION_MULTI_WAFER]->next; lst ; lst = lst->next) + for (lst = csp->action->multi[ACTION_MULTI_WAFER]->first; lst ; lst = lst->next) { if (tmp) { @@ -1167,6 +1466,32 @@ void client_cookie_adder(struct client_state *csp) } +/********************************************************************* + * + * Function : client_accept_encoding_adder + * + * Description : Add an Accept-Encoding header to the client's request + * that disables compression if the action applies, and + * the header is not already there. Called from `sed'. + * Note: For HTTP/1.0, the absence of the header is enough. + * + * Parameters : + * 1 : csp = Current client state (buffers, headers, etc...) + * + * Returns : N/A + * + *********************************************************************/ +void client_accept_encoding_adder(struct client_state *csp) +{ + if ( ((csp->action->flags & ACTION_NO_COMPRESSION) != 0) + && (!strcmpic(csp->http->ver, "HTTP/1.1")) ) + { + enlist_unique(csp->headers, "Accept-Encoding: identity;q=1.0, *;q=0", 16); + } + +} + + /********************************************************************* * * Function : client_xtra_adder @@ -1181,9 +1506,10 @@ void client_cookie_adder(struct client_state *csp) *********************************************************************/ void client_xtra_adder(struct client_state *csp) { - struct list *lst = csp->action->multi[ACTION_MULTI_ADD_HEADER]; + struct list_entry *lst; - for (lst = lst->next; lst ; lst = lst->next) + for (lst = csp->action->multi[ACTION_MULTI_ADD_HEADER]->first; + lst ; lst = lst->next) { log_error(LOG_LEVEL_HEADER, "addh: %s", lst->str); enlist(csp->headers, lst->str); @@ -1228,73 +1554,105 @@ void client_x_forwarded_adder(struct client_state *csp) log_error(LOG_LEVEL_HEADER, "addh: %s", p); enlist(csp->headers, p); + freez(p); } /********************************************************************* * - * Function : server_set_cookie + * Function : connection_close_adder * - * Description : Handle the server "cookie" header properly. - * Log cookie to the jar file. Then "crunch" it, - * or accept it. Called from `sed'. + * 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_http + * + * Description : - Save the HTTP Status into csp->http->status + * - Set CT_TABOO to prevent filtering if the answer + * is a partial range (HTTP status 206) + * - Rewrite HTTP/1.1 answers to HTTP/1.0 if +downgrade + * action applies. * * 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 : `crumble' or a newly malloc'ed string. + * Returns : Copy of changed or original answer. * *********************************************************************/ -char *server_set_cookie(const struct parsers *v, char *s, struct client_state *csp) +char *server_http(const struct parsers *v, const char *s, struct client_state *csp) { -#ifdef JAR_FILES - if (csp->config->jar) + char *ret = strdup(s); + + sscanf(ret, "HTTP/%*d.%*d %d", &(csp->http->status)); + if (csp->http->status == 206) { - fprintf(csp->config->jar, "%s\t%s\n", csp->http->host, (s + v->len + 1)); + csp->content_type = CT_TABOO; } -#endif /* def JAR_FILES */ - if ((csp->action->flags & ACTION_NO_COOKIE_SET) != 0) + if ((csp->action->flags & ACTION_DOWNGRADE) != 0) { - return(crumble(v, s, csp)); + ret[7] = '0'; + log_error(LOG_LEVEL_HEADER, "Downgraded answer to HTTP/1.0"); } - - return(strdup(s)); + return(ret); } -#ifdef FORCE_LOAD /********************************************************************* * - * Function : client_host + * Function : server_set_cookie * - * Description : Clean the FORCE_PREFIX out of the 'host' http - * header, if we use force + * Description : Handle the server "cookie" header properly. + * Log cookie to the jar file. Then "crunch" it, + * or accept it. Called from `sed'. * * Parameters : - * 1 : v = ignored - * 2 : s = header (from sed) to clean + * 1 : v = parser pattern that matched this header + * 2 : s = header that matched this pattern * 3 : csp = Current client state (buffers, headers, etc...) * - * Returns : A malloc'ed pointer to the cleaned host header + * Returns : `crumble' or a newly malloc'ed string. * *********************************************************************/ -char *client_host(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) { - char *cleanhost = strdup(s); - - if(csp->force) - strclean(cleanhost, FORCE_PREFIX); - - return(cleanhost); +#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 FEATURE_COOKIE_JAR */ + + if ((csp->action->flags & ACTION_NO_COOKIE_SET) != 0) + { + return(crumble(v, s, csp)); + } + + return(strdup(s)); + } -#endif /* def FORCE_LOAD */ - - -#ifdef FORCE_LOAD + + +#ifdef FEATURE_FORCE_LOAD /********************************************************************* * * Function : strclean @@ -1328,7 +1686,7 @@ int strclean(const char *string, const char *substring) return(hits); } -#endif /* def FORCE_LOAD */ +#endif /* def FEATURE_FORCE_LOAD */ /*