-const char parsers_rcs[] = "$Id: parsers.c,v 1.30 2001/09/29 12:56:03 joergs Exp $";
+const char parsers_rcs[] = "$Id: parsers.c,v 1.17 2001/06/29 21:45:41 oes Exp $";
/*********************************************************************
*
* File : $Source: /cvsroot/ijbswa/current/parsers.c,v $
*
* Revisions :
* $Log: parsers.c,v $
- * 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
*
* 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 <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 },
-#ifdef FEATURE_DENY_GZIP
+ { "proxy-connection:", 17, crumble },
+#ifdef DENY_GZIP
{ "Accept-Encoding: gzip", 21, crumble },
-#endif /* def FEATURE_DENY_GZIP */
-#if defined(FEATURE_IMAGE_DETECT_MSIE)
+#endif /* def DENY_GZIP */
+#if defined(DETECT_MSIE_IMAGES)
{ "Accept:", 7, client_accept },
-#endif /* defined(FEATURE_IMAGE_DETECT_MSIE) */
-#ifdef FEATURE_FORCE_LOAD
+#endif /* defined(DETECT_MSIE_IMAGES) */
+#ifdef FORCE_LOAD
{ "Host:", 5, client_host },
-#endif /* def FEATURE_FORCE_LOAD */
+#endif /* def FORCE_LOAD */
/* { "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/1.1 ", 9, server_http11 },
{ "set-cookie:", 11, server_set_cookie },
{ "connection:", 11, crumble },
{ "Content-Type:", 13, content_type },
{ "Content-Length:", 15, content_length },
- { "Keep-Alive:", 11, crumble },
{ NULL, 0, NULL }
};
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
};
*********************************************************************/
char *sed(const struct parsers pats[], void (* const more_headers[])(struct client_state *), struct client_state *csp)
{
- struct list_entry *p;
+ struct list *p;
const struct parsers *v;
char *hdr;
void (* const *f)();
for (v = pats; v->str ; v++)
{
- for (p = csp->headers->first; p ; p = p->next)
+ for (p = csp->headers->next; 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((char *)p->str); /* FIXME: Yuck! patching a list...*/
+ freez(p->str);
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);
freez(http->path);
freez(http->ver);
freez(http->host_ip_addr_str);
- freez(http->user_agent);
}
*********************************************************************/
void parse_http_request(char *req, struct http_request *http, struct client_state *csp)
{
- char *buf, *v[10], *url, *p, *save_url;
+ char *buf, *v[10], *url, *p;
int n;
memset(http, '\0', sizeof(*http));
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 ((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"))
- )
+ if ((strcmpic(v[0], "get") == 0) ||
+ (strcmpic(v[0], "head") == 0) OR_WEBDAV ||
+ (strcmpic(v[0], "post") == 0))
{
- 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]);
- }
+ http->ssl = 0;
+ http->gpc = strdup(v[0]);
+ url = v[1];
+ http->ver = strdup(v[2]);
- save_url = url;
if (strncmpic(url, "http://", 7) == 0)
{
url += 7;
if (url)
{
- if ((p = strchr(url, '/')))
+ if (p = strchr(url, '/'))
{
http->path = strdup(p);
*p = '\0';
/* 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->cmd = strsav(http->cmd, http->ver);
}
}
* Returns : Always NULL.
*
*********************************************************************/
-char *crumble(const struct parsers *v, const char *s, struct client_state *csp)
+char *crumble(const struct parsers *v, char *s, struct client_state *csp)
{
log_error(LOG_LEVEL_HEADER, "crunch!");
return(NULL);
* Returns : A duplicate string pointer to this header (ie. pass thru)
*
*********************************************************************/
-char *content_type(const struct parsers *v, const char *s, struct client_state *csp)
+char *content_type(const struct parsers *v, char *s, struct client_state *csp)
{
if (strstr(s, " text/") || strstr(s, "application/x-javascript"))
csp->content_type = CT_TEXT;
* 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)
+char *content_length(const struct parsers *v, 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);
+ s = (char *) zalloc(100);
+ sprintf(s, "Content-Length: %d", csp->content_length);
- log_error(LOG_LEVEL_HEADER, "Adjust Content-Length to %d", (int) csp->content_length);
- return(s2);
+ log_error(LOG_LEVEL_HEADER, "Adjust Content-Length to %d", csp->content_length);
+ return(s);
}
else
{
* or modified header
*
*********************************************************************/
-char *client_referrer(const struct parsers *v, const char *s, struct client_state *csp)
+char *client_referrer(const struct parsers *v, char *s, struct client_state *csp)
{
const char * newval;
- char * s2;
-#ifdef FEATURE_FORCE_LOAD
+#ifdef 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 FEATURE_FORCE_LOAD */
+#endif /* def FORCE_LOAD */
-#ifdef FEATURE_TRUST
+#ifdef TRUST_FILES
csp->referrer = strdup(s);
-#endif /* def FEATURE_TRUST */
+#endif /* def TRUST_FILES */
/*
* Are we sending referer?
* 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);
+ 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");
- s3 = strsav( NULL, "Referer: " );
- s3 = strsav( s3, newval );
- return(s3);
+ s = strsav( NULL, "Referer: " );
+ s = strsav( s, newval );
+ return(s);
}
/* Should never get here! */
* 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);
+ s = strsav(NULL, "Referer: ");
+ s = strsav(s, "http://");
+ s = strsav(s, csp->http->hostport);
+ s = strsav(s, "/");
+ return(s);
}
*
* Function : client_uagent
*
- * Description : Handle the "user-agent" config setting properly
- * and remember its original value to enable browser
- * bug workarounds. Called from `sed'.
+ * Description : Handle the "user-agent" config setting properly.
+ * 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, const char *s, struct client_state *csp)
+char *client_uagent(const struct parsers *v, 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 FEATURE_IMAGE_DETECT_MSIE
+#ifdef DETECT_MSIE_IMAGES
if (strstr (s, "MSIE "))
{
/* This is Microsoft Internet Explorer.
*/
csp->accept_types |= ACCEPT_TYPE_IS_MSIE;
}
-#endif /* def FEATURE_IMAGE_DETECT_MSIE */
+#endif /* def DETECT_MSIE_IMAGES */
if ((csp->action->flags & ACTION_HIDE_USER_AGENT) == 0)
{
log_error(LOG_LEVEL_HEADER, "modified");
- s2 = strsav( NULL, "User-Agent: " );
- s2 = strsav( s2, newval );
- return(s2);
+ s = strsav( NULL, "User-Agent: " );
+ s = strsav( s, newval );
+ return(s);
}
* Returns : NULL if crunched, or a malloc'ed string to original header
*
*********************************************************************/
-char *client_ua(const struct parsers *v, const char *s, struct client_state *csp)
+char *client_ua(const struct parsers *v, 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, const char *s, struct client_state *csp)
+char *client_from(const struct parsers *v, 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");
- s2 = strsav( NULL, "From: " );
- s2 = strsav( s2, newval );
- return(s2);
+ s = strsav( NULL, "From: " );
+ s = strsav( s, newval );
+ return(s);
}
* Returns : Always NULL.
*
*********************************************************************/
-char *client_send_cookie(const struct parsers *v, const char *s, struct client_state *csp)
+char *client_send_cookie(const struct parsers *v, 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, const char *s, struct client_state *csp)
+char *client_x_forwarded(const struct parsers *v, char *s, struct client_state *csp)
{
if ((csp->action->flags & ACTION_HIDE_FORWARDED) == 0)
{
}
-#if defined(FEATURE_IMAGE_DETECT_MSIE)
+#if defined(DETECT_MSIE_IMAGES)
/*********************************************************************
*
* Function : client_accept
* Returns : Duplicate of argument s.
*
*********************************************************************/
-char *client_accept(const struct parsers *v, const char *s, struct client_state *csp)
+char *client_accept(const struct parsers *v, char *s, struct client_state *csp)
{
-#ifdef FEATURE_IMAGE_DETECT_MSIE
+#ifdef DETECT_MSIE_IMAGES
if (strstr (s, "image/gif"))
{
/* Client will accept HTML. If this seems counterintuitive,
{
csp->accept_types |= ACCEPT_TYPE_MSIE_IMAGE;
}
-#endif /* def FEATURE_IMAGE_DETECT_MSIE */
+#endif /* def DETECT_MSIE_IMAGES */
return(strdup(s));
}
-#endif /* defined(FEATURE_IMAGE_DETECT_MSIE) */
+#endif /* defined(DETECT_MSIE_IMAGES) */
*********************************************************************/
void client_cookie_adder(struct client_state *csp)
{
- struct list_entry *lst;
+ struct list *lst;
char *tmp = NULL;
char *e;
- for (lst = csp->cookie_list->first; lst ; lst = lst->next)
+ for (lst = csp->cookie_list->next; lst ; lst = lst->next)
{
if (tmp)
{
tmp = strsav(tmp, lst->str);
}
- for (lst = csp->action->multi[ACTION_MULTI_WAFER]->first; lst ; lst = lst->next)
+ for (lst = csp->action->multi[ACTION_MULTI_WAFER]->next; lst ; lst = lst->next)
{
if (tmp)
{
*********************************************************************/
void client_xtra_adder(struct client_state *csp)
{
- struct list_entry *lst;
+ struct list *lst = csp->action->multi[ACTION_MULTI_ADD_HEADER];
- for (lst = csp->action->multi[ACTION_MULTI_ADD_HEADER]->first;
- lst ; lst = lst->next)
+ for (lst = lst->next; 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 : 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;
}
* Returns : `crumble' or a newly malloc'ed string.
*
*********************************************************************/
-char *server_set_cookie(const struct parsers *v, const char *s, struct client_state *csp)
+char *server_set_cookie(const struct parsers *v, char *s, struct client_state *csp)
{
-#ifdef FEATURE_COOKIE_JAR
+#ifdef JAR_FILES
if (csp->config->jar)
{
fprintf(csp->config->jar, "%s\t%s\n", csp->http->host, (s + v->len + 1));
}
-#endif /* def FEATURE_COOKIE_JAR */
+#endif /* def JAR_FILES */
if ((csp->action->flags & ACTION_NO_COOKIE_SET) != 0)
{
}
-#ifdef FEATURE_FORCE_LOAD
+#ifdef FORCE_LOAD
/*********************************************************************
*
* Function : client_host
* Returns : A malloc'ed pointer to the cleaned host header
*
*********************************************************************/
-char *client_host(const struct parsers *v, const char *s, struct client_state *csp)
+char *client_host(const struct parsers *v, char *s, struct client_state *csp)
{
char *cleanhost = strdup(s);
if(csp->force)
- {
strclean(cleanhost, FORCE_PREFIX);
- }
return(cleanhost);
}
-#endif /* def FEATURE_FORCE_LOAD */
+#endif /* def FORCE_LOAD */
-#ifdef FEATURE_FORCE_LOAD
+#ifdef FORCE_LOAD
/*********************************************************************
*
* Function : strclean
return(hits);
}
-#endif /* def FEATURE_FORCE_LOAD */
+#endif /* def FORCE_LOAD */
/*
projects / privoxy.git / blobdiff