-const char parsers_rcs[] = "$Id: parsers.c,v 1.38 2001/10/25 03:40:48 david__schmidt Exp $";
+const char parsers_rcs[] = "$Id: parsers.c,v 1.52 2002/03/24 13:25:43 swa Exp $";
/*********************************************************************
*
* File : $Source: /cvsroot/ijbswa/current/parsers.c,v $
* `client_uagent', `client_x_forwarded',
* `client_x_forwarded_adder', `client_xtra_adder',
* `content_type', `crumble', `destroy_list', `enlist',
- * `flush_socket', `free_http_request', `get_header',
- * `list_to_text', `parse_http_request', `sed',
+ * `flush_socket', ``get_header', `sed',
* and `server_set_cookie'.
*
* Copyright : Written by and Copyright (C) 2001 the SourceForge
- * IJBSWA team. http://ijbswa.sourceforge.net
+ * Privoxy team. http://www.privoxy.org/
*
* Based on the Internet Junkbuster originally written
* by and Copyright (C) 1997 Anonymous Coders and
*
* Revisions :
* $Log: parsers.c,v $
+ * Revision 1.52 2002/03/24 13:25:43 swa
+ * name change related issues
+ *
+ * Revision 1.51 2002/03/13 00:27:05 jongfoster
+ * Killing warnings
+ *
+ * Revision 1.50 2002/03/12 01:45:35 oes
+ * More verbose logging
+ *
+ * Revision 1.49 2002/03/09 20:03:52 jongfoster
+ * - Making various functions return int rather than size_t.
+ * (Undoing a recent change). Since size_t is unsigned on
+ * Windows, functions like read_socket that return -1 on
+ * error cannot return a size_t.
+ *
+ * THIS WAS A MAJOR BUG - it caused frequent, unpredictable
+ * crashes, and also frequently caused JB to jump to 100%
+ * CPU and stay there. (Because it thought it had just
+ * read ((unsigned)-1) == 4Gb of data...)
+ *
+ * - The signature of write_socket has changed, it now simply
+ * returns success=0/failure=nonzero.
+ *
+ * - Trying to get rid of a few warnings --with-debug on
+ * Windows, I've introduced a new type "jb_socket". This is
+ * used for the socket file descriptors. On Windows, this
+ * is SOCKET (a typedef for unsigned). Everywhere else, it's
+ * an int. The error value can't be -1 any more, so it's
+ * now JB_INVALID_SOCKET (which is -1 on UNIX, and in
+ * Windows it maps to the #define INVALID_SOCKET.)
+ *
+ * - The signature of bind_port has changed.
+ *
+ * Revision 1.48 2002/03/07 03:46:53 oes
+ * Fixed compiler warnings etc
+ *
+ * Revision 1.47 2002/02/20 23:15:13 jongfoster
+ * Parsing functions now handle out-of-memory gracefully by returning
+ * an error code.
+ *
+ * Revision 1.46 2002/01/17 21:03:47 jongfoster
+ * Moving all our URL and URL pattern parsing code to urlmatch.c.
+ *
+ * Revision 1.45 2002/01/09 14:33:03 oes
+ * Added support for localtime_r.
+ *
+ * Revision 1.44 2001/12/14 01:22:54 steudten
+ * Remove 'user:pass@' from 'proto://user:pass@host' for the
+ * new added header 'Host: ..'. (See Req ID 491818)
+ *
+ * Revision 1.43 2001/11/23 00:26:38 jongfoster
+ * Fixing two really stupid errors in my previous commit
+ *
+ * Revision 1.42 2001/11/22 21:59:30 jongfoster
+ * Adding code to handle +no-cookies-keep
+ *
+ * Revision 1.41 2001/11/05 23:43:05 steudten
+ * Add time+date to log files.
+ *
+ * Revision 1.40 2001/10/26 20:13:09 jongfoster
+ * ctype.h is needed in Windows, too.
+ *
+ * Revision 1.39 2001/10/26 17:40:04 oes
+ * Introduced get_header_value()
+ * Removed http->user_agent, csp->referrer and csp->accept_types
+ * Removed client_accept()
+ *
* Revision 1.38 2001/10/25 03:40:48 david__schmidt
* Change in porting tactics: OS/2's EMX porting layer doesn't allow multiple
* threads to call select() simultaneously. So, it's time to do a real, live,
#ifndef _WIN32
#include <stdio.h>
#include <sys/types.h>
-#include <stdlib.h>
-#include <ctype.h>
#endif
+#include <stdlib.h>
+#include <ctype.h>
#include <assert.h>
#include <string.h>
};
-void (* const add_client_headers[])(struct client_state *) = {
+const add_header_func_ptr add_client_headers[] = {
client_host_adder,
client_cookie_adder,
client_x_forwarded_adder,
};
-void (* const add_server_headers[])(struct client_state *) = {
+const add_header_func_ptr add_server_headers[] = {
connection_close_adder,
NULL
};
* file, the results are not portable.
*
*********************************************************************/
-int flush_socket(int fd, struct client_state *csp)
+int flush_socket(jb_socket fd, struct client_state *csp)
{
struct iob *iob = csp->iob;
- int n = iob->eod - iob->cur;
+ int len = iob->eod - iob->cur;
- if (n <= 0)
+ if (len <= 0)
{
return(0);
}
- n = write_socket(fd, iob->cur, n);
+ if (write_socket(fd, iob->cur, (size_t)len))
+ {
+ return(-1);
+ }
iob->eod = iob->cur = iob->buf;
- return(n);
+ return(len);
}
* 2 : buf = holds the content to be added to the page
* 3 : n = number of bytes to be added
*
- * Returns : Number of bytes in the content buffer.
+ * Returns : None
*
*********************************************************************/
-int add_to_iob(struct client_state *csp, char *buf, int n)
+void add_to_iob(struct client_state *csp, char *buf, int n)
{
struct iob *iob = csp->iob;
- int have, need;
+ size_t have, need;
char *p;
have = iob->eod - iob->cur;
if (n <= 0)
{
- return(have);
+ return;
}
need = have + n;
if ((p = (char *)malloc(need + 1)) == NULL)
{
- log_error(LOG_LEVEL_ERROR, "malloc() iob failed: %E");
- return(-1);
+ log_error(LOG_LEVEL_FATAL, "malloc() iob failed: %E");
}
if (have)
}
/* copy the new data into the iob buffer */
- memcpy(p, buf, n);
+ memcpy(p, buf, (size_t)n);
/* point to the end of the data */
p += n;
iob->cur = iob->buf;
iob->eod = p;
- return(need);
+ return;
}
*p = '\0';
ret = strdup(iob->cur);
+ if (ret == NULL)
+ {
+ /* FIXME No way to handle error properly */
+ log_error(LOG_LEVEL_FATAL, "Out of memory in get_header()");
+ }
iob->cur = p+1;
- if ((q = strchr(ret, '\r'))) *q = '\0';
+ if ((q = strchr(ret, '\r')) != NULL) *q = '\0';
/* is this a blank linke (i.e. the end of the header) ? */
if (*ret == '\0')
* on out-of-memory error.
*
*********************************************************************/
-char *sed(const struct parsers pats[], void (* const more_headers[])(struct client_state *), struct client_state *csp)
+char *sed(const struct parsers pats[],
+ const add_header_func_ptr more_headers[],
+ struct client_state *csp)
{
struct list_entry *p;
const struct parsers *v;
- char *hdr;
- void (* const *f)();
+ const add_header_func_ptr *f;
+ jb_err err = JB_ERR_OK;
- for (v = pats; v->str ; v++)
+ for (v = pats; (err == JB_ERR_OK) && (v->str != NULL) ; v++)
{
- for (p = csp->headers->first; p ; p = p->next)
+ for (p = csp->headers->first; (err == JB_ERR_OK) && (p != NULL) ; 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); /* FIXME: Yuck! patching a list...*/
- p->str = hdr;
+ err = v->parser(csp, (char **)&(p->str));
}
}
}
/* place any additional headers on the csp->headers list */
- for (f = more_headers; *f ; f++)
+ for (f = more_headers; (err == JB_ERR_OK) && (*f) ; f++)
{
- (*f)(csp);
+ err = (*f)(csp);
}
- hdr = list_to_text(csp->headers);
-
- return hdr;
-
-}
-
-
-/*********************************************************************
- *
- * Function : free_http_request
- *
- * Description : Freez a http_request structure
- *
- * Parameters :
- * 1 : http = points to a http_request structure to free
- *
- * Returns : N/A
- *
- *********************************************************************/
-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);
-
-}
-
-
-/*********************************************************************
- *
- * Function : parse_http_request
- *
- * Description : Parse out the host and port from the URL. Find the
- * hostname & path, port (if ':'), and/or password (if '@')
- *
- * Parameters :
- * 1 : req = URL (or is it URI?) to break down
- * 2 : http = pointer to the http structure to hold elements
- * 3 : csp = Current client state (buffers, headers, etc...)
- *
- * Returns : N/A
- *
- *********************************************************************/
-void parse_http_request(char *req, struct http_request *http, struct client_state *csp)
-{
- char *buf, *v[10], *url, *p;
- int n;
-
- memset(http, '\0', sizeof(*http));
- http->cmd = strdup(req);
-
- buf = strdup(req);
- n = ssplit(buf, " \r\n", v, SZ(v), 1, 1);
-
- if (n == 3)
+ if (err != JB_ERR_OK)
{
- /* this could be a CONNECT request */
- if (strcmpic(v[0], "connect") == 0)
- {
- http->ssl = 1;
- http->gpc = strdup(v[0]);
- http->hostport = strdup(v[1]);
- http->ver = strdup(v[2]);
- }
-
- /* 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]);
- http->url = strdup(v[1]);
- http->ver = strdup(v[2]);
-
- url = v[1];
- if (strncmpic(url, "http://", 7) == 0)
- {
- url += 7;
- }
- else if (strncmpic(url, "https://", 8) == 0)
- {
- url += 8;
- }
- else
- {
- url = NULL;
- }
-
- if (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);
- }
- }
- }
- }
-
- freez(buf);
-
-
- if (http->hostport == NULL)
- {
- free_http_request(http);
- return;
- }
-
- buf = strdup(http->hostport);
-
-
- /* check if url contains password */
- n = ssplit(buf, "@", v, SZ(v), 1, 1);
- if (n == 2)
- {
- char * newbuf = NULL;
- newbuf = strdup(v[1]);
- freez(buf);
- buf = newbuf;
- }
-
- n = ssplit(buf, ":", v, SZ(v), 1, 1);
-
- if (n == 1)
- {
- http->host = strdup(v[0]);
- http->port = 80;
- }
-
- if (n == 2)
- {
- http->host = strdup(v[0]);
- http->port = atoi(v[1]);
- }
-
- freez(buf);
-
- if (http->host == NULL)
- {
- free_http_request(http);
- }
-
- if (http->path == NULL)
- {
- http->path = strdup("/");
+ return NULL;
}
+ return list_to_text(csp->headers);
}
* Description : This is called if a header matches a pattern to "crunch"
*
* Parameters :
- * 1 : v = Pointer to parsers structure, which basically holds
- * headers (client or server) that we want to "crunch"
- * 2 : s = header (from sed) to "crunch"
- * 3 : csp = Current client state (buffers, headers, etc...)
+ * 1 : csp = Current client state (buffers, headers, etc...)
+ * 2 : header = On input, pointer to header to modify.
+ * On output, pointer to the modified header, or NULL
+ * to remove the header. This function frees the
+ * original string if necessary.
*
- * Returns : Always NULL.
+ * Returns : JB_ERR_OK on success, or
+ * JB_ERR_MEMORY on out-of-memory error.
*
*********************************************************************/
-char *crumble(const struct parsers *v, const char *s, struct client_state *csp)
+jb_err crumble(struct client_state *csp, char **header)
{
log_error(LOG_LEVEL_HEADER, "crunch!");
- return(NULL);
-
+ freez(*header);
+ return JB_ERR_OK;
}
* 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...)
+ * 1 : csp = Current client state (buffers, headers, etc...)
+ * 2 : header = On input, pointer to header to modify.
+ * On output, pointer to the modified header, or NULL
+ * to remove the header. This function frees the
+ * original string if necessary.
*
- * Returns : A duplicate string pointer to this header (ie. pass thru)
+ * Returns : JB_ERR_OK on success, or
+ * JB_ERR_MEMORY on out-of-memory error.
*
*********************************************************************/
-char *server_content_type(const struct parsers *v, const char *s, struct client_state *csp)
+jb_err server_content_type(struct client_state *csp, char **header)
{
if (csp->content_type != CT_TABOO)
{
- if (strstr(s, " text/") || strstr(s, "application/x-javascript"))
+ if (strstr(*header, " text/")
+ || strstr(*header, "application/x-javascript"))
csp->content_type = CT_TEXT;
- else if (strstr(s, " image/gif"))
+ else if (strstr(*header, " image/gif"))
csp->content_type = CT_GIF;
else
csp->content_type = 0;
}
- return(strdup(s));
-
+ return JB_ERR_OK;
}
* 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...)
+ * 1 : csp = Current client state (buffers, headers, etc...)
+ * 2 : header = On input, pointer to header to modify.
+ * On output, pointer to the modified header, or NULL
+ * to remove the header. This function frees the
+ * original string if necessary.
*
- * Returns : A duplicate string pointer to this header (ie. pass thru)
+ * Returns : JB_ERR_OK on success, or
+ * JB_ERR_MEMORY on out-of-memory error.
*
*********************************************************************/
-char *server_transfer_coding(const struct parsers *v, const char *s, struct client_state *csp)
+jb_err server_transfer_coding(struct client_state *csp, char **header)
{
/*
* Turn off pcrs and gif filtering if body compressed
*/
- if (strstr(s, "gzip") || strstr(s, "compress") || strstr(s, "deflate"))
+ if (strstr(*header, "gzip") || strstr(*header, "compress") || strstr(*header, "deflate"))
{
csp->content_type = CT_TABOO;
}
/*
* Raise flag if body chunked
*/
- if (strstr(s, "chunked"))
+ if (strstr(*header, "chunked"))
{
csp->flags |= CSP_FLAG_CHUNKED;
*/
if (csp->flags & CSP_FLAG_MODIFIED)
{
- return(strdup("Transfer-Encoding: identity"));
+ freez(*header);
+ *header = strdup("Transfer-Encoding: identity");
+ return (header == NULL) ? JB_ERR_MEMORY : JB_ERR_OK;
}
}
- return(strdup(s));
-
+ return JB_ERR_OK;
}
* 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...)
+ * 1 : csp = Current client state (buffers, headers, etc...)
+ * 2 : header = On input, pointer to header to modify.
+ * On output, pointer to the modified header, or NULL
+ * to remove the header. This function frees the
+ * original string if necessary.
*
- * Returns : A duplicate string pointer to this header (ie. pass thru)
+ * Returns : JB_ERR_OK on success, or
+ * JB_ERR_MEMORY on out-of-memory error.
*
*********************************************************************/
-char *server_content_encoding(const struct parsers *v, const char *s, struct client_state *csp)
+jb_err server_content_encoding(struct client_state *csp, char **header)
{
/*
* Turn off pcrs and gif filtering if body compressed
*/
- if (strstr(s, "gzip") || strstr(s, "compress") || strstr(s, "deflate"))
+ if (strstr(*header, "gzip") || strstr(*header, "compress") || strstr(*header, "deflate"))
{
csp->content_type = CT_TABOO;
}
- return(strdup(s));
+ return JB_ERR_OK;
}
* the body.
*
* Parameters :
- * 1 : v = ignored
- * 2 : s = header string we are "considering"
- * 3 : csp = Current client state (buffers, headers, etc...)
+ * 1 : csp = Current client state (buffers, headers, etc...)
+ * 2 : header = On input, pointer to header to modify.
+ * On output, pointer to the modified header, or NULL
+ * to remove the header. This function frees the
+ * original string if necessary.
*
- * Returns : A duplicate string pointer to this header (ie. pass thru)
+ * Returns : JB_ERR_OK on success, or
+ * JB_ERR_MEMORY on out-of-memory error.
*
*********************************************************************/
-char *server_content_length(const struct parsers *v, const char *s, struct client_state *csp)
+jb_err server_content_length(struct client_state *csp, char **header)
{
if (csp->content_length != 0) /* Content length has been modified */
{
- char * s2 = (char *) zalloc(100);
- sprintf(s2, "Content-Length: %d", (int) csp->content_length);
+ freez(*header);
+ *header = (char *) zalloc(100);
+ if (*header == NULL)
+ {
+ return JB_ERR_MEMORY;
+ }
+
+ sprintf(*header, "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));
}
+ return JB_ERR_OK;
}
* 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...)
+ * 1 : csp = Current client state (buffers, headers, etc...)
+ * 2 : header = On input, pointer to header to modify.
+ * On output, pointer to the modified header, or NULL
+ * to remove the header. This function frees the
+ * original string if necessary.
*
- * Returns : A duplicate string pointer to this header (ie. pass thru)
+ * Returns : JB_ERR_OK on success, or
+ * JB_ERR_MEMORY on out-of-memory error.
*
*********************************************************************/
-char *server_content_md5(const struct parsers *v, const char *s, struct client_state *csp)
+jb_err server_content_md5(struct client_state *csp, char **header)
{
if (csp->flags & CSP_FLAG_MODIFIED)
{
log_error(LOG_LEVEL_HEADER, "Crunching Content-MD5");
- return(NULL);
- }
- else
- {
- return(strdup(s));
+ freez(*header);
}
+ return JB_ERR_OK;
}
* 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...)
+ * 1 : csp = Current client state (buffers, headers, etc...)
+ * 2 : header = On input, pointer to header to modify.
+ * On output, pointer to the modified header, or NULL
+ * to remove the header. This function frees the
+ * original string if necessary.
*
- * Returns : A copy of the client's original or the modified header.
+ * Returns : JB_ERR_OK on success, or
+ * JB_ERR_MEMORY on out-of-memory error.
*
*********************************************************************/
-char *client_accept_encoding(const struct parsers *v, const char *s, struct client_state *csp)
+jb_err client_accept_encoding(struct client_state *csp, char **header)
{
- if ((csp->action->flags & ACTION_NO_COMPRESSION) == 0)
- {
- return(strdup(s));
- }
- else
+ if ((csp->action->flags & ACTION_NO_COMPRESSION) != 0)
{
log_error(LOG_LEVEL_HEADER, "Supressed offer to compress content");
+ freez(*header);
if (!strcmpic(csp->http->ver, "HTTP/1.1"))
{
- return(strdup("Accept-Encoding: identity;q=1.0, *;q=0"));
- }
- else
- {
- return(NULL);
+ *header = strdup("Accept-Encoding: identity;q=1.0, *;q=0");
+ if (*header == NULL)
+ {
+ return JB_ERR_MEMORY;
+ }
}
}
+ return JB_ERR_OK;
}
* 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...)
+ * 1 : csp = Current client state (buffers, headers, etc...)
+ * 2 : header = On input, pointer to header to modify.
+ * On output, pointer to the modified header, or NULL
+ * to remove the header. This function frees the
+ * original string if necessary.
*
- * Returns : A copy of the client's original or the modified header.
+ * Returns : JB_ERR_OK on success, or
+ * JB_ERR_MEMORY on out-of-memory error.
*
*********************************************************************/
-char *client_te(const struct parsers *v, const char *s, struct client_state *csp)
+jb_err client_te(struct client_state *csp, char **header)
{
- if ((csp->action->flags & ACTION_NO_COMPRESSION) == 0)
- {
- return(strdup(s));
- }
- else
+ if ((csp->action->flags & ACTION_NO_COMPRESSION) != 0)
{
+ freez(*header);
log_error(LOG_LEVEL_HEADER, "Supressed offer to compress transfer");
- return(NULL);
}
+ return JB_ERR_OK;
}
/*********************************************************************
* Called from `sed'.
*
* Parameters :
- * 1 : v = ignored
- * 2 : s = header (from sed) to "crunch"
- * 3 : csp = Current client state (buffers, headers, etc...)
+ * 1 : csp = Current client state (buffers, headers, etc...)
+ * 2 : header = On input, pointer to header to modify.
+ * On output, pointer to the modified header, or NULL
+ * to remove the header. This function frees the
+ * original string if necessary.
*
- * Returns : NULL if crunched, or a malloc'ed string with the original
- * or modified header
+ * Returns : JB_ERR_OK on success, or
+ * JB_ERR_MEMORY on out-of-memory error.
*
*********************************************************************/
-char *client_referrer(const struct parsers *v, const char *s, struct client_state *csp)
+jb_err client_referrer(struct client_state *csp, char **header)
{
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);
+ strclean(*header, FORCE_PREFIX);
#endif /* def FEATURE_FORCE_LOAD */
/*
*/
if ((csp->action->flags & ACTION_HIDE_REFERER) == 0)
{
- return(strdup(s));
+ return JB_ERR_OK;
}
+ freez(*header);
+
newval = csp->action->string[ACTION_STRING_REFERER];
- /*
- * Are we blocking referer?
- */
if ((newval == NULL) || (0 == strcmpic(newval, "block")) )
- {
- log_error(LOG_LEVEL_HEADER, "crunch!");
- return(NULL);
- }
-
- /*
- * Are we forging referer?
- */
- if (0 == strcmpic(newval, "forge"))
{
/*
- * Forge a referer as http://[hostname:port of REQUEST]/
- * to fool stupid checks for in-site links
+ * Blocking referer
*/
- 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);
+ log_error(LOG_LEVEL_HEADER, "crunch!");
+ return JB_ERR_OK;
}
-
- /*
- * Have we got a fixed referer?
- */
- if (0 == strncmpic(newval, "http://", 7))
+ else if (0 == strncmpic(newval, "http://", 7))
{
/*
* 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);
- }
+ *header = strdup("Referer: ");
+ string_append(header, newval);
- /* Should never get here! */
- log_error(LOG_LEVEL_ERROR, "Bad parameter: +referer{%s}", newval);
+ return (*header == NULL) ? JB_ERR_MEMORY : JB_ERR_OK;
+ }
+ else
+ {
+ /*
+ * Forge a referer as http://[hostname:port of REQUEST]/
+ * to fool stupid checks for in-site links
+ */
+ if (0 != strcmpic(newval, "forge"))
+ {
+ /*
+ * Invalid choice - but forge is probably the best default.
+ */
+ 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);
+ *header = strdup("Referer: http://");
+ string_append(header, csp->http->hostport);
+ string_append(header, "/");
+ log_error(LOG_LEVEL_HEADER, "crunch+forge to %s", *header);
+
+ return (*header == NULL) ? JB_ERR_MEMORY : JB_ERR_OK;
+ }
}
* bug workarounds. Called from `sed'.
*
* Parameters :
- * 1 : v = ignored
- * 2 : s = header (from sed) to "crunch"
- * 3 : csp = Current client state (buffers, headers, etc...)
+ * 1 : csp = Current client state (buffers, headers, etc...)
+ * 2 : header = On input, pointer to header to modify.
+ * On output, pointer to the modified header, or NULL
+ * to remove the header. This function frees the
+ * original string if necessary.
*
- * Returns : A malloc'ed pointer to the default agent, or
- * a malloc'ed string pointer to this header (ie. pass thru).
+ * Returns : JB_ERR_OK on success, or
+ * JB_ERR_MEMORY on out-of-memory error.
*
*********************************************************************/
-char *client_uagent(const struct parsers *v, const char *s, struct client_state *csp)
+jb_err client_uagent(struct client_state *csp, char **header)
{
const char * newval;
- char * s2;
if ((csp->action->flags & ACTION_HIDE_USER_AGENT) == 0)
{
- return(strdup(s));
+ return JB_ERR_OK;
}
newval = csp->action->string[ACTION_STRING_USER_AGENT];
if (newval == NULL)
{
- return(strdup(s));
+ return JB_ERR_OK;
}
log_error(LOG_LEVEL_HEADER, "modified");
- s2 = strsav( NULL, "User-Agent: " );
- s2 = strsav( s2, newval );
- return(s2);
+ freez(*header);
+ *header = strdup("User-Agent: ");
+ string_append(header, newval);
+ return (*header == NULL) ? JB_ERR_MEMORY : JB_ERR_OK;
}
* Description : Handle "ua-" headers properly. Called from `sed'.
*
* Parameters :
- * 1 : v = ignored
- * 2 : s = header (from sed) to "crunch"
- * 3 : csp = Current client state (buffers, headers, etc...)
+ * 1 : csp = Current client state (buffers, headers, etc...)
+ * 2 : header = On input, pointer to header to modify.
+ * On output, pointer to the modified header, or NULL
+ * to remove the header. This function frees the
+ * original string if necessary.
*
- * Returns : NULL if crunched, or a malloc'ed string to original header
+ * Returns : JB_ERR_OK on success, or
+ * JB_ERR_MEMORY on out-of-memory error.
*
*********************************************************************/
-char *client_ua(const struct parsers *v, const char *s, struct client_state *csp)
+jb_err client_ua(struct client_state *csp, char **header)
{
- if ((csp->action->flags & ACTION_HIDE_USER_AGENT) == 0)
- {
- return(strdup(s));
- }
- else
+ if ((csp->action->flags & ACTION_HIDE_USER_AGENT) != 0)
{
log_error(LOG_LEVEL_HEADER, "crunch!");
- return(NULL);
+ freez(*header);
}
+
+ return JB_ERR_OK;
}
* Called from `sed'.
*
* Parameters :
- * 1 : v = ignored
- * 2 : s = header (from sed) to "crunch"
- * 3 : csp = Current client state (buffers, headers, etc...)
+ * 1 : csp = Current client state (buffers, headers, etc...)
+ * 2 : header = On input, pointer to header to modify.
+ * On output, pointer to the modified header, or NULL
+ * to remove the header. This function frees the
+ * original string if necessary.
*
- * Returns : NULL if crunched, or a malloc'ed string to
- * modified/original header.
+ * Returns : JB_ERR_OK on success, or
+ * JB_ERR_MEMORY on out-of-memory error.
*
*********************************************************************/
-char *client_from(const struct parsers *v, const char *s, struct client_state *csp)
+jb_err client_from(struct client_state *csp, char **header)
{
const char * newval;
- char * s2;
if ((csp->action->flags & ACTION_HIDE_FROM) == 0)
{
- return(strdup(s));
+ return JB_ERR_OK;
}
+ freez(*header);
+
newval = csp->action->string[ACTION_STRING_FROM];
/*
- * Are we blocking referer?
+ * Are we blocking the e-mail address?
*/
if ((newval == NULL) || (0 == strcmpic(newval, "block")) )
{
log_error(LOG_LEVEL_HEADER, "crunch!");
- return(NULL);
+ return JB_ERR_OK;
}
log_error(LOG_LEVEL_HEADER, " modified");
- s2 = strsav( NULL, "From: " );
- s2 = strsav( s2, newval );
- return(s2);
+ *header = strdup("From: ");
+ string_append(header, newval);
+ return (*header == NULL) ? JB_ERR_MEMORY : JB_ERR_OK;
}
* else we crunch it. Mmmmmmmmmmm ... cookie ......
*
* Parameters :
- * 1 : v = pattern of cookie `sed' found matching
- * 2 : s = header (from sed) to "crunch"
- * 3 : csp = Current client state (buffers, headers, etc...)
+ * 1 : csp = Current client state (buffers, headers, etc...)
+ * 2 : header = On input, pointer to header to modify.
+ * On output, pointer to the modified header, or NULL
+ * to remove the header. This function frees the
+ * original string if necessary.
*
- * Returns : Always NULL.
+ * Returns : JB_ERR_OK on success, or
+ * JB_ERR_MEMORY on out-of-memory error.
*
*********************************************************************/
-char *client_send_cookie(const struct parsers *v, const char *s, struct client_state *csp)
+jb_err client_send_cookie(struct client_state *csp, char **header)
{
+ jb_err result = JB_ERR_OK;
+
if ((csp->action->flags & ACTION_NO_COOKIE_READ) == 0)
{
- enlist(csp->cookie_list, s + v->len + 1);
+ /* strlen("cookie: ") == 8 */
+ result = enlist(csp->cookie_list, *header + 8);
}
else
{
}
/*
- * Always return NULL here. The cookie header
+ * Always remove the cookie here. The cookie header
* will be sent at the end of the header.
*/
- return(NULL);
+ freez(*header);
+ return result;
}
* also used in the add_client_headers list. Called from `sed'.
*
* Parameters :
- * 1 : v = ignored
- * 2 : s = header (from sed) to "crunch"
- * 3 : csp = Current client state (buffers, headers, etc...)
+ * 1 : csp = Current client state (buffers, headers, etc...)
+ * 2 : header = On input, pointer to header to modify.
+ * On output, pointer to the modified header, or NULL
+ * to remove the header. This function frees the
+ * original string if necessary.
*
- * Returns : Always NULL.
+ * Returns : JB_ERR_OK on success, or
+ * JB_ERR_MEMORY on out-of-memory error.
*
*********************************************************************/
-char *client_x_forwarded(const struct parsers *v, const char *s, struct client_state *csp)
+jb_err client_x_forwarded(struct client_state *csp, char **header)
{
if ((csp->action->flags & ACTION_HIDE_FORWARDED) == 0)
{
/* Save it so we can re-add it later */
- csp->x_forwarded = strdup(s);
- }
+ freez(csp->x_forwarded);
+ csp->x_forwarded = *header;
- /*
- * Always return NULL, since this information
- * will be sent at the end of the header.
- */
-
- return(NULL);
+ /*
+ * Always set *header = NULL, since this information
+ * will be sent at the end of the header.
+ */
+ *header = NULL;
+ }
+ else
+ {
+ freez(*header);
+ log_error(LOG_LEVEL_HEADER, " crunch!");
+ }
+ return JB_ERR_OK;
}
/* the following functions add headers directly to the header list */
* Parameters :
* 1 : csp = Current client state (buffers, headers, etc...)
*
- * Returns : N/A
+ * Returns : JB_ERR_OK on success, or
+ * JB_ERR_MEMORY on out-of-memory error.
*
*********************************************************************/
-void client_host_adder(struct client_state *csp)
+jb_err client_host_adder(struct client_state *csp)
{
- char *p = NULL;
+ char *p;
+ char *pos;
+ jb_err err;
+
+ if ( !csp->http->hostport || !*(csp->http->hostport))
+ {
+ return JB_ERR_OK;
+ }
+
+ p = strdup("Host: ");
+ /*
+ ** remove 'user:pass@' from 'proto://user:pass@host'
+ */
+ if ( (pos = strchr( csp->http->hostport, '@')) != NULL )
+ {
+ string_append(&p, pos+1);
+ }
+ else
+ {
+ string_append(&p, csp->http->hostport);
+ }
- p = strsav(p, "Host: ");
- p = strsav(p, csp->http->hostport);
+ if (p == NULL)
+ {
+ return JB_ERR_MEMORY;
+ }
log_error(LOG_LEVEL_HEADER, "addh: %s", p);
- enlist(csp->headers, p);
+
+ err = enlist(csp->headers, p);
freez(p);
+
+ return err;
}
* Parameters :
* 1 : csp = Current client state (buffers, headers, etc...)
*
- * Returns : N/A
+ * Returns : JB_ERR_OK on success, or
+ * JB_ERR_MEMORY on out-of-memory error.
*
*********************************************************************/
-void client_cookie_adder(struct client_state *csp)
+jb_err client_cookie_adder(struct client_state *csp)
{
struct list_entry *lst;
- char *tmp = NULL;
- char *e;
+ char *tmp;
+ struct list_entry *list1 = csp->cookie_list->first;
+ struct list_entry *list2 = csp->action->multi[ACTION_MULTI_WAFER]->first;
+ int first_cookie = 1;
+ jb_err err;
- for (lst = csp->cookie_list->first; lst ; lst = lst->next)
+ if ((list1 == NULL) && (list2 == NULL))
{
- if (tmp)
+ /* Nothing to do */
+ return JB_ERR_OK;
+ }
+
+ tmp = strdup("Cookie: ");
+
+ for (lst = list1; lst ; lst = lst->next)
+ {
+ if (first_cookie)
+ {
+ first_cookie = 0;
+ }
+ else
{
- tmp = strsav(tmp, "; ");
+ string_append(&tmp, "; ");
}
- tmp = strsav(tmp, lst->str);
+ string_append(&tmp, lst->str);
}
- for (lst = csp->action->multi[ACTION_MULTI_WAFER]->first; lst ; lst = lst->next)
+ for (lst = list2; lst ; lst = lst->next)
{
- if (tmp)
+ if (first_cookie)
{
- tmp = strsav(tmp, "; ");
+ first_cookie = 0;
}
-
- if ((e = cookie_encode(lst->str)))
+ else
{
- tmp = strsav(tmp, e);
- freez(e);
+ string_append(&tmp, "; ");
}
+ string_join(&tmp, cookie_encode(lst->str));
}
- if (tmp)
+ if (tmp == NULL)
{
- char *ret;
-
- ret = strdup("Cookie: ");
- ret = strsav(ret, tmp);
- log_error(LOG_LEVEL_HEADER, "addh: %s", ret);
- enlist(csp->headers, ret);
- freez(tmp);
- freez(ret);
+ return JB_ERR_MEMORY;
}
+ log_error(LOG_LEVEL_HEADER, "addh: %s", tmp);
+ err = enlist(csp->headers, tmp);
+ free(tmp);
+ return err;
}
* Parameters :
* 1 : csp = Current client state (buffers, headers, etc...)
*
- * Returns : N/A
+ * Returns : JB_ERR_OK on success, or
+ * JB_ERR_MEMORY on out-of-memory error.
*
*********************************************************************/
-void client_accept_encoding_adder(struct client_state *csp)
+jb_err 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);
+ return enlist_unique(csp->headers, "Accept-Encoding: identity;q=1.0, *;q=0", 16);
}
+ return JB_ERR_OK;
}
* Parameters :
* 1 : csp = Current client state (buffers, headers, etc...)
*
- * Returns : N/A
+ * Returns : JB_ERR_OK on success, or
+ * JB_ERR_MEMORY on out-of-memory error.
*
*********************************************************************/
-void client_xtra_adder(struct client_state *csp)
+jb_err client_xtra_adder(struct client_state *csp)
{
struct list_entry *lst;
+ jb_err err;
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);
+ err = enlist(csp->headers, lst->str);
+ if (err)
+ {
+ return err;
+ }
+
}
+ return JB_ERR_OK;
}
* Parameters :
* 1 : csp = Current client state (buffers, headers, etc...)
*
- * Returns : N/A
+ * Returns : JB_ERR_OK on success, or
+ * JB_ERR_MEMORY on out-of-memory error.
*
*********************************************************************/
-void client_x_forwarded_adder(struct client_state *csp)
+jb_err client_x_forwarded_adder(struct client_state *csp)
{
char *p = NULL;
+ jb_err err;
if ((csp->action->flags & ACTION_HIDE_FORWARDED) != 0)
{
- return;
+ return JB_ERR_OK;
}
if (csp->x_forwarded)
{
- p = strsav(p, csp->x_forwarded);
- p = strsav(p, ", ");
- p = strsav(p, csp->ip_addr_str);
+ p = strdup(csp->x_forwarded);
+ string_append(&p, ", ");
}
else
{
- p = strsav(p, "X-Forwarded-For: ");
- p = strsav(p, csp->ip_addr_str);
+ p = strdup("X-Forwarded-For: ");
+ }
+ string_append(&p, csp->ip_addr_str);
+
+ if (p == NULL)
+ {
+ return JB_ERR_MEMORY;
}
log_error(LOG_LEVEL_HEADER, "addh: %s", p);
- enlist(csp->headers, p);
+ err = enlist(csp->headers, p);
+ free(p);
- freez(p);
+ return err;
}
* Parameters :
* 1 : csp = Current client state (buffers, headers, etc...)
*
- * Returns : N/A
+ * Returns : JB_ERR_OK on success, or
+ * JB_ERR_MEMORY on out-of-memory error.
*
*********************************************************************/
-void connection_close_adder(struct client_state *csp)
+jb_err connection_close_adder(struct client_state *csp)
{
- enlist(csp->headers, "Connection: close");
+ return enlist(csp->headers, "Connection: close");
}
* 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...)
+ * 1 : csp = Current client state (buffers, headers, etc...)
+ * 2 : header = On input, pointer to header to modify.
+ * On output, pointer to the modified header, or NULL
+ * to remove the header. This function frees the
+ * original string if necessary.
*
- * Returns : Copy of changed or original answer.
+ * Returns : JB_ERR_OK on success, or
+ * JB_ERR_MEMORY on out-of-memory error.
*
*********************************************************************/
-char *server_http(const struct parsers *v, const char *s, struct client_state *csp)
+jb_err server_http(struct client_state *csp, char **header)
{
- char *ret = strdup(s);
-
- sscanf(ret, "HTTP/%*d.%*d %d", &(csp->http->status));
+ sscanf(*header, "HTTP/%*d.%*d %d", &(csp->http->status));
if (csp->http->status == 206)
{
csp->content_type = CT_TABOO;
if ((csp->action->flags & ACTION_DOWNGRADE) != 0)
{
- ret[7] = '0';
+ (*header)[7] = '0';
log_error(LOG_LEVEL_HEADER, "Downgraded answer to HTTP/1.0");
}
- return(ret);
+ return JB_ERR_OK;
}
* or accept it. 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...)
+ * 1 : csp = Current client state (buffers, headers, etc...)
+ * 2 : header = On input, pointer to header to modify.
+ * On output, pointer to the modified header, or NULL
+ * to remove the header. This function frees the
+ * original string if necessary.
*
- * Returns : `crumble' or a newly malloc'ed string.
+ * Returns : JB_ERR_OK on success, or
+ * JB_ERR_MEMORY on out-of-memory error.
*
*********************************************************************/
-char *server_set_cookie(const struct parsers *v, const char *s, struct client_state *csp)
+jb_err server_set_cookie(struct client_state *csp, char **header)
{
#ifdef FEATURE_COOKIE_JAR
if (csp->config->jar)
{
- fprintf(csp->config->jar, "%s\t%s\n", csp->http->host, (s + v->len + 1));
+ /*
+ * Write timestamp into outbuf.
+ *
+ * Complex because not all OSs have tm_gmtoff or
+ * the %z field in strftime()
+ */
+ char tempbuf[ BUFFER_SIZE ];
+ time_t now;
+ struct tm tm_now;
+ time (&now);
+#ifdef HAVE_LOCALTIME_R
+ tm_now = *localtime_r(&now, &tm_now);
+#else
+ tm_now = *localtime (&now);
+#endif
+ strftime(tempbuf, BUFFER_SIZE-6, "%b %d %H:%M:%S ", &tm_now);
+
+ /* strlen("set-cookie: ") = 12 */
+ fprintf(csp->config->jar, "%s %s\t%s\n", tempbuf, csp->http->host, *header + 12);
}
#endif /* def FEATURE_COOKIE_JAR */
if ((csp->action->flags & ACTION_NO_COOKIE_SET) != 0)
{
- return(crumble(v, s, csp));
+ return crumble(csp, header);
}
+ else if ((csp->action->flags & ACTION_NO_COOKIE_KEEP) != 0)
+ {
+ /* Flag whether or not to log a message */
+ int changed = 0;
+
+ /* A variable to store the tag we're working on */
+ char * cur_tag;
+
+ /* Skip "Set-Cookie:" (11 characters) in header */
+ cur_tag = *header + 11;
+
+ /* skip whitespace between "Set-Cookie:" and value */
+ while (*cur_tag && ijb_isspace(*cur_tag))
+ {
+ cur_tag++;
+ }
+
+ /* Loop through each tag in the cookie */
+ while (*cur_tag)
+ {
+ /* Find next tag */
+ char * next_tag = strchr(cur_tag, ';');
+ if (next_tag != NULL)
+ {
+ /* Skip the ';' character itself */
+ next_tag++;
+
+ /* skip whitespace ";" and start of tag */
+ while (*next_tag && ijb_isspace(*next_tag))
+ {
+ next_tag++;
+ }
+ }
+ else
+ {
+ /* "Next tag" is the end of the string */
+ next_tag = cur_tag + strlen(cur_tag);
+ }
+
+ /* Is this the "Expires" tag? */
+ if (strncmpic(cur_tag, "expires=", 8) == 0)
+ {
+ /* Delete the tag by copying the rest of the string over it.
+ * (Note that we cannot just use "strcpy(cur_tag, next_tag)",
+ * since the behaviour of strcpy is undefined for overlapping
+ * strings.)
+ */
+ memmove(cur_tag, next_tag, strlen(next_tag) + 1);
+
+ /* That changed the header, need to issue a log message */
+ changed = 1;
+
+ /* Note that the next tag has now been moved to *cur_tag,
+ * so we do not need to update the cur_tag pointer.
+ */
+ }
+ else
+ {
+ /* Move on to next cookie tag */
+ cur_tag = next_tag;
+ }
+ }
- return(strdup(s));
+ if (changed)
+ {
+ log_error(LOG_LEVEL_HEADER, "Changed cookie to a temporary one.");
+ }
+ }
+ return JB_ERR_OK;
}
int hits = 0, len = strlen(substring);
char *pos, *p;
- while((pos = strstr(string, substring)))
+ while((pos = strstr(string, substring)) != NULL)
{
p = pos + len;
do
projects / privoxy.git / blobdiff