X-Git-Url: http://www.privoxy.org/gitweb/?p=privoxy.git;a=blobdiff_plain;f=loaders.c;h=92e0353f86c572e9c72d52e92ac3495f887cb1ec;hp=3f481d8a235ea33336f945be993755c9f78c116c;hb=97dcdede1c96c857ea36b5f5a9873c302d021a7d;hpb=43da0ce639b1cf540198b2f63e790d9127725343 diff --git a/loaders.c b/loaders.c index 3f481d8a..92e0353f 100644 --- a/loaders.c +++ b/loaders.c @@ -1,21 +1,21 @@ -const char loaders_rcs[] = "$Id: loaders.c,v 1.6 2001/05/23 12:27:33 oes Exp $"; +const char loaders_rcs[] = "$Id: loaders.c,v 1.103 2016/05/08 10:45:32 fabiankeil Exp $"; /********************************************************************* * * File : $Source: /cvsroot/ijbswa/current/loaders.c,v $ * * Purpose : Functions to load and unload the various * configuration files. Also contains code to manage - * the list of active loaders, and to automatically + * the list of active loaders, and to automatically * unload files that are no longer in use. * - * Copyright : Written by and Copyright (C) 2001 the SourceForge - * IJBSWA team. http://ijbswa.sourceforge.net + * Copyright : Written by and Copyright (C) 2001-2014 the + * Privoxy team. http://www.privoxy.org/ * * Based on the Internet Junkbuster originally written - * by and Copyright (C) 1997 Anonymous Coders and + * by and Copyright (C) 1997 Anonymous Coders and * Junkbusters Corporation. http://www.junkbusters.com * - * This program is free software; you can redistribute it + * This program is free software; you can redistribute it * and/or modify it under the terms of the GNU General * Public License as published by the Free Software * Foundation; either version 2 of the License, or (at @@ -33,44 +33,8 @@ const char loaders_rcs[] = "$Id: loaders.c,v 1.6 2001/05/23 12:27:33 oes Exp $"; * or write to the Free Software Foundation, Inc., 59 * Temple Place - Suite 330, Boston, MA 02111-1307, USA. * - * Revisions : - * $Log: loaders.c,v $ - * Revision 1.6 2001/05/23 12:27:33 oes - * - * Fixed ugly indentation of my last changes - * - * Revision 1.5 2001/05/23 10:39:05 oes - * - Added support for escaping the comment character - * in config files by a backslash - * - Added support for line continuation in config - * files - * - Fixed a buffer overflow bug with long config lines - * - * Revision 1.4 2001/05/22 18:56:28 oes - * CRLF -> LF - * - * Revision 1.3 2001/05/20 01:21:20 jongfoster - * Version 2.9.4 checkin. - * - Merged popupfile and cookiefile, and added control over PCRS - * filtering, in new "permissionsfile". - * - Implemented LOG_LEVEL_FATAL, so that if there is a configuration - * file error you now get a message box (in the Win32 GUI) rather - * than the program exiting with no explanation. - * - Made killpopup use the PCRS MIME-type checking and HTTP-header - * skipping. - * - Removed tabs from "config" - * - Moved duplicated url parsing code in "loaders.c" to a new funcition. - * - Bumped up version number. - * - * Revision 1.2 2001/05/17 23:01:01 oes - * - Cleaned CRLF's from the sources and related files - * - * Revision 1.1.1.1 2001/05/15 13:58:59 oes - * Initial import of version 2.9.3 source tree - * - * *********************************************************************/ - + #include "config.h" @@ -78,69 +42,44 @@ const char loaders_rcs[] = "$Id: loaders.c,v 1.6 2001/05/23 12:27:33 oes Exp $"; #include #include #include -#include #include #include #include +#include -#ifndef _WIN32 +#if !defined(_WIN32) && !defined(__OS2__) #include #endif #include "project.h" +#include "list.h" #include "loaders.h" -#include "encode.h" #include "filters.h" #include "parsers.h" #include "jcc.h" -#include "ssplit.h" #include "miscutil.h" #include "errlog.h" -#include "gateway.h" - -#ifndef SPLIT_PROXY_ARGS -/* For strsav */ -#include "showargs.h" -#endif /* ndef SPLIT_PROXY_ARGS */ +#include "actions.h" +#include "urlmatch.h" +#include "encode.h" const char loaders_h_rcs[] = LOADERS_H_VERSION; -/* Fix a problem with Solaris. There should be no effect on other - * platforms. - * Solaris's isspace() is a macro which uses it's argument directly - * as an array index. Therefore we need to make sure that high-bit - * characters generate +ve values, and ideally we also want to make - * the argument match the declared parameter type of "int". - */ -#define ijb_isspace(__X) isspace((int)(unsigned char)(__X)) - - /* * Currently active files. * These are also entered in the main linked list of files. */ -static struct file_list *current_blockfile = NULL; -static struct file_list *current_permissions_file = NULL; -static struct file_list *current_forwardfile = NULL; - -#ifdef ACL_FILES -static struct file_list *current_aclfile = NULL; -#endif /* def ACL_FILES */ -#ifdef USE_IMAGE_LIST -static struct file_list *current_imagefile = NULL; -#endif /* def USE_IMAGE_LIST */ - -#ifdef TRUST_FILES +#ifdef FEATURE_TRUST static struct file_list *current_trustfile = NULL; -#endif /* def TRUST_FILES */ - -#ifdef PCRS -static struct file_list *current_re_filterfile = NULL; -#endif /* def PCRS */ +#endif /* def FEATURE_TRUST */ +static int load_one_re_filterfile(struct client_state *csp, int fileid); -static int create_url_spec(struct url_spec * url, char * buf); +static struct file_list *current_re_filterfile[MAX_AF_FILES] = { + NULL, NULL, NULL, NULL, NULL, + NULL, NULL, NULL, NULL, NULL +}; /********************************************************************* @@ -164,1274 +103,693 @@ static int create_url_spec(struct url_spec * url, char * buf); * * Parameters : None * - * Returns : N/A + * Returns : The number of threads that are still active. * *********************************************************************/ -void sweep(void) +unsigned int sweep(void) { struct file_list *fl, *nfl; - struct client_state *csp, *ncsp; + struct client_state *csp; + struct client_states *last_active, *client_list; + int i; + unsigned int active_threads = 0; /* clear all of the file's active flags */ - for ( fl = files->next; NULL != fl; fl = fl->next ) + for (fl = files->next; NULL != fl; fl = fl->next) { fl->active = 0; } - for (csp = clients; csp && (ncsp = csp->next) ; csp = csp->next) + last_active = clients; + client_list = clients->next; + + while (NULL != client_list) { - if (ncsp->active) + csp = &client_list->csp; + if (csp->flags & CSP_FLAG_ACTIVE) { - /* mark this client's files as active */ + /* Mark this client's files as active */ /* * Always have a configuration file. * (Also note the slightly non-standard extra * indirection here.) */ - ncsp->config->config_file_list->active = 1; - - if (ncsp->blist) /* block files */ - { - ncsp->blist->active = 1; - } + csp->config->config_file_list->active = 1; - if (ncsp->permissions_list) /* permissions files */ - { - ncsp->permissions_list->active = 1; - } - - if (ncsp->flist) /* forward files */ - { - ncsp->flist->active = 1; - } - -#ifdef ACL_FILES - if (ncsp->alist) /* acl files */ + /* + * Actions files + */ + for (i = 0; i < MAX_AF_FILES; i++) { - ncsp->alist->active = 1; + if (csp->actions_list[i]) + { + csp->actions_list[i]->active = 1; + } } -#endif /* def ACL_FILES */ -#ifdef USE_IMAGE_LIST - if (ncsp->ilist) /* image files */ + /* + * Filter files + */ + for (i = 0; i < MAX_AF_FILES; i++) { - ncsp->ilist->active = 1; + if (csp->rlist[i]) + { + csp->rlist[i]->active = 1; + } } -#endif /* def USE_IMAGE_LIST */ -#ifdef PCRS - if (ncsp->rlist) /* perl re files */ + /* + * Trust file + */ +#ifdef FEATURE_TRUST + if (csp->tlist) { - ncsp->rlist->active = 1; + csp->tlist->active = 1; } -#endif /* def PCRS */ +#endif /* def FEATURE_TRUST */ -#ifdef TRUST_FILES - if (ncsp->tlist) /* trust files */ - { - ncsp->tlist->active = 1; - } -#endif /* def TRUST_FILES */ + active_threads++; + last_active = client_list; + client_list = client_list->next; } else + /* + * This client is not active. Free its resources. + */ { - /* this client one is not active, release its resources */ - csp->next = ncsp->next; + last_active->next = client_list->next; - freez(ncsp->ip_addr_str); - freez(ncsp->referrer); - freez(ncsp->x_forwarded); - freez(ncsp->ip_addr_str); - freez(ncsp->iob->buf); + freez(csp->ip_addr_str); +#ifdef FEATURE_CLIENT_TAGS + freez(csp->client_address); +#endif + freez(csp->client_iob->buf); + freez(csp->iob->buf); + freez(csp->error_message); + + if (csp->action->flags & ACTION_FORWARD_OVERRIDE && + NULL != csp->fwd) + { + unload_forward_spec(csp->fwd); + } + free_http_request(csp->http); - free_http_request(ncsp->http); + destroy_list(csp->headers); + destroy_list(csp->tags); - destroy_list(ncsp->headers); - destroy_list(ncsp->cookie_list); + free_current_action(csp->action); -#ifdef STATISTICS +#ifdef FEATURE_STATISTICS urls_read++; - if (ncsp->rejected) + if (csp->flags & CSP_FLAG_REJECTED) { urls_rejected++; } -#endif /* def STATISTICS */ +#endif /* def FEATURE_STATISTICS */ - freez(ncsp); + freez(client_list); + + client_list = last_active->next; } } - for (fl = files; fl && (nfl = fl->next) ; fl = fl->next) + nfl = files; + fl = files->next; + + while (fl != NULL) { - if ( ( 0 == nfl->active ) && ( NULL != nfl->unloader ) ) + if ((0 == fl->active) && (NULL != fl->unloader)) { - fl->next = nfl->next; + nfl->next = fl->next; - (nfl->unloader)(nfl->f); + (fl->unloader)(fl->f); -#ifndef SPLIT_PROXY_ARGS - freez(nfl->proxy_args); -#endif /* ndef SPLIT_PROXY_ARGS */ + freez(fl->filename); + freez(fl); - freez(nfl->filename); - - freez(nfl); + fl = nfl->next; + } + else + { + nfl = fl; + fl = fl->next; } } + return active_threads; + } /********************************************************************* * - * Function : create_url_spec + * Function : check_file_changed * - * Description : Creates a "url_spec" structure from a string. - * When finished, free with unload_url(). + * Description : Helper function to check if a file needs reloading. + * If "current" is still current, return it. Otherwise + * allocates a new (zeroed) "struct file_list", fills + * in the disk file name and timestamp, and returns it. * * Parameters : - * 1 : url = Target url_spec to be filled in. Must be - * zeroed out before the call (e.g. using zalloc). - * 2 : buf = Source pattern, null terminated. NOTE: The - * contents of this buffer are destroyed by this - * function. If this function succeeds, the - * buffer is copied to url->spec. If this - * function fails, the contents of the buffer - * are lost forever. + * 1 : current = The file_list currently being used - will + * be checked to see if it is out of date. + * May be NULL (which is treated as out of + * date). + * 2 : filename = Name of file to check. + * 3 : newfl = New file list. [Output only] + * This will be set to NULL, OR a struct + * file_list newly allocated on the + * heap, with the filename and lastmodified + * fields filled, and all others zeroed. * - * Returns : 0 => Ok, everything else is an error. + * Returns : If file unchanged: 0 (and sets newfl == NULL) + * If file changed: 1 and sets newfl != NULL + * On error: 1 and sets newfl == NULL * *********************************************************************/ -static int create_url_spec(struct url_spec * url, char * buf) +int check_file_changed(const struct file_list * current, + const char * filename, + struct file_list ** newfl) { - char *p; - struct url_spec tmp_url[1]; + struct file_list *fs; + struct stat statbuf[1]; - /* paranoia - should never happen. */ - if ((url == NULL) || (buf == NULL)) + *newfl = NULL; + + if (stat(filename, statbuf) < 0) { + /* Error, probably file not found. */ return 1; } - /* save a copy of the orignal specification */ - if ((url->spec = strdup(buf)) == NULL) + if (current + && (current->lastmodified == statbuf->st_mtime) + && (0 == strcmp(current->filename, filename))) { - return 1; + return 0; } - if ((p = strchr(buf, '/'))) + fs = zalloc_or_die(sizeof(struct file_list)); + fs->filename = strdup_or_die(filename); + fs->lastmodified = statbuf->st_mtime; + + if (fs->filename == NULL) { - if (NULL == (url->path = strdup(p))) - { - freez(url->spec); - return 1; - } - url->pathlen = strlen(url->path); - *p = '\0'; + /* Out of memory error */ + freez (fs); + return 1; } - else + *newfl = fs; + return 1; +} + + +/********************************************************************* + * + * Function : simple_read_line + * + * Description : Read a single line from a file and return it. + * This is basically a version of fgets() that malloc()s + * it's own line buffer. Note that the buffer will + * always be a multiple of BUFFER_SIZE bytes long. + * Therefore if you are going to keep the string for + * an extended period of time, you should probably + * strdup() it and free() the original, to save memory. + * + * + * Parameters : + * 1 : dest = destination for newly malloc'd pointer to + * line data. Will be set to NULL on error. + * 2 : fp = File to read from + * 3 : newline = Standard for newlines in the file. + * Will be unchanged if it's value on input is not + * NEWLINE_UNKNOWN. + * On output, may be changed from NEWLINE_UNKNOWN to + * actual convention in file. + * + * Returns : JB_ERR_OK on success + * JB_ERR_MEMORY on out-of-memory + * JB_ERR_FILE on EOF. + * + *********************************************************************/ +jb_err simple_read_line(FILE *fp, char **dest, int *newline) +{ + size_t len = 0; + size_t buflen = BUFFER_SIZE; + char * buf; + char * p; + int ch; + int realnewline = NEWLINE_UNKNOWN; + + if (NULL == (buf = malloc(buflen))) { - url->path = NULL; - url->pathlen = 0; + return JB_ERR_MEMORY; } -#ifdef REGEX - if (url->path) - { - int errcode; - char rebuf[BUFSIZ]; - if (NULL == (url->preg = zalloc(sizeof(*url->preg)))) + p = buf; + +/* + * Character codes. If you have a weird compiler and the following are + * incorrect, you also need to fix NEWLINE() in loaders.h + */ +#define CHAR_CR '\r' /* ASCII 13 */ +#define CHAR_LF '\n' /* ASCII 10 */ + + for (;;) + { + ch = getc(fp); + if (ch == EOF) + { + if (len > 0) + { + *p = '\0'; + *dest = buf; + return JB_ERR_OK; + } + else + { + free(buf); + *dest = NULL; + return JB_ERR_FILE; + } + } + else if (ch == CHAR_CR) + { + ch = getc(fp); + if (ch == CHAR_LF) + { + if (*newline == NEWLINE_UNKNOWN) + { + *newline = NEWLINE_DOS; + } + } + else + { + if (ch != EOF) + { + ungetc(ch, fp); + } + if (*newline == NEWLINE_UNKNOWN) + { + *newline = NEWLINE_MAC; + } + } + *p = '\0'; + *dest = buf; + if (*newline == NEWLINE_UNKNOWN) + { + *newline = realnewline; + } + return JB_ERR_OK; + } + else if (ch == CHAR_LF) + { + *p = '\0'; + *dest = buf; + if (*newline == NEWLINE_UNKNOWN) + { + *newline = NEWLINE_UNIX; + } + return JB_ERR_OK; + } + else if (ch == 0) { - freez(url->spec); - freez(url->path); - return 1; + *p = '\0'; + *dest = buf; + return JB_ERR_OK; } - sprintf(rebuf, "^(%s)", url->path); + *p++ = (char)ch; - errcode = regcomp(url->preg, rebuf, - (REG_EXTENDED|REG_NOSUB|REG_ICASE)); - if (errcode) + if (++len >= buflen) { - size_t errlen = - regerror(errcode, - url->preg, buf, sizeof(buf)); + buflen += BUFFER_SIZE; + if (NULL == (p = realloc(buf, buflen))) + { + free(buf); + return JB_ERR_MEMORY; + } + buf = p; + p = buf + len; + } + } +} + + +/********************************************************************* + * + * Function : edit_read_line + * + * Description : Read a single non-empty line from a file and return + * it. Trims comments, leading and trailing whitespace + * and respects escaping of newline and comment char. + * Provides the line in 2 alternative forms: raw and + * preprocessed. + * - raw is the raw data read from the file. If the + * line is not modified, then this should be written + * to the new file. + * - prefix is any comments and blank lines that were + * read from the file. If the line is modified, then + * this should be written out to the file followed + * by the modified data. (If this string is non-empty + * then it will have a newline at the end). + * - data is the actual data that will be parsed + * further by appropriate routines. + * On EOF, the 3 strings will all be set to NULL and + * 0 will be returned. + * + * Parameters : + * 1 : fp = File to read from + * 2 : raw_out = destination for newly malloc'd pointer to + * raw line data. May be NULL if you don't want it. + * 3 : prefix_out = destination for newly malloc'd pointer to + * comments. May be NULL if you don't want it. + * 4 : data_out = destination for newly malloc'd pointer to + * line data with comments and leading/trailing spaces + * removed, and line continuation performed. May be + * NULL if you don't want it. + * 5 : newline = Standard for newlines in the file. + * On input, set to value to use or NEWLINE_UNKNOWN. + * On output, may be changed from NEWLINE_UNKNOWN to + * actual convention in file. May be NULL if you + * don't want it. + * 6 : line_number = Line number in file. In "lines" as + * reported by a text editor, not lines containing data. + * + * Returns : JB_ERR_OK on success + * JB_ERR_MEMORY on out-of-memory + * JB_ERR_FILE on EOF. + * + *********************************************************************/ +jb_err edit_read_line(FILE *fp, + char **raw_out, + char **prefix_out, + char **data_out, + int *newline, + unsigned long *line_number) +{ + char *p; /* Temporary pointer */ + char *linebuf; /* Line read from file */ + char *linestart; /* Start of linebuf, usually first non-whitespace char */ + int contflag = 0; /* Nonzero for line continuation - i.e. line ends '\' */ + int is_empty = 1; /* Flag if not got any data yet */ + char *raw = NULL; /* String to be stored in raw_out */ + char *prefix = NULL; /* String to be stored in prefix_out */ + char *data = NULL; /* String to be stored in data_out */ + int scrapnewline; /* Used for (*newline) if newline==NULL */ + jb_err rval = JB_ERR_OK; + + assert(fp); + assert(raw_out || data_out); + assert(newline == NULL + || *newline == NEWLINE_UNKNOWN + || *newline == NEWLINE_UNIX + || *newline == NEWLINE_DOS + || *newline == NEWLINE_MAC); - buf[errlen] = '\0'; + if (newline == NULL) + { + scrapnewline = NEWLINE_UNKNOWN; + newline = &scrapnewline; + } - log_error(LOG_LEVEL_ERROR, "error compiling %s: %s", - url->spec, buf); + /* Set output parameters to NULL */ + if (raw_out) + { + *raw_out = NULL; + } + if (prefix_out) + { + *prefix_out = NULL; + } + if (data_out) + { + *data_out = NULL; + } - freez(url->spec); - freez(url->path); - freez(url->preg); + /* Set string variables to new, empty strings. */ - return 1; - } + if (raw_out) + { + raw = strdup_or_die(""); } -#endif - if ((p = strchr(buf, ':')) == NULL) + if (prefix_out) { - url->port = 0; + prefix = strdup_or_die(""); } - else + if (data_out) { - *p++ = '\0'; - url->port = atoi(p); + data = strdup_or_die(""); } - if ((url->domain = strdup(buf)) == NULL) + /* Main loop. Loop while we need more data & it's not EOF. */ + + while ((contflag || is_empty) + && (JB_ERR_OK == (rval = simple_read_line(fp, &linebuf, newline)))) { - freez(url->spec); - freez(url->path); -#ifdef REGEX - freez(url->preg); -#endif /* def REGEX */ - return 1; + if (line_number) + { + (*line_number)++; + } + if (raw) + { + string_append(&raw,linebuf); + if (string_append(&raw,NEWLINE(*newline))) + { + freez(prefix); + freez(data); + free(linebuf); + return JB_ERR_MEMORY; + } + } + + /* Line continuation? Trim escape and set flag. */ + p = linebuf + strlen(linebuf) - 1; + contflag = ((*linebuf != '\0') && (*p == '\\')); + if (contflag) + { + *p = '\0'; + } + + /* Trim leading spaces if we're at the start of the line */ + linestart = linebuf; + assert(NULL != data); + if (*data == '\0') + { + /* Trim leading spaces */ + while (*linestart && isspace((int)(unsigned char)*linestart)) + { + linestart++; + } + } + + /* Handle comment characters. */ + p = linestart; + while ((p = strchr(p, '#')) != NULL) + { + /* Found a comment char.. */ + if ((p != linebuf) && (*(p-1) == '\\')) + { + /* ..and it's escaped, left-shift the line over the escape. */ + char *q = p - 1; + while ((*q = *(q + 1)) != '\0') + { + q++; + } + /* Now scan from just after the "#". */ + } + else + { + /* Real comment. Save it... */ + if (p == linestart) + { + /* Special case: Line only contains a comment, so all the + * previous whitespace is considered part of the comment. + * Undo the whitespace skipping, if any. + */ + linestart = linebuf; + p = linestart; + } + if (prefix) + { + string_append(&prefix,p); + if (string_append(&prefix, NEWLINE(*newline))) + { + freez(raw); + freez(data); + free(linebuf); + return JB_ERR_MEMORY; + } + } + + /* ... and chop off the rest of the line */ + *p = '\0'; + } + } /* END while (there's a # character) */ + + /* Write to the buffer */ + if (*linestart) + { + is_empty = 0; + if (string_append(&data, linestart)) + { + freez(raw); + freez(prefix); + free(linebuf); + return JB_ERR_MEMORY; + } + } + + free(linebuf); + } /* END while(we need more data) */ + + /* Handle simple_read_line() errors - ignore EOF */ + if ((rval != JB_ERR_OK) && (rval != JB_ERR_FILE)) + { + freez(raw); + freez(prefix); + freez(data); + return rval; } - /* split domain into components */ + if (raw ? (*raw == '\0') : is_empty) + { + /* EOF and no data there. (Definition of "data" depends on whether + * the caller cares about "raw" or just "data"). + */ + + freez(raw); + freez(prefix); + freez(data); + + return JB_ERR_FILE; + } + else + { + /* Got at least some data */ - *tmp_url = dsplit(url->domain); - url->dbuf = tmp_url->dbuf; - url->dcnt = tmp_url->dcnt; - url->dvec = tmp_url->dvec; + /* Remove trailing whitespace */ + chomp(data); - return 0; /* OK */ + if (raw_out) + { + *raw_out = raw; + } + else + { + freez(raw); + } + if (prefix_out) + { + *prefix_out = prefix; + } + else + { + freez(prefix); + } + if (data_out) + { + *data_out = data; + } + else + { + freez(data); + } + return JB_ERR_OK; + } } /********************************************************************* * - * Function : unload_url + * Function : read_config_line * - * Description : Called from the "unloaders". Freez the url - * structure elements. + * Description : Read a single non-empty line from a file and return + * it. Trims comments, leading and trailing whitespace + * and respects escaping of newline and comment char. * * Parameters : - * 1 : url = pointer to a url_spec structure. + * 1 : fp = File to read from + * 2 : linenum = linenumber in file + * 3 : buf = Pointer to a pointer to set to the data buffer. * - * Returns : N/A + * Returns : NULL on EOF or error + * Otherwise, returns buf. * *********************************************************************/ -static void unload_url(struct url_spec *url) +char *read_config_line(FILE *fp, unsigned long *linenum, char **buf) { - if (url == NULL) return; - - freez(url->spec); - freez(url->domain); - freez(url->dbuf); - freez(url->dvec); - freez(url->path); -#ifdef REGEX - if (url->preg) + jb_err err; + err = edit_read_line(fp, NULL, NULL, buf, NULL, linenum); + if (err) { - regfree(url->preg); - freez(url->preg); + if (err == JB_ERR_MEMORY) + { + log_error(LOG_LEVEL_FATAL, "Out of memory loading a config file"); + } + *buf = NULL; } -#endif - + return *buf; } -#ifdef ACL_FILES +#ifdef FEATURE_TRUST /********************************************************************* * - * Function : unload_aclfile + * Function : unload_trustfile * - * Description : Unloads an aclfile. + * Description : Unloads a trustfile. * * Parameters : - * 1 : f = the data structure associated with the aclfile. + * 1 : f = the data structure associated with the trustfile. * * Returns : N/A * *********************************************************************/ -static void unload_aclfile(void *f) -{ - struct access_control_list *b = (struct access_control_list *)f; - if (b == NULL) return; - - unload_aclfile(b->next); - - freez(b); - -} -#endif /* def ACL_FILES */ - -/********************************************************************* - * - * Function : unload_blockfile - * - * Description : Unloads a blockfile. - * - * Parameters : - * 1 : f = the data structure associated with the blockfile. - * - * Returns : N/A - * - *********************************************************************/ -static void unload_blockfile(void *f) -{ - struct block_spec *b = (struct block_spec *)f; - if (b == NULL) return; - - unload_blockfile(b->next); - - unload_url(b->url); - - freez(b); - -} - - -#ifdef USE_IMAGE_LIST -/********************************************************************* - * - * Function : unload_imagefile - * - * Description : Unloads an imagefile. - * - * Parameters : - * 1 : f = the data structure associated with the imagefile. - * - * Returns : N/A - * - *********************************************************************/ -static void unload_imagefile(void *f) -{ - struct block_spec *b = (struct block_spec *)f; - if (b == NULL) return; - - unload_imagefile(b->next); - - unload_url(b->url); - - freez(b); - -} -#endif /* def USE_IMAGE_LIST */ - - -/********************************************************************* - * - * Function : unload_permissions_file - * - * Description : Unloads a permissions file. - * - * Parameters : - * 1 : file_data = the data structure associated with the - * permissions file. - * - * Returns : N/A - * - *********************************************************************/ -static void unload_permissions_file(void *file_data) -{ - struct permissions_spec * next; - struct permissions_spec * cur = (struct permissions_spec *)file_data; - while (cur != NULL) - { - next = cur->next; - unload_url(cur->url); - freez(cur); - cur = next; - } - -} - - -#ifdef TRUST_FILES -/********************************************************************* - * - * Function : unload_trustfile - * - * Description : Unloads a trustfile. - * - * Parameters : - * 1 : f = the data structure associated with the trustfile. - * - * Returns : N/A - * - *********************************************************************/ -static void unload_trustfile(void *f) -{ - struct block_spec *b = (struct block_spec *)f; - if (b == NULL) return; - - unload_trustfile(b->next); - - unload_url(b->url); - - freez(b); - -} -#endif /* def TRUST_FILES */ - - -/********************************************************************* - * - * Function : unload_forwardfile - * - * Description : Unloads a forwardfile. - * - * Parameters : - * 1 : f = the data structure associated with the forwardfile. - * - * Returns : N/A - * - *********************************************************************/ -static void unload_forwardfile(void *f) -{ - struct forward_spec *b = (struct forward_spec *)f; - if (b == NULL) return; - - unload_forwardfile(b->next); - - unload_url(b->url); - - freez(b->gw->gateway_host); - freez(b->gw->forward_host); - - freez(b); - -} - - -#ifdef PCRS -/********************************************************************* - * - * Function : unload_re_filterfile - * - * Description : Unload the re_filter list. - * - * Parameters : - * 1 : f = the data structure associated with the filterfile. - * - * Returns : N/A - * - *********************************************************************/ -static void unload_re_filterfile(void *f) -{ - pcrs_job *joblist; - struct re_filterfile_spec *b = (struct re_filterfile_spec *)f; - - if (b == NULL) return; - - destroy_list(b->patterns); - - joblist = b->joblist; - while ( NULL != (joblist = pcrs_free_job(joblist)) ) {} - - freez(b); - -} -#endif /* def PCRS */ - - -/********************************************************************* - * - * Function : check_file_changed - * - * Description : Helper function to check if a file needs reloading. - * If "current" is still current, return it. Otherwise - * allocates a new (zeroed) "struct file_list", fills - * in the disk file name and timestamp, and returns it. - * - * Parameters : - * 1 : current = The file_list currently being used - will - * be checked to see if it is out of date. - * May be NULL (which is treated as out of - * date). - * 2 : filename = Name of file to check. - * 3 : newfl = New file list. [Output only] - * This will be set to NULL, OR a struct - * file_list newly allocated on the - * heap, with the filename and lastmodified - * fields filled, standard header giving file - * name in proxy_args, and all others zeroed. - * (proxy_args is only filled in if !defined - * SPLIT_PROXY_ARGS and !suppress_blocklists). - * - * Returns : If file unchanged: 0 (and sets newfl == NULL) - * If file changed: 1 and sets newfl != NULL - * On error: 1 and sets newfl == NULL - * - *********************************************************************/ -int check_file_changed(const struct file_list * current, - const char * filename, - struct file_list ** newfl) -{ - struct file_list *fs; - struct stat statbuf[1]; - - *newfl = NULL; - - if (stat(filename, statbuf) < 0) - { - /* Error, probably file not found. */ - return 1; - } - - if (current - && (current->lastmodified == statbuf->st_mtime) - && (0 == strcmp(current->filename, filename))) - { - return 0; - } - - fs = (struct file_list *)zalloc(sizeof(struct file_list)); - - if (fs == NULL) - { - /* Out of memory error */ - return 1; - } - - fs->filename = strdup(filename); - fs->lastmodified = statbuf->st_mtime; - - if (fs->filename == NULL) - { - /* Out of memory error */ - freez (fs); - return 1; - } - -#ifndef SPLIT_PROXY_ARGS - if (!suppress_blocklists) - { - char * p = html_encode(filename); - if (p) - { - fs->proxy_args = strsav(fs->proxy_args, "

