-const char parsers_rcs[] = "$Id: parsers.c,v 1.59 2006/08/03 02:46:41 david__schmidt Exp $";
+const char parsers_rcs[] = "$Id: parsers.c,v 1.64 2006/08/17 17:15:10 fabiankeil Exp $";
/*********************************************************************
*
* File : $Source: /cvsroot/ijbswa/current/parsers.c,v $
*
* Revisions :
* $Log: parsers.c,v $
+ * Revision 1.64 2006/08/17 17:15:10 fabiankeil
+ * - Back to timegm() using GnuPG's replacement if necessary.
+ * Using mktime() and localtime() could add a on hour offset if
+ * the randomize factor was big enough to lead to a summer/wintertime
+ * switch.
+ *
+ * - Removed now-useless Privoxy 3.0.3 compatibility glue.
+ *
+ * - Moved randomization code into pick_from_range().
+ *
+ * - Changed parse_header_time definition.
+ * time_t isn't guaranteed to be signed and
+ * if it isn't, -1 isn't available as error code.
+ * Changed some variable types in client_if_modified_since()
+ * because of the same reason.
+ *
+ * Revision 1.63 2006/08/14 13:18:08 david__schmidt
+ * OS/2 compilation compatibility fixups
+ *
+ * Revision 1.62 2006/08/14 08:58:42 fabiankeil
+ * Changed include from strptime.c to strptime.h
+ *
+ * Revision 1.61 2006/08/14 08:25:19 fabiankeil
+ * Split filter-headers{} into filter-client-headers{}
+ * and filter-server-headers{}.
+ * Added parse_header_time() to share some code.
+ * Replaced timegm() with mktime().
+ *
+ * Revision 1.60 2006/08/12 03:54:37 david__schmidt
+ * Windows service integration
+ *
* Revision 1.59 2006/08/03 02:46:41 david__schmidt
* Incorporate Fabian Keil's patch work:\rhttp://www.fabiankeil.de/sourcecode/privoxy/
*
#include "miscutil.h"
#include "list.h"
+#ifndef HAVE_STRPTIME
+#include "strptime.h"
+#endif
+
const char parsers_h_rcs[] = PARSERS_H_VERSION;
/* Fix a problem with Solaris. There should be no effect on other
{ "if-none-match:", 14, client_if_none_match },
{ "X-Filter:", 9, client_x_filter },
{ "*", 0, crunch_client_header },
- { "*", 0, filter_header },
+ { "*", 0, filter_client_header },
{ NULL, 0, NULL }
};
{ "content-disposition:", 20, server_content_disposition },
{ "Last-Modified:", 14, server_last_modified },
{ "*", 0, crunch_server_header },
- { "*", 0, filter_header },
+ { "*", 0, filter_server_header },
{ NULL, 0, NULL }
};
/* here begins the family of parser functions that reformat header lines */
+/*********************************************************************
+ *
+ * Function : filter_server_header
+ *
+ * Description : Checks if server header filtering is enabled.
+ * If it is, filter_header is called to do the work.
+ *
+ * Parameters :
+ * 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 : JB_ERR_OK on success and always succeeds
+ *
+ *********************************************************************/
+jb_err filter_server_header(struct client_state *csp, char **header)
+{
+ if (csp->action->flags & ACTION_FILTER_SERVER_HEADERS)
+ {
+ filter_header(csp, header);
+ }
+ return(JB_ERR_OK);
+}
+
+/*********************************************************************
+ *
+ * Function : filter_client_header
+ *
+ * Description : Checks if client header filtering is enabled.
+ * If it is, filter_header is called to do the work.
+ *
+ * Parameters :
+ * 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 : JB_ERR_OK on success and always succeeds
+ *
+ *********************************************************************/
+jb_err filter_client_header(struct client_state *csp, char **header)
+{
+ if (csp->action->flags & ACTION_FILTER_CLIENT_HEADERS)
+ {
+ filter_header(csp, header);
+ }
+ return(JB_ERR_OK);
+}
/*********************************************************************
*
int i, found_filters = 0;
-#ifndef MAX_AF_FILES
-# define MAX_AF_FILES 1
-# define INDEX_OR_NOT
-#else
-# define INDEX_OR_NOT [i]
-#endif
-
- if (!(csp->action->flags & ACTION_FILTER_HEADERS))
- {
- return(JB_ERR_OK);
- }
log_error(LOG_LEVEL_RE_FILTER, "Entered filter_headers");
/*
* Need to check the set of re_filterfiles...
*/
for (i = 0; i < MAX_AF_FILES; i++)
{
- fl = csp->rlist INDEX_OR_NOT;
+ fl = csp->rlist[i];
if (NULL != fl)
{
if (NULL != fl->f)
for (i = 0; i < MAX_AF_FILES; i++)
{
- fl = csp->rlist INDEX_OR_NOT;
+ fl = csp->rlist[i];
if ((NULL == fl) || (NULL == fl->f))
break;
/*
* For all applying +filter actions, look if a filter by that
- * name exists and if yes, execute it's pcrs_joblist on the
+ * name exists and if yes, execute its pcrs_joblist on the
* buffer.
*/
for (b = fl->f; b; b = b->next)
char buf[BUFFER_SIZE];
char newheader[50];
- struct tm *timeptr;
+ struct tm *timeptr = NULL;
time_t now, last_modified;
long int rtime;
long int days, hours, minutes, seconds;
log_error(LOG_LEVEL_HEADER, "Randomizing: %s", *header);
now = time(NULL);
timeptr = gmtime(&now);
- if (strptime(*header, "Last-Modified: %a, %d %b %Y %T", timeptr) == NULL)
+ if ((timeptr = parse_header_time(*header, &last_modified)) == NULL)
{
- log_error(LOG_LEVEL_HEADER, "Couldn't parse: %s (crunching!)", *header);
- freez(*header);
+ log_error(LOG_LEVEL_HEADER, "Couldn't parse: %s (crunching!)", *header);
+ freez(*header);
}
else
{
- last_modified = timegm(timeptr);
rtime = difftime(now, last_modified);
if (rtime)
{
-#if !defined(_WIN32) && !defined(__OS2__)
- rtime = random() % rtime + 1;
-#else
- rtime = rand() % rtime + 1;
-#endif /* (ifndef _WIN32 || __OS2__) */
+ rtime = pick_from_range(rtime);
last_modified += rtime;
timeptr = gmtime(&last_modified);
- strftime(newheader, sizeof(newheader), "%a, %d %b %Y %T GMT", timeptr);
+ strftime(newheader, sizeof(newheader), "%a, %d %b %Y %H:%M:%S GMT", timeptr);
freez(*header);
*header = strdup("Last-Modified: ");
string_append(header, newheader);
if (*header == NULL)
{
- log_error(LOG_LEVEL_ERROR, " Insufficent memory, header crunched without replacement.");
+ log_error(LOG_LEVEL_ERROR, "Insufficent memory, header crunched without replacement.");
return JB_ERR_MEMORY;
}
const char *newval;
const char *host;
char *referer;
- int hostlenght;
+ size_t hostlenght;
#ifdef FEATURE_FORCE_LOAD
/* Since the referrer can include the prefix even
*if www.example.org/www.example.com-shall-see-the-referer/
*links to www.example.com/
*/
- referer[hostlenght+17] = '\n';
+ referer[hostlenght+17] = '\0';
}
if ( 0 == strstr(referer, host)) /*Host has changed*/
{
jb_err client_if_modified_since(struct client_state *csp, char **header)
{
char newheader[50];
- struct tm *timeptr;
+ struct tm *timeptr = NULL;
time_t tm = 0;
const char *newval;
- time_t rtime;
- time_t hours, minutes, seconds;
+ long int rtime;
+ long int hours, minutes, seconds;
int negative = 0;
char * endptr;
}
else /* add random value */
{
- /*
- * tm must be initinalized to prevent segmentation faults.
- */
- timeptr = gmtime(&tm);
- if (strptime(*header, "If-Modified-Since: %a, %d %b %Y %T", timeptr) == NULL)
+ if ((timeptr = parse_header_time(*header, &tm)) == NULL)
{
log_error(LOG_LEVEL_HEADER, "Couldn't parse: %s (crunching!)", *header);
freez(*header);
else
{
rtime = strtol(newval, &endptr, 0);
-
- log_error(LOG_LEVEL_HEADER, "Randomizing: %s (random range: %d hou%s)",
- *header, rtime, (rtime == 1 || rtime == -1) ? "r": "rs");
-
- rtime *= 3600;
-#if !defined(_WIN32) && !defined(__OS2__)
- rtime = random() % rtime;
-#else
- rtime = rand() % rtime;
-#endif /* (_WIN32 || __OS2__) */
- if(newval[0] == '-')
+ if(rtime < 0)
{
- rtime *= -1;
+ rtime *= -1;
+ negative = 1;
}
- tm = timegm(timeptr) + rtime;
+ if(rtime)
+ {
+ log_error(LOG_LEVEL_HEADER, "Randomizing: %s (random range: %d hou%s)",
+ *header, rtime, (rtime == 1 || rtime == -1) ? "r": "rs");
+ rtime *= 3600;
+ rtime = pick_from_range(rtime);
+ }
+ else
+ {
+ log_error(LOG_LEVEL_ERROR, "Random range is 0. Assuming time transformation test.",
+ *header);
+ }
+ tm += rtime;
timeptr = gmtime(&tm);
- strftime(newheader, sizeof(newheader), "%a, %d %b %Y %T GMT", timeptr);
+ strftime(newheader, sizeof(newheader), "%a, %d %b %Y %H:%M:%S GMT", timeptr);
freez(*header);
*header = strdup("If-Modified-Since: ");
if (*header == NULL)
{
- log_error(LOG_LEVEL_HEADER, " Insufficent memory, header crunched without replacement.");
+ log_error(LOG_LEVEL_HEADER, "Insufficent memory, header crunched without replacement.");
return JB_ERR_MEMORY;
}
if(LOG_LEVEL_HEADER & debug) /* Save cycles if the user isn't interested. */
{
- if(rtime < 0)
- {
- rtime *= -1;
- negative = 1;
- }
- hours = rtime / 3600 % 24;
+ hours = rtime / 3600;
minutes = rtime / 60 % 60;
seconds = rtime % 60;
}
#endif /* def FEATURE_FORCE_LOAD */
+/*********************************************************************
+ *
+ * Function : parse_header_time
+ *
+ * Description : Transforms time inside a HTTP header into
+ * the usual time format.
+ *
+ * Parameters :
+ * 1 : header = header to parse
+ * 2 : tm = storage for the resulting time in seconds
+ *
+ * Returns : Time struct containing the header time, or
+ * NULL in case of a parsing problem.
+ *
+ *********************************************************************/
+struct tm *parse_header_time(char *header, time_t *tm) {
+
+ char * timestring;
+ struct tm * timeptr;
+
+ *tm = 0;
+ timeptr = localtime(tm);
+ /* Skipping header name */
+ timestring = strstr(header, ": ");
+ if (strptime(timestring, ": %a, %d %b %Y %H:%M:%S", timeptr) == NULL)
+ {
+ timeptr = NULL;
+ }
+ else
+ {
+ *tm = timegm(timeptr);
+ }
+ return(timeptr);
+}
+
/*
Local Variables:
projects / privoxy.git / blobdiff