-const char parsers_rcs[] = "$Id: parsers.c,v 1.15 2001/06/03 11:03:48 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 $
*
* Revisions :
* $Log: parsers.c,v $
- * Revision 1.15 2001/06/03 11:03:48 oes
- * Makefile/in
+ * Revision 1.35 2001/10/09 22:39:21 jongfoster
+ * assert.h is also required under Win32, so moving out of #ifndef _WIN32
+ * block.
*
- * introduced cgi.c
+ * Revision 1.34 2001/10/07 18:50:55 oes
+ * Added server_content_encoding, renamed server_transfer_encoding
*
- * actions.c:
+ * 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)
*
- * adapted to new enlist_unique arg format
+ * 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.
*
- * conf loadcfg.c
+ * 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.
*
- * introduced confdir option
+ * renamed content_type and content_length to have the server_ prefix
*
- * filters.c filtrers.h
+ * server_content_type now only works if csp->content_type != CT_TABOO
*
- * extracted-CGI relevant stuff
+ * 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.
*
- * jbsockets.c
+ * added server_content_md5 which crunches any Content-MD5 headers
+ * if the body was modified.
*
- * filled comment
+ * made server_http11 conditional on +downgrade action
*
- * jcc.c
+ * Replaced 6 boolean members of csp with one bitmap (csp->flags)
*
- * support for new cgi mechansim
+ * Revision 1.31 2001/10/05 14:25:02 oes
+ * Crumble Keep-Alive from Server
*
- * list.c list.h
+ * Revision 1.30 2001/09/29 12:56:03 joergs
+ * IJB now changes HTTP/1.1 to HTTP/1.0 in requests and answers.
*
- * functions for new list type: "map"
- * extended enlist_unique
+ * 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.
*
- * miscutil.c .h
- * introduced bindup()
+ * Revision 1.28 2001/09/22 16:32:28 jongfoster
+ * Removing unused #includes.
*
- * parsers.c parsers.h
+ * Revision 1.27 2001/09/20 15:45:25 steudten
*
- * deleted const struct interceptors
+ * 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
*
- * pcrs.c
- * added FIXME
+ * 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
*
- * project.h
+ * Revision 1.19 2001/07/25 17:21:54 oes
+ * client_uagent now saves copy of User-Agent: header value
*
- * added struct map
- * added struct http_response
- * changes struct interceptors to struct cgi_dispatcher
- * moved HTML stuff to cgi.h
+ * 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
*
- * re_filterfile:
+ * Revision 1.17 2001/06/29 21:45:41 oes
+ * Indentation, CRLF->LF, Tab-> Space
*
- * changed
+ * Revision 1.16 2001/06/29 13:32:42 oes
+ * - Fixed a comment
+ * - Adapted free_http_request
+ * - Removed logentry from cancelled commit
*
- * showargs.c
- * NO TIME LEFT
+ * 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
* 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.
#include "config.h"
+#ifndef _WIN32
#include <stdio.h>
#include <sys/types.h>
#include <stdlib.h>
#include <ctype.h>
+#endif
+
+#include <assert.h>
#include <string.h>
#ifndef _WIN32
#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;
{ "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 },
-#if defined(PCRS) || defined(KILLPOPUPS)
- { "Content-Type:", 13, content_type },
-#endif /* defined(PCRS) || defined(KILLPOPUPS) */
-#ifdef PCRS
- { "Content-Length:", 15, content_length },
-#endif /* def PCRS */
+ { "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
};
*********************************************************************/
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;
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;
}
}
(*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);
*********************************************************************/
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);
}
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);
if (n == 3)
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;
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
+ {
+ http->path = strdup("/");
+ http->hostport = strdup(url);
+ }
}
}
}
if (http->path == NULL)
{
- http->path = strdup("");
+ http->path = strdup("/");
}
}
* 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);
}
-#if defined(PCRS) || defined(KILLPOPUPS)
+/*********************************************************************
+ *
+ * Function : server_content_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
+ * 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_type(const struct parsers *v, const char *s, struct client_state *csp)
+{
+ 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 : content_type
+ * Function : server_transfer_coding
*
- * Description : Is this a text/.* or javascript MIME Type?
+ * 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
* 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_transfer_coding(const struct parsers *v, const char *s, struct client_state *csp)
{
- if (strstr (s, " text/") || strstr (s, "application/x-javascript"))
- csp->is_text = 1;
- else
- csp->is_text = 0;
+ /*
+ * 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));
+
+}
+
+
+/*********************************************************************
+ *
+ * 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));
}
-#endif /* defined(PCRS) || defined(KILLPOPUPS) */
-#ifdef PCRS
/*********************************************************************
*
- * Function : content_length
+ * Function : server_content_length
*
- * Description : Crunch Content-Length header if & only if we are
- * filtering this page through PCRS.
+ * Description : Adjust Content-Length header if we modified
+ * the body.
*
* Parameters :
* 1 : v = ignored
* 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 */
- {
- s = (char *) zalloc(100);
- sprintf(s, "Content-Length: %d", csp->content_length);
- log_error(LOG_LEVEL_HEADER, "Adjust Content-Length to %d", csp->content_length);
- return(s);
- }
+ if (csp->content_length != 0) /* Content length 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));
}
+
+}
+
+
+/*********************************************************************
+ *
+ * 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);
+ }
+ }
+
}
-#endif /* def PCRS */
+/*********************************************************************
+ *
+ * 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);
+ }
+
+}
/*********************************************************************
*
* 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?
* 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);
}
/*
/*
* 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! */
* 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);
}
*
* 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
* 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.
*/
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)
{
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);
}
* 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)
{
* 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)
{
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);
}
* 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)
{
* 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)
{
}
-#if defined(DETECT_MSIE_IMAGES)
+#if defined(FEATURE_IMAGE_DETECT_MSIE)
/*********************************************************************
*
* Function : client_accept
* 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,
{
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
*********************************************************************/
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)
{
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)
{
}
+/*********************************************************************
+ *
+ * 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
*********************************************************************/
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);
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
return(hits);
}
-#endif /* def FORCE_LOAD */
+#endif /* def FEATURE_FORCE_LOAD */
/*
projects / privoxy.git / blobdiff