The file `"); - fs->proxy_args = strsav(fs->proxy_args, p); - fs->proxy_args = strsav(fs->proxy_args, - "' contains the following patterns

\n"); - freez(p); - } - fs->proxy_args = strsav(fs->proxy_args, "
");
-   }
-#endif /* ndef SPLIT_PROXY_ARGS */
-
-   *newfl = fs;
-   return 1;
-}
-
-
-/*********************************************************************
- *
- * Function    :  read_config_line
- *
- * Description :  Read a single non-empty line from a file and return
- *                it.  Trims comments, leading and trailing whitespace
- *                and respects escaping of newline and comment char.
- *                Also writes the file to fs->proxy_args.
- *
- * Parameters  :
- *          1  :  buf = Buffer to use.
- *          2  :  buflen = Size of buffer in bytes.
- *          3  :  fp = File to read from
- *          4  :  fs = File will be written to fs->proxy_args.  May
- *                be NULL to disable this feature.
- *
- * Returns     :  NULL on EOF or error
- *                Otherwise, returns buf.
- *
- *********************************************************************/
-char *read_config_line(char *buf, int buflen, FILE *fp, struct file_list *fs)
-{
-   char *p, *q;
-   char linebuf[BUFSIZ];
-   int contflag = 0;
-
-   *buf = '\0';
-
-   while (fgets(linebuf, sizeof(linebuf), fp))
-   {
-#ifndef SPLIT_PROXY_ARGS
-      if (fs && !suppress_blocklists)
-      {
-         char *html_line = html_encode(linebuf);
-         if (html_line != NULL)
-         {
-            fs->proxy_args = strsav(fs->proxy_args, html_line);
-            freez(html_line);
-         }
-         fs->proxy_args = strsav(fs->proxy_args, "
");
-      }
-#endif /* ndef SPLIT_PROXY_ARGS */
-
-      /* Trim off newline */
-      if ((p = strpbrk(linebuf, "\r\n")) != NULL)
-      {
-         *p = '\0';
-      }
-
-      /* Line continuation? Trim escape and set flag. */
-      if ((p != linebuf) && (*--p == '\\'))
-      {
-         contflag = 1;
-         *p = '\0';
-      }
-
-      /* If there's a comment char.. */
-      if ((p = strpbrk(linebuf, "#")) != NULL)
-      {
-         /* ..and it's escaped, left-shift the line over the escape. */
-         if ((p != linebuf) && (*(p-1) == '\\'))
-         {
-            q = p-1;
-            while ((*q++ = *p++) != '\0') /* nop */;
-         }
-         /* Else, chop off the rest of the line */
-         else
-         {
-            *p = '\0';
-         }
-      }
-      
-      /* Trim leading whitespace */
-      p = linebuf;
-      while (*p && ijb_isspace(*p))
-      {
-         p++;
-      }
-
-      if (*p)
-      {
-         /* There is something other than whitespace on the line. */
-
-         /* Move the data to the start of buf */
-         if (p != linebuf)
-         {
-            /* strcpy that can cope with overlap. */
-            q = linebuf;
-            while ((*q++ = *p++) != '\0')
-            {
-               /* Do nothing */
-            }
-         }
-
-         /* Trim trailing whitespace */
-         p = linebuf + strlen(linebuf) - 1;
-
-         /*
-          * Note: the (p >= linebuf) below is paranoia, it's not really needed.
-          * When p == linebuf then ijb_isspace(*p) will be false and we'll drop
-          * out of the loop.
-          */
-         while ((p >= linebuf) && ijb_isspace(*p))
-         {
-            p--;
-         }
-         p[1] = '\0';
-
-         /* More paranoia.  This if statement is always true. */
-         if (*linebuf)
-         {
-            strncat(buf, linebuf, buflen - strlen(buf));
-            if (contflag)
-            {
-               contflag = 0;
-               continue;
-            }
-            else
-            {
-               return buf;
-            }
-         }
-      }
-   }
-
-   /* EOF */
-   return NULL;
-}
-
-
-#ifdef ACL_FILES
-/*********************************************************************
- *
- * Function    :  load_aclfile
- *
- * Description :  Read and parse an aclfile and add to files list.
- *
- * Parameters  :
- *          1  :  csp = Current client state (buffers, headers, etc...)
- *
- * Returns     :  0 => Ok, everything else is an error.
- *
- *********************************************************************/
-int load_aclfile(struct client_state *csp)
-{
-   FILE *fp;
-   char buf[BUFSIZ], *v[3], *p;
-   int i;
-   struct access_control_list *a, *bl;
-   struct file_list *fs;
-
-   if (!check_file_changed(current_aclfile, csp->config->aclfile, &fs))
-   {
-      /* No need to load */
-      if (csp)
-      {
-         csp->alist = current_aclfile;
-      }
-      return(0);
-   }
-   if (!fs)
-   {
-      goto load_aclfile_error;
-   }
-
-   fs->f = bl = (struct access_control_list *)zalloc(sizeof(*bl));
-   if (bl == NULL)
-   {
-      freez(fs->filename);
-      freez(fs);
-      goto load_aclfile_error;
-   }
-
-   fp = fopen(csp->config->aclfile, "r");
-
-   if (fp == NULL)
-   {
-      goto load_aclfile_error;
-   }
-
-   while (read_config_line(buf, sizeof(buf), fp, fs) != NULL)
-   {
-      i = ssplit(buf, " \t", v, SZ(v), 1, 1);
-
-      /* allocate a new node */
-      a = (struct access_control_list *) zalloc(sizeof(*a));
-
-      if (a == NULL)
-      {
-         fclose(fp);
-         freez(fs->f);
-         freez(fs->filename);
-         freez(fs);
-         goto load_aclfile_error;
-      }
-
-      /* add it to the list */
-      a->next  = bl->next;
-      bl->next = a;
-
-      switch (i)
-      {
-         case 3:
-            if (acl_addr(v[2], a->dst) < 0)
-            {
-               goto load_aclfile_error;
-            }
-            /* no break */
-
-         case 2:
-            if (acl_addr(v[1], a->src) < 0)
-            {
-               goto load_aclfile_error;
-            }
-
-            p = v[0];
-            if (strcmpic(p, "permit") == 0)
-            {
-               a->action = ACL_PERMIT;
-               break;
-            }
-
-            if (strcmpic(p, "deny") == 0)
-            {
-               a->action = ACL_DENY;
-               break;
-            }
-            /* no break */
-
-         default:
-            goto load_aclfile_error;
-      }
-   }
-
-   fclose(fp);
-
-#ifndef SPLIT_PROXY_ARGS
-   if (!suppress_blocklists)
-   {
-      fs->proxy_args = strsav(fs->proxy_args, "
"); - } -#endif /* ndef SPLIT_PROXY_ARGS */ - - if (current_aclfile) - { - current_aclfile->unloader = unload_aclfile; - } - - fs->next = files->next; - files->next = fs; - current_aclfile = fs; - - if (csp) - { - csp->alist = fs; - } - - return(0); - -load_aclfile_error: - log_error(LOG_LEVEL_ERROR, "can't load access control list %s: %E", - csp->config->aclfile); - return(-1); - -} -#endif /* def ACL_FILES */ - - -/********************************************************************* - * - * Function : load_blockfile - * - * Description : Read and parse a blockfile and add to files list. - * - * Parameters : - * 1 : csp = Current client state (buffers, headers, etc...) - * - * Returns : 0 => Ok, everything else is an error. - * - *********************************************************************/ -int load_blockfile(struct client_state *csp) -{ - FILE *fp; - - struct block_spec *b, *bl; - char buf[BUFSIZ], *p, *q; - int reject; - struct file_list *fs; - - if (!check_file_changed(current_blockfile, csp->config->blockfile, &fs)) - { - /* No need to load */ - if (csp) - { - csp->blist = current_blockfile; - } - return(0); - } - if (!fs) - { - goto load_blockfile_error; - } - - fs->f = bl = (struct block_spec *) zalloc(sizeof(*bl)); - if (bl == NULL) - { - goto load_blockfile_error; - } - - if ((fp = fopen(csp->config->blockfile, "r")) == NULL) - { - goto load_blockfile_error; - } - - while (read_config_line(buf, sizeof(buf), fp, fs) != NULL) - { - reject = 1; - - if (*buf == '~') - { - reject = 0; - p = buf; - q = p+1; - while ((*p++ = *q++)) - { - /* nop */ - } - } - - /* skip lines containing only ~ */ - if (*buf == '\0') - { - continue; - } - - /* allocate a new node */ - if ((b = zalloc(sizeof(*b))) == NULL) - { - fclose(fp); - goto load_blockfile_error; - } - - /* add it to the list */ - b->next = bl->next; - bl->next = b; - - b->reject = reject; - - /* Save the URL pattern */ - if (create_url_spec(b->url, buf)) - { - fclose(fp); - goto load_blockfile_error; - } - } - - fclose(fp); - -#ifndef SPLIT_PROXY_ARGS - if (!suppress_blocklists) - { - fs->proxy_args = strsav(fs->proxy_args, ""); - } -#endif /* ndef SPLIT_PROXY_ARGS */ - - /* the old one is now obsolete */ - if (current_blockfile) - { - current_blockfile->unloader = unload_blockfile; - } - - fs->next = files->next; - files->next = fs; - current_blockfile = fs; - - if (csp) - { - csp->blist = fs; - } - - return(0); - -load_blockfile_error: - log_error(LOG_LEVEL_ERROR, "can't load blockfile '%s': %E", csp->config->blockfile); - return(-1); - -} - - -#ifdef USE_IMAGE_LIST -/********************************************************************* - * - * Function : load_imagefile - * - * Description : Read and parse an imagefile and add to files list. - * - * Parameters : - * 1 : csp = Current client state (buffers, headers, etc...) - * - * Returns : 0 => Ok, everything else is an error. - * - *********************************************************************/ -int load_imagefile(struct client_state *csp) -{ - FILE *fp; - - struct block_spec *b, *bl; - char buf[BUFSIZ], *p, *q; - int reject; - struct file_list *fs; - - if (!check_file_changed(current_imagefile, csp->config->imagefile, &fs)) - { - /* No need to load */ - if (csp) - { - csp->ilist = current_imagefile; - } - return(0); - } - if (!fs) - { - goto load_imagefile_error; - } - - fs->f = bl = (struct block_spec *)zalloc(sizeof(*bl)); - if (bl == NULL) - { - goto load_imagefile_error; - } - - if ((fp = fopen(csp->config->imagefile, "r")) == NULL) - { - goto load_imagefile_error; - } - - while (read_config_line(buf, sizeof(buf), fp, fs) != NULL) - { - reject = 1; - - if (*buf == '~') - { - reject = 0; - p = buf; - q = p+1; - while ((*p++ = *q++)) - { - /* nop */ - } - } - - /* skip lines containing only ~ */ - if (*buf == '\0') - { - continue; - } - - /* allocate a new node */ - if ((b = zalloc(sizeof(*b))) == NULL) - { - fclose(fp); - goto load_imagefile_error; - } - - /* add it to the list */ - b->next = bl->next; - bl->next = b; - - b->reject = reject; - - /* Save the URL pattern */ - if (create_url_spec(b->url, buf)) - { - fclose(fp); - goto load_imagefile_error; - } - } - - fclose(fp); - -#ifndef SPLIT_PROXY_ARGS - if (!suppress_blocklists) - { - fs->proxy_args = strsav(fs->proxy_args, ""); - } -#endif /* ndef SPLIT_PROXY_ARGS */ +static void unload_trustfile(void *f) +{ + struct block_spec *cur = (struct block_spec *)f; + struct block_spec *next; - /* the old one is now obsolete */ - if (current_imagefile) + while (cur != NULL) { - current_imagefile->unloader = unload_imagefile; - } + next = cur->next; - fs->next = files->next; - files->next = fs; - current_imagefile = fs; + free_pattern_spec(cur->url); + free(cur); - if (csp) - { - csp->ilist = fs; + cur = next; } - return(0); - -load_imagefile_error: - log_error(LOG_LEVEL_ERROR, "can't load imagefile '%s': %E", csp->config->imagefile); - return(-1); - } -#endif /* def USE_IMAGE_LIST */ +#ifdef FEATURE_GRACEFUL_TERMINATION /********************************************************************* * - * Function : load_permissions_file + * Function : unload_current_trust_file * - * Description : Read and parse a permissions file and add to files - * list. + * Description : Unloads current trust file - reset to state at + * beginning of program. * - * Parameters : - * 1 : csp = Current client state (buffers, headers, etc...) + * Parameters : None * - * Returns : 0 => Ok, everything else is an error. + * Returns : N/A * *********************************************************************/ -int load_permissions_file(struct client_state *csp) +void unload_current_trust_file(void) { - FILE *fp; - - struct permissions_spec *b, *bl; - char buf[BUFSIZ], *p, *q; - int permissions; - struct file_list *fs; - int i; - - if (!check_file_changed(current_permissions_file, csp->config->permissions_file, &fs)) - { - /* No need to load */ - if (csp) - { - csp->permissions_list = current_permissions_file; - } - return(0); - } - if (!fs) - { - goto load_permissions_error; - } - - fs->f = bl = (struct permissions_spec *)zalloc(sizeof(*bl)); - if (bl == NULL) - { - goto load_permissions_error; - } - - if ((fp = fopen(csp->config->permissions_file, "r")) == NULL) - { - goto load_permissions_error; - } - - - /* - * default_permissions is set in this file. - * - * Reset it to default first. - */ - csp->config->default_permissions = PERMIT_RE_FILTER; - - while (read_config_line(buf, sizeof(buf), fp, fs) != NULL) - { - p = buf; - - permissions = PERMIT_COOKIE_SET | PERMIT_COOKIE_READ | PERMIT_POPUPS; - - /* - * FIXME: for() loop is a kludge. Want to loop around until we - * find a non-control character. Assume there will be at most 4 - * characters. - */ - for (i = 0; i < 4; i++) - { - switch ((int)*p) - { - case '>': - /* - * Allow cookies to be read by the server, but do - * not allow them to be set. - */ - permissions = (permissions & ~PERMIT_COOKIE_SET); - p++; - break; - - case '<': - /* - * Allow server to set cookies but do not let the - * server read them. - */ - permissions = (permissions & ~PERMIT_COOKIE_READ); - p++; - break; - - case '^': - /* - * Block popups - */ - permissions = (permissions & ~PERMIT_POPUPS); - p++; - break; - - case '%': - /* - * Permit filtering using PCRS - */ - permissions = (permissions | PERMIT_RE_FILTER); - p++; - break; - - case '~': - /* - * All of the above (maximum filtering). - */ - permissions = PERMIT_RE_FILTER; - p++; - break; - - default: - /* - * FIXME: Should break out of the loop here. - */ - break; - } - } - - /* - * Elide any of the "special" chars from the - * front of the pattern - */ - q = buf; - if (p > q) - { - while ((*q++ = *p++) != '\0') - { - /* nop */ - } - } - - /* a lines containing only "special" chars sets default */ - if (*buf == '\0') - { - csp->config->default_permissions = permissions; - continue; - } - - /* allocate a new node */ - if (((b = zalloc(sizeof(*b))) == NULL) - ) - { - fclose(fp); - goto load_permissions_error; - } - - /* add it to the list */ - b->next = bl->next; - bl->next = b; - - /* Save flags */ - b->permissions = permissions; - - /* Save the URL pattern */ - if (create_url_spec(b->url, buf)) - { - fclose(fp); - goto load_permissions_error; - } - } - - fclose(fp); - -#ifndef SPLIT_PROXY_ARGS - if (!suppress_blocklists) - { - fs->proxy_args = strsav(fs->proxy_args, ""); - } -#endif /* ndef SPLIT_PROXY_ARGS */ - - /* the old one is now obsolete */ - if (current_permissions_file) - { - current_permissions_file->unloader = unload_permissions_file; - } - - fs->next = files->next; - files->next = fs; - current_permissions_file = fs; - - if (csp) + if (current_trustfile) { - csp->permissions_list = fs; + current_trustfile->unloader = unload_trustfile; + current_trustfile = NULL; } - - return(0); - -load_permissions_error: - log_error(LOG_LEVEL_ERROR, "can't load permissions file '%s': %E", - csp->config->permissions_file); - return(-1); - } +#endif /* FEATURE_GRACEFUL_TERMINATION */ -#ifdef TRUST_FILES /********************************************************************* * * Function : load_trustfile @@ -1449,19 +807,18 @@ int load_trustfile(struct client_state *csp) FILE *fp; struct block_spec *b, *bl; - struct url_spec **tl; + struct pattern_spec **tl; - char buf[BUFSIZ], *p, *q; + char *buf = NULL; int reject, trusted; struct file_list *fs; + unsigned long linenum = 0; + int trusted_referrers = 0; if (!check_file_changed(current_trustfile, csp->config->trustfile, &fs)) { /* No need to load */ - if (csp) - { - csp->tlist = current_trustfile; - } + csp->tlist = current_trustfile; return(0); } if (!fs) @@ -1469,20 +826,17 @@ int load_trustfile(struct client_state *csp) goto load_trustfile_error; } - fs->f = bl = (struct block_spec *)zalloc(sizeof(*bl)); - if (bl == NULL) - { - goto load_trustfile_error; - } + fs->f = bl = zalloc_or_die(sizeof(*bl)); if ((fp = fopen(csp->config->trustfile, "r")) == NULL) { goto load_trustfile_error; } + log_error(LOG_LEVEL_INFO, "Loading trust file: %s", csp->config->trustfile); tl = csp->config->trust_list; - while (read_config_line(buf, sizeof(buf), fp, fs) != NULL) + while (read_config_line(fp, &linenum, &buf) != NULL) { trusted = 0; reject = 1; @@ -1495,10 +849,13 @@ int load_trustfile(struct client_state *csp) if (*buf == '~') { + char *p; + char *q; + reject = 0; p = buf; q = p+1; - while ((*p++ = *q++)) + while ((*p++ = *q++) != '\0') { /* nop */ } @@ -1507,15 +864,12 @@ int load_trustfile(struct client_state *csp) /* skip blank lines */ if (*buf == '\0') { + freez(buf); continue; } /* allocate a new node */ - if ((b = zalloc(sizeof(*b))) == NULL) - { - fclose(fp); - goto load_trustfile_error; - } + b = zalloc_or_die(sizeof(*b)); /* add it to the list */ b->next = bl->next; @@ -1524,7 +878,7 @@ int load_trustfile(struct client_state *csp) b->reject = reject; /* Save the URL pattern */ - if (create_url_spec(b->url, buf)) + if (create_pattern_spec(b->url, buf)) { fclose(fp); goto load_trustfile_error; @@ -1535,21 +889,29 @@ int load_trustfile(struct client_state *csp) */ if (trusted) { - *tl++ = b->url; + if (++trusted_referrers < MAX_TRUSTED_REFERRERS) + { + *tl++ = b->url; + } } + freez(buf); + } + + if (trusted_referrers >= MAX_TRUSTED_REFERRERS) + { + /* + * FIXME: ... after Privoxy 3.0.4 is out. + */ + log_error(LOG_LEVEL_ERROR, "Too many trusted referrers. Current limit is %d, you are using %d.\n" + " Additional trusted referrers are treated like ordinary trusted URLs.\n" + " (You can increase this limit by changing MAX_TRUSTED_REFERRERS in project.h and recompiling).", + MAX_TRUSTED_REFERRERS, trusted_referrers); } *tl = NULL; fclose(fp); -#ifndef SPLIT_PROXY_ARGS - if (!suppress_blocklists) - { - fs->proxy_args = strsav(fs->proxy_args, ""); - } -#endif /* ndef SPLIT_PROXY_ARGS */ - /* the old one is now obsolete */ if (current_trustfile) { @@ -1559,28 +921,156 @@ int load_trustfile(struct client_state *csp) fs->next = files->next; files->next = fs; current_trustfile = fs; - - if (csp) - { - csp->tlist = fs; - } + csp->tlist = fs; return(0); load_trustfile_error: - log_error(LOG_LEVEL_ERROR, "can't load trustfile '%s': %E", - csp->config->trustfile); + log_error(LOG_LEVEL_FATAL, "can't load trustfile '%s': %E", + csp->config->trustfile); + freez(buf); return(-1); } -#endif /* def TRUST_FILES */ +#endif /* def FEATURE_TRUST */ + + +/********************************************************************* + * + * Function : unload_re_filterfile + * + * Description : Unload the re_filter list by freeing all chained + * re_filterfile specs and their data. + * + * Parameters : + * 1 : f = the data structure associated with the filterfile. + * + * Returns : N/A + * + *********************************************************************/ +static void unload_re_filterfile(void *f) +{ + struct re_filterfile_spec *a, *b = (struct re_filterfile_spec *)f; + + while (b != NULL) + { + a = b->next; + + destroy_list(b->patterns); + pcrs_free_joblist(b->joblist); + freez(b->name); + freez(b->description); + freez(b); + + b = a; + } + + return; +} + +/********************************************************************* + * + * Function : unload_forward_spec + * + * Description : Unload the forward spec settings by freeing all + * memory referenced by members and the memory for + * the spec itself. + * + * Parameters : + * 1 : fwd = the forward spec. + * + * Returns : N/A + * + *********************************************************************/ +void unload_forward_spec(struct forward_spec *fwd) +{ + free_pattern_spec(fwd->url); + freez(fwd->gateway_host); + freez(fwd->forward_host); + free(fwd); + + return; +} + + +#ifdef FEATURE_GRACEFUL_TERMINATION +/********************************************************************* + * + * Function : unload_current_re_filterfile + * + * Description : Unloads current re_filter file - reset to state at + * beginning of program. + * + * Parameters : None + * + * Returns : N/A + * + *********************************************************************/ +void unload_current_re_filterfile(void) +{ + int i; + + for (i = 0; i < MAX_AF_FILES; i++) + { + if (current_re_filterfile[i]) + { + current_re_filterfile[i]->unloader = unload_re_filterfile; + current_re_filterfile[i] = NULL; + } + } +} +#endif + + +/********************************************************************* + * + * Function : load_re_filterfiles + * + * Description : Loads all the filterfiles. + * Generate a chained list of re_filterfile_spec's from + * the "FILTER: " blocks, compiling all their substitutions + * into chained lists of pcrs_job structs. + * + * Parameters : + * 1 : csp = Current client state (buffers, headers, etc...) + * + * Returns : 0 => Ok, everything else is an error. + * + *********************************************************************/ +int load_re_filterfiles(struct client_state *csp) +{ + int i; + int result; + + for (i = 0; i < MAX_AF_FILES; i++) + { + if (csp->config->re_filterfile[i]) + { + result = load_one_re_filterfile(csp, i); + if (result) + { + return result; + } + } + else if (current_re_filterfile[i]) + { + current_re_filterfile[i]->unloader = unload_re_filterfile; + current_re_filterfile[i] = NULL; + } + } + + return 0; +} /********************************************************************* * - * Function : load_forwardfile + * Function : load_one_re_filterfile * - * Description : Read and parse a forwardfile and add to files list. + * Description : Load a re_filterfile. + * Generate a chained list of re_filterfile_spec's from + * the "FILTER: " blocks, compiling all their substitutions + * into chained lists of pcrs_job structs. * * Parameters : * 1 : csp = Current client state (buffers, headers, etc...) @@ -1588,368 +1078,262 @@ load_trustfile_error: * Returns : 0 => Ok, everything else is an error. * *********************************************************************/ -int load_forwardfile(struct client_state *csp) +int load_one_re_filterfile(struct client_state *csp, int fileid) { FILE *fp; - struct forward_spec *b, *bl; - char buf[BUFSIZ], *p, *q, *tmp; - char *vec[4]; - int port, n, reject; + struct re_filterfile_spec *new_bl, *bl = NULL; struct file_list *fs; - const struct gateway *gw; - struct url_spec url[1]; - if (!check_file_changed(current_forwardfile, csp->config->forwardfile, &fs)) + char *buf = NULL; + int error; + unsigned long linenum = 0; + pcrs_job *dummy, *lastjob = NULL; + + /* + * No need to reload if unchanged + */ + if (!check_file_changed(current_re_filterfile[fileid], csp->config->re_filterfile[fileid], &fs)) { - /* No need to load */ - if (csp) - { - csp->flist = current_forwardfile; - } + csp->rlist[fileid] = current_re_filterfile[fileid]; return(0); } if (!fs) { - goto load_forwardfile_error; - } - - fs->f = bl = (struct forward_spec *)zalloc(sizeof(*bl)); - - if ((fs == NULL) || (bl == NULL)) - { - goto load_forwardfile_error; + goto load_re_filterfile_error; } - if ((fp = fopen(csp->config->forwardfile, "r")) == NULL) + /* + * Open the file or fail + */ + if ((fp = fopen(csp->config->re_filterfile[fileid], "r")) == NULL) { - goto load_forwardfile_error; + goto load_re_filterfile_error; } - tmp = NULL; + log_error(LOG_LEVEL_INFO, "Loading filter file: %s", csp->config->re_filterfile[fileid]); - while (read_config_line(buf, sizeof(buf), fp, fs) != NULL) + /* + * Read line by line + */ + while (read_config_line(fp, &linenum, &buf) != NULL) { - freez(tmp); - - tmp = strdup(buf); - - n = ssplit(tmp, " \t", vec, SZ(vec), 1, 1); - - if (n != 4) - { - log_error(LOG_LEVEL_ERROR, "error in forwardfile: %s", buf); - continue; - } - - strcpy(buf, vec[0]); + enum filter_type new_filter = FT_INVALID_FILTER; - reject = 1; - - if (*buf == '~') + if (strncmp(buf, "FILTER:", 7) == 0) { - reject = 0; - p = buf; - q = p+1; - while ((*p++ = *q++)) - { - /* nop */ - } + new_filter = FT_CONTENT_FILTER; } - - /* skip lines containing only ~ */ - if (*buf == '\0') + else if (strncmp(buf, "SERVER-HEADER-FILTER:", 21) == 0) { - continue; + new_filter = FT_SERVER_HEADER_FILTER; } - - /* allocate a new node */ - if (((b = zalloc(sizeof(*b))) == NULL) -#ifdef REGEX - || ((b->url->preg = zalloc(sizeof(*b->url->preg))) == NULL) -#endif - ) + else if (strncmp(buf, "CLIENT-HEADER-FILTER:", 21) == 0) { - fclose(fp); - goto load_forwardfile_error; + new_filter = FT_CLIENT_HEADER_FILTER; } - - /* add it to the list */ - b->next = bl->next; - bl->next = b; - - /* save a copy of the orignal specification */ - if ((b->url->spec = strdup(buf)) == NULL) + else if (strncmp(buf, "CLIENT-HEADER-TAGGER:", 21) == 0) { - fclose(fp); - goto load_forwardfile_error; + new_filter = FT_CLIENT_HEADER_TAGGER; } - - b->reject = reject; - - if ((p = strchr(buf, '/'))) + else if (strncmp(buf, "SERVER-HEADER-TAGGER:", 21) == 0) { - b->url->path = strdup(p); - b->url->pathlen = strlen(b->url->path); - *p = '\0'; + new_filter = FT_SERVER_HEADER_TAGGER; } - else +#ifdef FEATURE_EXTERNAL_FILTERS + else if (strncmp(buf, "EXTERNAL-FILTER:", 16) == 0) { - b->url->path = NULL; - b->url->pathlen = 0; + new_filter = FT_EXTERNAL_CONTENT_FILTER; } -#ifdef REGEX - if (b->url->path) - { - int errcode; - char rebuf[BUFSIZ]; - - sprintf(rebuf, "^(%s)", b->url->path); - - errcode = regcomp(b->url->preg, rebuf, - (REG_EXTENDED|REG_NOSUB|REG_ICASE)); +#endif - if (errcode) + /* + * If this is the head of a new filter block, make it a + * re_filterfile spec of its own and chain it to the list: + */ + if (new_filter != FT_INVALID_FILTER) + { + new_bl = zalloc_or_die(sizeof(*bl)); + if (new_filter == FT_CONTENT_FILTER) { - size_t errlen = regerror(errcode, b->url->preg, buf, sizeof(buf)); - - buf[errlen] = '\0'; - - log_error(LOG_LEVEL_ERROR, "error compiling %s: %s", - b->url->spec, buf); - fclose(fp); - goto load_forwardfile_error; + new_bl->name = chomp(buf + 7); + } +#ifdef FEATURE_EXTERNAL_FILTERS + else if (new_filter == FT_EXTERNAL_CONTENT_FILTER) + { + new_bl->name = chomp(buf + 16); } - } - else - { - freez(b->url->preg); - } #endif - if ((p = strchr(buf, ':')) == NULL) - { - port = 0; - } - else - { - *p++ = '\0'; - port = atoi(p); - } - - b->url->port = port; - - if ((b->url->domain = strdup(buf)) == NULL) - { - fclose(fp); - goto load_forwardfile_error; - } - - /* split domain into components */ - *url = dsplit(b->url->domain); - b->url->dbuf = url->dbuf; - b->url->dcnt = url->dcnt; - b->url->dvec = url->dvec; + else + { + new_bl->name = chomp(buf + 21); + } + new_bl->type = new_filter; - /* now parse the gateway specs */ + /* + * If a filter description is available, + * encode it to HTML and save it. + */ + if (NULL != (new_bl->description = strpbrk(new_bl->name, " \t"))) + { + *new_bl->description++ = '\0'; + new_bl->description = html_encode(chomp(new_bl->description)); + if (NULL == new_bl->description) + { + new_bl->description = strdup_or_die("Out of memory while " + "encoding filter description to HTML"); + } + } + else + { + new_bl->description = strdup_or_die("No description available"); + } - p = vec[2]; + new_bl->name = strdup_or_die(chomp(new_bl->name)); - for (gw = gateways; gw->name; gw++) - { - if (strcmp(gw->name, p) == 0) + /* + * If this is the first filter block, chain it + * to the file_list rather than its (nonexistant) + * predecessor + */ + if (fs->f == NULL) { - break; + fs->f = new_bl; } - } - - if (gw->name == NULL) - { - goto load_forwardfile_error; - } + else + { + assert(NULL != bl); + bl->next = new_bl; + } + bl = new_bl; - /* save this as the gateway type */ - *b->gw = *gw; + log_error(LOG_LEVEL_RE_FILTER, "Reading in filter \"%s\" (\"%s\")", bl->name, bl->description); - /* now parse the gateway host[:port] spec */ - p = vec[3]; + freez(buf); + continue; + } - if (strcmp(p, ".") != 0) +#ifdef FEATURE_EXTERNAL_FILTERS + if ((bl != NULL) && (bl->type == FT_EXTERNAL_CONTENT_FILTER)) { - b->gw->gateway_host = strdup(p); - - if ((p = strchr(b->gw->gateway_host, ':'))) + /* Save the code as "pattern", but do not compile anything. */ + if (bl->patterns->first != NULL) { - *p++ = '\0'; - b->gw->gateway_port = atoi(p); + log_error(LOG_LEVEL_FATAL, "External filter '%s' contains several jobss. " + "Did you forget to escape a line break?", + bl->name); } - - if (b->gw->gateway_port <= 0) + error = enlist(bl->patterns, buf); + if (JB_ERR_MEMORY == error) { - goto load_forwardfile_error; + log_error(LOG_LEVEL_FATAL, + "Out of memory while enlisting external filter code \'%s\' for filter %s.", + buf, bl->name); } + freez(buf); + continue; } - - /* now parse the forwarding spec */ - p = vec[1]; - - if (strcmp(p, ".") != 0) +#endif + if (bl != NULL) { - b->gw->forward_host = strdup(p); - - if ((p = strchr(b->gw->forward_host, ':'))) + /* + * Save the expression, make it a pcrs_job + * and chain it into the current filter's joblist + */ + error = enlist(bl->patterns, buf); + if (JB_ERR_MEMORY == error) { - *p++ = '\0'; - b->gw->forward_port = atoi(p); + log_error(LOG_LEVEL_FATAL, + "Out of memory while enlisting re_filter job \'%s\' for filter %s.", buf, bl->name); } + assert(JB_ERR_OK == error); - if (b->gw->forward_port <= 0) + if (pcrs_job_is_dynamic(buf)) { - b->gw->forward_port = 8000; + /* + * Dynamic pattern that might contain variables + * and has to be recompiled for every request + */ + if (bl->joblist != NULL) + { + pcrs_free_joblist(bl->joblist); + bl->joblist = NULL; + } + bl->dynamic = 1; + log_error(LOG_LEVEL_RE_FILTER, + "Adding dynamic re_filter job \'%s\' to filter %s succeeded.", buf, bl->name); + freez(buf); + continue; + } + else if (bl->dynamic) + { + /* + * A previous job was dynamic and as we + * recompile the whole filter anyway, it + * makes no sense to compile this job now. + */ + log_error(LOG_LEVEL_RE_FILTER, + "Adding static re_filter job \'%s\' to dynamic filter %s succeeded.", buf, bl->name); + freez(buf); + continue; } - } - } - - freez(tmp); - - fclose(fp); - -#ifndef SPLIT_PROXY_ARGS - if (!suppress_blocklists) - { - fs->proxy_args = strsav(fs->proxy_args, ""); - } -#endif /* ndef SPLIT_PROXY_ARGS */ - - /* the old one is now obsolete */ - if (current_forwardfile) - { - current_forwardfile->unloader = unload_forwardfile; - } - - fs->next = files->next; - files->next = fs; - current_forwardfile = fs; - - if (csp) - { - csp->flist = fs; - } - - return(0); - -load_forwardfile_error: - log_error(LOG_LEVEL_ERROR, "can't load forwardfile '%s': %E", - csp->config->forwardfile); - return(-1); - -} - - -#ifdef PCRS -/********************************************************************* - * - * Function : load_re_filterfile - * - * Description : Load the re_filterfile. Each non-comment, non-empty - * line is instantly added to the joblist, which is - * a chained list of pcrs_job structs. - * - * Parameters : - * 1 : csp = Current client state (buffers, headers, etc...) - * - * Returns : 0 => Ok, everything else is an error. - * - *********************************************************************/ -int load_re_filterfile(struct client_state *csp) -{ - FILE *fp; - - struct re_filterfile_spec *bl; - struct file_list *fs; - - char buf[BUFSIZ]; - int error; - pcrs_job *dummy; - - if (!check_file_changed(current_re_filterfile, csp->config->re_filterfile, &fs)) - { - /* No need to load */ - if (csp) - { - csp->rlist = current_re_filterfile; - } - return(0); - } - if (!fs) - { - goto load_re_filterfile_error; - } - - fs->f = bl = (struct re_filterfile_spec *)zalloc(sizeof(*bl)); - if (bl == NULL) - { - goto load_re_filterfile_error; - } - - /* Open the file or fail */ - if ((fp = fopen(csp->config->re_filterfile, "r")) == NULL) - { - goto load_re_filterfile_error; - } - - /* Read line by line */ - while (read_config_line(buf, sizeof(buf), fp, fs) != NULL) - { - enlist( bl->patterns, buf ); - /* We have a meaningful line -> make it a job */ - if ((dummy = pcrs_make_job(buf, &error)) == NULL) - { - log_error(LOG_LEVEL_RE_FILTER, - "Adding re_filter job %s failed with error %d.", buf, error); - continue; + if ((dummy = pcrs_compile_command(buf, &error)) == NULL) + { + log_error(LOG_LEVEL_ERROR, + "Adding re_filter job \'%s\' to filter %s failed: %s", + buf, bl->name, pcrs_strerror(error)); + freez(buf); + continue; + } + else + { + if (bl->joblist == NULL) + { + bl->joblist = dummy; + } + else if (NULL != lastjob) + { + lastjob->next = dummy; + } + lastjob = dummy; + log_error(LOG_LEVEL_RE_FILTER, "Adding re_filter job \'%s\' to filter %s succeeded.", buf, bl->name); + } } else { - dummy->next = bl->joblist; - bl->joblist = dummy; - log_error(LOG_LEVEL_RE_FILTER, "Adding re_filter job %s succeeded.", buf); + log_error(LOG_LEVEL_ERROR, "Ignoring job %s outside filter block in %s, line %d", + buf, csp->config->re_filterfile[fileid], linenum); } + freez(buf); } fclose(fp); -#ifndef SPLIT_PROXY_ARGS - if (!suppress_blocklists) - { - fs->proxy_args = strsav(fs->proxy_args, ""); - } -#endif /* ndef SPLIT_PROXY_ARGS */ - - /* the old one is now obsolete */ - if ( NULL != current_re_filterfile ) + /* + * Schedule the now-obsolete old data for unloading + */ + if (NULL != current_re_filterfile[fileid]) { - current_re_filterfile->unloader = unload_re_filterfile; + current_re_filterfile[fileid]->unloader = unload_re_filterfile; } + /* + * Chain this file into the global list of loaded files + */ fs->next = files->next; files->next = fs; - current_re_filterfile = fs; - - if (csp) - { - csp->rlist = fs; - } + current_re_filterfile[fileid] = fs; + csp->rlist[fileid] = fs; - return( 0 ); + return(0); load_re_filterfile_error: - log_error(LOG_LEVEL_ERROR, "can't load re_filterfile '%s': %E", - csp->config->re_filterfile); + log_error(LOG_LEVEL_FATAL, "can't load re_filterfile '%s': %E", + csp->config->re_filterfile[fileid]); return(-1); } -#endif /* def PCRS */ /********************************************************************* @@ -1967,12 +1351,12 @@ load_re_filterfile_error: * Returns : N/A * *********************************************************************/ -void add_loader(int (*loader)(struct client_state *), +void add_loader(int (*loader)(struct client_state *), struct configuration_spec * config) { int i; - for (i=0; i < NLOADERS; i++) + for (i = 0; i < NLOADERS; i++) { if (config->loaders[i] == NULL) { @@ -2006,7 +1390,7 @@ int run_loader(struct client_state *csp) int ret = 0; int i; - for (i=0; i < NLOADERS; i++) + for (i = 0; i < NLOADERS; i++) { if (csp->config->loaders[i] == NULL) { @@ -2018,6 +1402,98 @@ int run_loader(struct client_state *csp) } +/********************************************************************* + * + * Function : file_has_been_modified + * + * Description : Helper function to check if a file has been changed + * + * Parameters : + * 1 : filename = The name of the file to check + * 2 : last_known_modification = The time of the last known + * modification + * + * Returns : TRUE if the file has been changed, + * FALSE otherwise. + * + *********************************************************************/ +static int file_has_been_modified(const char *filename, time_t last_know_modification) +{ + struct stat statbuf[1]; + + if (stat(filename, statbuf) < 0) + { + /* Error, probably file not found which counts as change. */ + return 1; + } + + return (last_know_modification != statbuf->st_mtime); +} + + +/********************************************************************* + * + * Function : any_loaded_file_changed + * + * Description : Helper function to check if any loaded file has been + * changed since the time it has been loaded. + * + * XXX: Should we cache the return value for x seconds? + * + * Parameters : + * 1 : files_to_check = List of files to check + * + * Returns : TRUE if any file has been changed, + * FALSE otherwise. + * + *********************************************************************/ +int any_loaded_file_changed(const struct client_state *csp) +{ + const struct file_list *file_to_check = csp->config->config_file_list; + int i; + + if (file_has_been_modified(file_to_check->filename, file_to_check->lastmodified)) + { + return TRUE; + } + + for (i = 0; i < MAX_AF_FILES; i++) + { + if (csp->actions_list[i]) + { + file_to_check = csp->actions_list[i]; + if (file_has_been_modified(file_to_check->filename, file_to_check->lastmodified)) + { + return TRUE; + } + } + } + + for (i = 0; i < MAX_AF_FILES; i++) + { + if (csp->rlist[i]) + { + file_to_check = csp->rlist[i]; + if (file_has_been_modified(file_to_check->filename, file_to_check->lastmodified)) + { + return TRUE; + } + } + } + +#ifdef FEATURE_TRUST + if (csp->tlist) + { + if (file_has_been_modified(csp->tlist->filename, csp->tlist->lastmodified)) + { + return TRUE; + } + } +#endif /* def FEATURE_TRUST */ + + return FALSE; +} + /* Local Variables: