X-Git-Url: http://www.privoxy.org/gitweb/?p=privoxy.git;a=blobdiff_plain;f=loaders.c;h=f0b1a9785110b59c7e381e85e1297cd420eb7d15;hp=f3ea5a13c7c3ac0c34e61ed7f1cf720618b3ceaa;hb=3140367dcdac86a0f239ebebef2add9bf94177b6;hpb=1df3ac22a584579c66453e938809929e8e20e160 diff --git a/loaders.c b/loaders.c index f3ea5a13..f0b1a978 100644 --- a/loaders.c +++ b/loaders.c @@ -1,4 +1,4 @@ -const char loaders_rcs[] = "$Id: loaders.c,v 1.1.1.1 2001/05/15 13:58:59 oes Exp $"; +const char loaders_rcs[] = "$Id: loaders.c,v 1.13 2001/05/31 21:28:49 jongfoster Exp $"; /********************************************************************* * * File : $Source: /cvsroot/ijbswa/current/loaders.c,v $ @@ -35,6 +35,85 @@ const char loaders_rcs[] = "$Id: loaders.c,v 1.1.1.1 2001/05/15 13:58:59 oes Exp * * Revisions : * $Log: loaders.c,v $ + * Revision 1.13 2001/05/31 21:28:49 jongfoster + * Removed all permissionsfile code - it's now called the actions + * file, and (almost) all the code is in actions.c + * + * Revision 1.12 2001/05/31 17:32:31 oes + * + * - Enhanced domain part globbing with infix and prefix asterisk + * matching and optional unanchored operation + * + * Revision 1.11 2001/05/29 23:25:24 oes + * + * - load_config_line() and load_permissions_file() now use chomp() + * + * Revision 1.10 2001/05/29 09:50:24 jongfoster + * Unified blocklist/imagelist/permissionslist. + * File format is still under discussion, but the internal changes + * are (mostly) done. + * + * Also modified interceptor behaviour: + * - We now intercept all URLs beginning with one of the following + * prefixes (and *only* these prefixes): + * * http://i.j.b/ + * * http://ijbswa.sf.net/config/ + * * http://ijbswa.sourceforge.net/config/ + * - New interceptors "home page" - go to http://i.j.b/ to see it. + * - Internal changes so that intercepted and fast redirect pages + * are not replaced with an image. + * - Interceptors now have the option to send a binary page direct + * to the client. (i.e. ijb-send-banner uses this) + * - Implemented show-url-info interceptor. (Which is why I needed + * the above interceptors changes - a typical URL is + * "http://i.j.b/show-url-info?url=www.somesite.com/banner.gif". + * The previous mechanism would not have intercepted that, and + * if it had been intercepted then it then it would have replaced + * it with an image.) + * + * Revision 1.9 2001/05/26 17:12:07 jongfoster + * Fatal errors loading configuration files now give better error messages. + * + * Revision 1.8 2001/05/26 00:55:20 jongfoster + * Removing duplicated code. load_forwardfile() now uses create_url_spec() + * + * Revision 1.7 2001/05/26 00:28:36 jongfoster + * Automatic reloading of config file. + * Removed obsolete SIGHUP support (Unix) and Reload menu option (Win32). + * Most of the global variables have been moved to a new + * struct configuration_spec, accessed through csp->config->globalname + * Most of the globals remaining are used by the Win32 GUI. + * + * 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 * @@ -58,6 +137,7 @@ const char loaders_rcs[] = "$Id: loaders.c,v 1.1.1.1 2001/05/15 13:58:59 oes Exp #endif #include "project.h" +#include "list.h" #include "loaders.h" #include "encode.h" #include "filters.h" @@ -67,6 +147,7 @@ const char loaders_rcs[] = "$Id: loaders.c,v 1.1.1.1 2001/05/15 13:58:59 oes Exp #include "miscutil.h" #include "errlog.h" #include "gateway.h" +#include "actions.h" #ifndef SPLIT_PROXY_ARGS /* For strsav */ @@ -85,30 +166,16 @@ const char loaders_h_rcs[] = LOADERS_H_VERSION; #define ijb_isspace(__X) isspace((int)(unsigned char)(__X)) -#define NLOADERS 8 -static int (*loaders[NLOADERS])(struct client_state *); - - /* * 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_cookiefile = 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 KILLPOPUPS -static struct file_list * current_popupfile = NULL; -#endif /* def KILLPOPUPS */ - #ifdef TRUST_FILES static struct file_list *current_trustfile = NULL; #endif /* def TRUST_FILES */ @@ -159,17 +226,18 @@ void sweep(void) { /* mark this client's files as active */ - if (ncsp->blist) /* block files */ - { - ncsp->blist->active = 1; - } + /* + * Always have a configuration file. + * (Also note the slightly non-standard extra + * indirection here.) + */ + ncsp->config->config_file_list->active = 1; - if (ncsp->clist) /* cookie files */ + if (ncsp->actions_list) /* actions files */ { - ncsp->clist->active = 1; + ncsp->actions_list->active = 1; } - /* FIXME: These were left out of the "10" release. Should they be here? */ if (ncsp->flist) /* forward files */ { ncsp->flist->active = 1; @@ -182,20 +250,6 @@ void sweep(void) } #endif /* def ACL_FILES */ -#ifdef USE_IMAGE_LIST - if (ncsp->ilist) /* image files */ - { - ncsp->ilist->active = 1; - } -#endif /* def USE_IMAGE_LIST */ - -#ifdef KILLPOPUPS - if (ncsp->plist) /* killpopup files */ - { - ncsp->plist->active = 1; - } -#endif /* def KILLPOPUPS */ - #ifdef PCRS if (ncsp->rlist) /* perl re files */ { @@ -217,9 +271,10 @@ void sweep(void) csp->next = ncsp->next; freez(ncsp->ip_addr_str); +#ifdef TRUST_FILES freez(ncsp->referrer); +#endif /* def TRUST_FILES */ freez(ncsp->x_forwarded); - freez(ncsp->ip_addr_str); freez(ncsp->iob->buf); free_http_request(ncsp->http); @@ -227,6 +282,8 @@ void sweep(void) destroy_list(ncsp->headers); destroy_list(ncsp->cookie_list); + free_current_action(ncsp->action); + #ifdef STATISTICS urls_read++; if (ncsp->rejected) @@ -262,140 +319,181 @@ void sweep(void) /********************************************************************* * - * Function : unload_url + * Function : create_url_spec * - * Description : Called from the "unloaders". Freez the url - * structure elements. + * Description : Creates a "url_spec" structure from a string. + * When finished, free with unload_url(). * * Parameters : - * 1 : url = pointer to a url_spec structure. + * 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. * - * Returns : N/A + * Returns : 0 => Ok, everything else is an error. * *********************************************************************/ -static void unload_url(struct url_spec *url) +int create_url_spec(struct url_spec * url, char * buf) { - if (url == NULL) return; + char *p; + struct url_spec tmp_url[1]; - freez(url->spec); - freez(url->domain); - freez(url->dbuf); - freez(url->dvec); - freez(url->path); -#ifdef REGEX - if (url->preg) + /* paranoia - should never happen. */ + if ((url == NULL) || (buf == NULL)) { - regfree(url->preg); - freez(url->preg); + return 1; } -#endif -} + /* save a copy of the orignal specification */ + if ((url->spec = strdup(buf)) == NULL) + { + return 1; + } + if ((p = strchr(buf, '/'))) + { + if (NULL == (url->path = strdup(p))) + { + freez(url->spec); + return 1; + } + url->pathlen = strlen(url->path); + *p = '\0'; + } + else + { + url->path = NULL; + url->pathlen = 0; + } +#ifdef REGEX + if (url->path) + { + int errcode; + char rebuf[BUFSIZ]; -#ifdef ACL_FILES -/********************************************************************* - * - * Function : unload_aclfile - * - * Description : Unloads an aclfile. - * - * Parameters : - * 1 : f = the data structure associated with the aclfile. - * - * Returns : N/A - * - *********************************************************************/ -static void unload_aclfile(void *f) -{ - struct access_control_list *b = (struct access_control_list *)f; - if (b == NULL) return; + if (NULL == (url->preg = zalloc(sizeof(*url->preg)))) + { + freez(url->spec); + freez(url->path); + return 1; + } - unload_aclfile(b->next); + sprintf(rebuf, "^(%s)", url->path); - freez(b); + errcode = regcomp(url->preg, rebuf, + (REG_EXTENDED|REG_NOSUB|REG_ICASE)); + if (errcode) + { + size_t errlen = + regerror(errcode, + url->preg, buf, sizeof(buf)); -} -#endif /* def ACL_FILES */ + buf[errlen] = '\0'; -/********************************************************************* - * - * 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; + log_error(LOG_LEVEL_ERROR, "error compiling %s: %s", + url->spec, buf); - unload_blockfile(b->next); + freez(url->spec); + freez(url->path); + freez(url->preg); - unload_url(b->url); + return 1; + } + } +#endif + if ((p = strchr(buf, ':')) == NULL) + { + url->port = 0; + } + else + { + *p++ = '\0'; + url->port = atoi(p); + } - freez(b); + if ((url->domain = strdup(buf)) == NULL) + { + freez(url->spec); + freez(url->path); +#ifdef REGEX + freez(url->preg); +#endif /* def REGEX */ + return 1; + } + + /* split domain into components */ + + *tmp_url = dsplit(url->domain); + url->dbuf = tmp_url->dbuf; + url->dcnt = tmp_url->dcnt; + url->dvec = tmp_url->dvec; + url->unanchored = tmp_url->unanchored; + return 0; /* OK */ } -#ifdef USE_IMAGE_LIST /********************************************************************* * - * Function : unload_imagefile + * Function : free_url * - * Description : Unloads an imagefile. + * Description : Called from the "unloaders". Freez the url + * structure elements. * * Parameters : - * 1 : f = the data structure associated with the imagefile. + * 1 : url = pointer to a url_spec structure. * * Returns : N/A * *********************************************************************/ -static void unload_imagefile(void *f) +void free_url(struct url_spec *url) { - struct block_spec *b = (struct block_spec *)f; - if (b == NULL) return; - - unload_imagefile(b->next); - - unload_url(b->url); + if (url == NULL) return; - freez(b); + freez(url->spec); + freez(url->domain); + freez(url->dbuf); + freez(url->dvec); + freez(url->path); +#ifdef REGEX + if (url->preg) + { + regfree(url->preg); + freez(url->preg); + } +#endif } -#endif /* def USE_IMAGE_LIST */ +#ifdef ACL_FILES /********************************************************************* * - * Function : unload_cookiefile + * Function : unload_aclfile * - * Description : Unloads a cookiefile. + * Description : Unloads an aclfile. * * Parameters : - * 1 : f = the data structure associated with the cookiefile. + * 1 : f = the data structure associated with the aclfile. * * Returns : N/A * *********************************************************************/ -static void unload_cookiefile(void *f) +static void unload_aclfile(void *f) { - struct cookie_spec *b = (struct cookie_spec *)f; + struct access_control_list *b = (struct access_control_list *)f; if (b == NULL) return; - unload_cookiefile(b->next); - - unload_url(b->url); + unload_aclfile(b->next); freez(b); } +#endif /* def ACL_FILES */ #ifdef TRUST_FILES @@ -418,7 +516,7 @@ static void unload_trustfile(void *f) unload_trustfile(b->next); - unload_url(b->url); + free_url(b->url); freez(b); @@ -445,7 +543,7 @@ static void unload_forwardfile(void *f) unload_forwardfile(b->next); - unload_url(b->url); + free_url(b->url); freez(b->gw->gateway_host); freez(b->gw->forward_host); @@ -486,51 +584,6 @@ static void unload_re_filterfile(void *f) #endif /* def PCRS */ -#ifdef KILLPOPUPS -/********************************************************************* - * - * Function : unload_popupfile - * - * Description : Free the lists of blocked, and allowed popup sites. - * - * Parameters : - * 1 : csp = Current client state (buffers, headers, etc...) - * - * Returns : N/A - * - *********************************************************************/ -static void unload_popupfile(void * b) -{ - struct popup_settings * data = (struct popup_settings *) b; - struct popup_blocklist * cur = NULL; - struct popup_blocklist * temp= NULL; - - /* Free the blocked list. */ - cur = data->blocked; - while (cur != NULL) - { - temp = cur->next; - freez (cur->host_name); - free (cur); - cur = temp; - } - data->blocked = NULL; - - /* Free the allowed list. */ - cur = data->allowed; - while (cur != NULL) - { - temp = cur->next; - freez (cur->host_name); - free (cur); - cur = temp; - } - data->allowed = NULL; - -} -#endif /* def KILLPOPUPS */ - - /********************************************************************* * * Function : check_file_changed @@ -552,7 +605,7 @@ static void unload_popupfile(void * b) * 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 + * (proxy_args is only filled in if !defined * SPLIT_PROXY_ARGS and !suppress_blocklists). * * Returns : If file unchanged: 0 (and sets newfl == NULL) @@ -560,9 +613,9 @@ static void unload_popupfile(void * b) * On error: 1 and sets newfl == NULL * *********************************************************************/ -static int check_file_changed(const struct file_list * current, - const char * filename, - struct file_list ** newfl) +int check_file_changed(const struct file_list * current, + const char * filename, + struct file_list ** newfl) { struct file_list *fs; struct stat statbuf[1]; @@ -626,8 +679,9 @@ static int check_file_changed(const struct file_list * current, * Function : read_config_line * * Description : Read a single non-empty line from a file and return - * it. Trims comments, leading and trailing whitespace. - * Also wites the file to fs->proxy_args. + * 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. @@ -644,6 +698,9 @@ 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)) { @@ -660,59 +717,60 @@ char *read_config_line(char *buf, int buflen, FILE *fp, struct file_list *fs) } #endif /* ndef SPLIT_PROXY_ARGS */ - /* Trim off newline and any comment */ - if ((p = strpbrk(linebuf, "\r\n#")) != NULL) + /* Trim off newline */ + if ((p = strpbrk(linebuf, "\r\n")) != NULL) { *p = '\0'; } - - /* Trim leading whitespace */ - p = linebuf; - while (*p && ijb_isspace(*p)) + + /* Line continuation? Trim escape and set flag. */ + if ((p != linebuf) && (*--p == '\\')) { - *p++; + contflag = 1; + *p = '\0'; } - if (*p) + /* If there's a comment char.. */ + if ((p = strpbrk(linebuf, "#")) != NULL) { - /* There is something other than whitespace on the line. */ - - /* Move the data to the start of buf */ - if (p != linebuf) + /* ..and it's escaped, left-shift the line over the escape. */ + if ((p != linebuf) && (*(p-1) == '\\')) { - /* strcpy that can cope with overlap. */ - q = linebuf; - while ((*q++ = *p++) != '\0') - { - /* Do nothing */ - } + q = p-1; + while ((*q++ = *p++) != '\0') /* nop */; } - - /* Trim trailing whitespace */ - p = linebuf + strlen(linebuf) - 1; - - /* - * Note: the (p >= retval) below is paranoia, it's not really needed. - * When p == retval then ijb_isspace(*p) will be false and we'll drop - * out of the loop. - */ - while ((p >= linebuf) && ijb_isspace(*p)) + /* Else, chop off the rest of the line */ + else { - p--; + *p = '\0'; } - p[1] = '\0'; + } - /* More paranoia. This if statement is always true. */ - if (*linebuf) - { - strcpy(buf, linebuf); - return buf; - } + /* Write to the buffer */ + if (*linebuf) + { + strncat(buf, linebuf, buflen - strlen(buf)); + } + + /* Continue? */ + if (contflag) + { + contflag = 0; + continue; + } + + /* Remove leading and trailing whitespace */ + chomp(buf); + + if (*buf) + { + return buf; } } /* EOF */ return NULL; + } @@ -737,7 +795,7 @@ int load_aclfile(struct client_state *csp) struct access_control_list *a, *bl; struct file_list *fs; - if (!check_file_changed(current_aclfile, aclfile, &fs)) + if (!check_file_changed(current_aclfile, csp->config->aclfile, &fs)) { /* No need to load */ if (csp) @@ -759,7 +817,7 @@ int load_aclfile(struct client_state *csp) goto load_aclfile_error; } - fp = fopen(aclfile, "r"); + fp = fopen(csp->config->aclfile, "r"); if (fp == NULL) { @@ -846,18 +904,20 @@ int load_aclfile(struct client_state *csp) return(0); load_aclfile_error: - log_error(LOG_LEVEL_ERROR, "can't load access control list %s: %E", aclfile); + log_error(LOG_LEVEL_FATAL, "can't load access control list %s: %E", + csp->config->aclfile); return(-1); } #endif /* def ACL_FILES */ +#ifdef TRUST_FILES /********************************************************************* * - * Function : load_blockfile + * Function : load_trustfile * - * Description : Read and parse a blockfile and add to files list. + * Description : Read and parse a trustfile and add to files list. * * Parameters : * 1 : csp = Current client state (buffers, headers, etc...) @@ -865,44 +925,54 @@ load_aclfile_error: * Returns : 0 => Ok, everything else is an error. * *********************************************************************/ -int load_blockfile(struct client_state *csp) +int load_trustfile(struct client_state *csp) { FILE *fp; struct block_spec *b, *bl; + struct url_spec **tl; + char buf[BUFSIZ], *p, *q; - int port, reject; + int reject, trusted; struct file_list *fs; - struct url_spec url[1]; - if (!check_file_changed(current_blockfile, blockfile, &fs)) + if (!check_file_changed(current_trustfile, csp->config->trustfile, &fs)) { /* No need to load */ if (csp) { - csp->blist = current_blockfile; + csp->tlist = current_trustfile; } return(0); } if (!fs) { - goto load_blockfile_error; + goto load_trustfile_error; } - fs->f = bl = (struct block_spec *) zalloc(sizeof(*bl)); + fs->f = bl = (struct block_spec *)zalloc(sizeof(*bl)); if (bl == NULL) { - goto load_blockfile_error; + goto load_trustfile_error; } - if ((fp = fopen(blockfile, "r")) == NULL) + if ((fp = fopen(csp->config->trustfile, "r")) == NULL) { - goto load_blockfile_error; + goto load_trustfile_error; } + tl = csp->config->trust_list; + while (read_config_line(buf, sizeof(buf), fp, fs) != NULL) { - reject = 1; + trusted = 0; + reject = 1; + + if (*buf == '+') + { + trusted = 1; + *buf = '~'; + } if (*buf == '~') { @@ -915,102 +985,43 @@ int load_blockfile(struct client_state *csp) } } - /* skip lines containing only ~ */ + /* skip blank lines */ if (*buf == '\0') { continue; } /* allocate a new node */ - if (((b = zalloc(sizeof(*b))) == NULL) -#ifdef REGEX - || ((b->url->preg = zalloc(sizeof(*b->url->preg))) == NULL) -#endif - ) + if ((b = zalloc(sizeof(*b))) == NULL) { fclose(fp); - goto load_blockfile_error; + goto load_trustfile_error; } /* 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) - { - fclose(fp); - goto load_blockfile_error; - } - b->reject = reject; - if ((p = strchr(buf, '/'))) - { - b->url->path = strdup(p); - b->url->pathlen = strlen(b->url->path); - *p = '\0'; - } - else - { - b->url->path = NULL; - b->url->pathlen = 0; - } -#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)); - - if (errcode) - { - size_t errlen = - regerror(errcode, - b->url->preg, buf, sizeof(buf)); - - buf[errlen] = '\0'; - - log_error(LOG_LEVEL_ERROR, "error compiling %s: %s\n", - b->url->spec, buf); - fclose(fp); - goto load_blockfile_error; - } - } - else - { - freez(b->url->preg); - } -#endif - if ((p = strchr(buf, ':')) == NULL) + /* Save the URL pattern */ + if (create_url_spec(b->url, buf)) { - port = 0; - } - else - { - *p++ = '\0'; - port = atoi(p); + fclose(fp); + goto load_trustfile_error; } - b->url->port = port; - - if ((b->url->domain = strdup(buf)) == NULL) + /* + * save a pointer to URL's spec in the list of trusted URL's, too + */ + if (trusted) { - fclose(fp); - goto load_blockfile_error; + *tl++ = b->url; } - - /* split domain into components */ - *url = dsplit(b->url->domain); - b->url->dbuf = url->dbuf; - b->url->dcnt = url->dcnt; - b->url->dvec = url->dvec; } + *tl = NULL; + fclose(fp); #ifndef SPLIT_PROXY_ARGS @@ -1021,35 +1032,36 @@ int load_blockfile(struct client_state *csp) #endif /* ndef SPLIT_PROXY_ARGS */ /* the old one is now obsolete */ - if (current_blockfile) + if (current_trustfile) { - current_blockfile->unloader = unload_blockfile; + current_trustfile->unloader = unload_trustfile; } fs->next = files->next; files->next = fs; - current_blockfile = fs; + current_trustfile = fs; if (csp) { - csp->blist = fs; + csp->tlist = fs; } return(0); -load_blockfile_error: - log_error(LOG_LEVEL_ERROR, "can't load blockfile '%s': %E", blockfile); +load_trustfile_error: + log_error(LOG_LEVEL_FATAL, "can't load trustfile '%s': %E", + csp->config->trustfile); return(-1); } +#endif /* def TRUST_FILES */ -#ifdef USE_IMAGE_LIST /********************************************************************* * - * Function : load_imagefile + * Function : load_forwardfile * - * Description : Read and parse an imagefile and add to files list. + * Description : Read and parse a forwardfile and add to files list. * * Parameters : * 1 : csp = Current client state (buffers, headers, etc...) @@ -1057,657 +1069,30 @@ load_blockfile_error: * Returns : 0 => Ok, everything else is an error. * *********************************************************************/ -int load_imagefile(struct client_state *csp) +int load_forwardfile(struct client_state *csp) { FILE *fp; - struct block_spec *b, *bl; - char buf[BUFSIZ], *p, *q; - int port, reject; + struct forward_spec *b, *bl; + char buf[BUFSIZ]; + char *p, *tmp; + char *vec[4]; + int n; struct file_list *fs; - struct url_spec url[1]; + const struct gateway *gw; - if (!check_file_changed(current_imagefile, imagefile, &fs)) + if (!check_file_changed(current_forwardfile, csp->config->forwardfile, &fs)) { /* No need to load */ if (csp) { - csp->ilist = current_imagefile; + csp->flist = current_forwardfile; } 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(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) -#ifdef REGEX - || ((b->url->preg = zalloc(sizeof(*b->url->preg))) == NULL) -#endif - ) - { - fclose(fp); - goto load_imagefile_error; - } - - /* 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) - { - fclose(fp); - goto load_imagefile_error; - } - - b->reject = reject; - - if ((p = strchr(buf, '/'))) - { - b->url->path = strdup(p); - b->url->pathlen = strlen(b->url->path); - *p = '\0'; - } - else - { - b->url->path = NULL; - b->url->pathlen = 0; - } -#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)); - - if (errcode) - { - 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_imagefile_error; - } - } - 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_imagefile_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; - } -#ifndef SPLIT_PROXY_ARGS - if (!suppress_blocklists) - fs->proxy_args = strsav(fs->proxy_args, ""); -#endif /* ndef SPLIT_PROXY_ARGS */ - - 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_imagefile) - { - current_imagefile->unloader = unload_imagefile; - } - - fs->next = files->next; - files->next = fs; - current_imagefile = fs; - - if (csp) - { - csp->ilist = fs; - } - - return(0); - -load_imagefile_error: - log_error(LOG_LEVEL_ERROR, "can't load imagefile '%s': %E", imagefile); - return(-1); - -} -#endif /* def USE_IMAGE_LIST */ - - -/********************************************************************* - * - * Function : load_cookiefile - * - * Description : Read and parse a cookiefile and add to files list. - * - * Parameters : - * 1 : csp = Current client state (buffers, headers, etc...) - * - * Returns : 0 => Ok, everything else is an error. - * - *********************************************************************/ -int load_cookiefile(struct client_state *csp) -{ - FILE *fp; - - struct cookie_spec *b, *bl; - char buf[BUFSIZ], *p, *q; - int port, user_cookie, server_cookie; - struct file_list *fs; - struct url_spec url[1]; - - if (!check_file_changed(current_cookiefile, cookiefile, &fs)) - { - /* No need to load */ - if (csp) - { - csp->clist = current_cookiefile; - } - return(0); - } - if (!fs) - { - goto load_cookie_error; - } - - fs->f = bl = (struct cookie_spec *)zalloc(sizeof(*bl)); - if (bl == NULL) - { - goto load_cookie_error; - } - - if ((fp = fopen(cookiefile, "r")) == NULL) - { - goto load_cookie_error; - } - - while (read_config_line(buf, sizeof(buf), fp, fs) != NULL) - { - p = buf; - - switch ((int)*p) - { - case '>': - server_cookie = 0; - user_cookie = 1; - p++; - break; - - case '<': - server_cookie = 1; - user_cookie = 0; - p++; - break; - - case '~': - server_cookie = 0; - user_cookie = 0; - p++; - break; - - default: - server_cookie = 1; - user_cookie = 1; - break; - } - - /* - * Elide any of the "special" chars from the - * front of the pattern - */ - q = buf; - if (p > q) while ((*q++ = *p++)) - { - /* nop */ - } - - /* skip lines containing only "special" chars */ - if (*buf == '\0') - { - continue; - } - - /* allocate a new node */ - if (((b = zalloc(sizeof(*b))) == NULL) -#ifdef REGEX - || ((b->url->preg = zalloc(sizeof(*b->url->preg))) == NULL) -#endif - ) - { - fclose(fp); - goto load_cookie_error; - } - - /* 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) - { - fclose(fp); - goto load_cookie_error; - } - - b->send_user_cookie = user_cookie; - b->accept_server_cookie = server_cookie; - - if ((p = strchr(buf, '/'))) - { - b->url->path = strdup(p); - b->url->pathlen = strlen(b->url->path); - *p = '\0'; - } - else - { - b->url->path = NULL; - b->url->pathlen = 0; - } -#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)); - if (errcode) - { - 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_cookie_error; - } - } - 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_cookie_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; - } - - 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_cookiefile) - { - current_cookiefile->unloader = unload_cookiefile; - } - - fs->next = files->next; - files->next = fs; - current_cookiefile = fs; - - if (csp) - { - csp->clist = fs; - } - - return(0); - -load_cookie_error: - log_error(LOG_LEVEL_ERROR, "can't load cookiefile '%s': %E", cookiefile); - return(-1); - -} - - -#ifdef TRUST_FILES -/********************************************************************* - * - * Function : load_trustfile - * - * Description : Read and parse a trustfile and add to files list. - * - * Parameters : - * 1 : csp = Current client state (buffers, headers, etc...) - * - * Returns : 0 => Ok, everything else is an error. - * - *********************************************************************/ -int load_trustfile(struct client_state *csp) -{ - FILE *fp; - - struct block_spec *b, *bl; - struct url_spec **tl; - - char buf[BUFSIZ], *p, *q; - int port, reject, trusted; - struct file_list *fs; - struct url_spec url[1]; - - if (!check_file_changed(current_trustfile, trustfile, &fs)) - { - /* No need to load */ - if (csp) - { - csp->tlist = current_trustfile; - } - return(0); - } - if (!fs) - { - goto load_trustfile_error; - } - - fs->f = bl = (struct block_spec *)zalloc(sizeof(*bl)); - if (bl == NULL) - { - goto load_trustfile_error; - } - - if ((fp = fopen(trustfile, "r")) == NULL) - { - goto load_trustfile_error; - } - - tl = trust_list; - - while (read_config_line(buf, sizeof(buf), fp, fs) != NULL) - { - trusted = 0; - reject = 1; - - if (*buf == '+') - { - trusted = 1; - *buf = '~'; - } - - if (*buf == '~') - { - reject = 0; - p = buf; - q = p+1; - while ((*p++ = *q++)) - { - /* nop */ - } - } - - /* skip blank lines */ - if (*buf == '\0') - { - continue; - } - - /* allocate a new node */ - if (((b = zalloc(sizeof(*b))) == NULL) -#ifdef REGEX - || ((b->url->preg = zalloc(sizeof(*b->url->preg))) == NULL) -#endif - ) - { - fclose(fp); - goto load_trustfile_error; - } - - /* 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) - { - fclose(fp); - goto load_trustfile_error; - } - - b->reject = reject; - - if ((p = strchr(buf, '/'))) - { - b->url->path = strdup(p); - b->url->pathlen = strlen(b->url->path); - *p = '\0'; - } - else - { - b->url->path = NULL; - b->url->pathlen = 0; - } -#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)); - - if (errcode) - { - 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_trustfile_error; - } - } - 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_trustfile_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; - - /* - * save a pointer to URL's spec in the list of trusted URL's, too - */ - if (trusted) - { - *tl++ = b->url; - } - } - - *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) - { - current_trustfile->unloader = unload_trustfile; - } - - fs->next = files->next; - files->next = fs; - current_trustfile = fs; - - if (csp) - { - csp->tlist = fs; - } - - return(0); - -load_trustfile_error: - log_error(LOG_LEVEL_ERROR, "can't load trustfile '%s': %E", trustfile); - return(-1); - -} -#endif /* def TRUST_FILES */ - - -/********************************************************************* - * - * Function : load_forwardfile - * - * Description : Read and parse a forwardfile and add to files list. - * - * Parameters : - * 1 : csp = Current client state (buffers, headers, etc...) - * - * Returns : 0 => Ok, everything else is an error. - * - *********************************************************************/ -int load_forwardfile(struct client_state *csp) -{ - FILE *fp; - - struct forward_spec *b, *bl; - char buf[BUFSIZ], *p, *q, *tmp; - char *vec[4]; - int port, n, reject; - struct file_list *fs; - const struct gateway *gw; - struct url_spec url[1]; - - if (!check_file_changed(current_forwardfile, forwardfile, &fs)) - { - /* No need to load */ - if (csp) - { - csp->flist = current_forwardfile; - } - return(0); - } - if (!fs) - { - goto load_forwardfile_error; + goto load_forwardfile_error; } fs->f = bl = (struct forward_spec *)zalloc(sizeof(*bl)); @@ -1717,7 +1102,7 @@ int load_forwardfile(struct client_state *csp) goto load_forwardfile_error; } - if ((fp = fopen(forwardfile, "r")) == NULL) + if ((fp = fopen(csp->config->forwardfile, "r")) == NULL) { goto load_forwardfile_error; } @@ -1740,19 +1125,6 @@ int load_forwardfile(struct client_state *csp) strcpy(buf, vec[0]); - reject = 1; - - if (*buf == '~') - { - reject = 0; - p = buf; - q = p+1; - while ((*p++ = *q++)) - { - /* nop */ - } - } - /* skip lines containing only ~ */ if (*buf == '\0') { @@ -1761,9 +1133,6 @@ int load_forwardfile(struct client_state *csp) /* allocate a new node */ if (((b = zalloc(sizeof(*b))) == NULL) -#ifdef REGEX - || ((b->url->preg = zalloc(sizeof(*b->url->preg))) == NULL) -#endif ) { fclose(fp); @@ -1774,78 +1143,13 @@ int load_forwardfile(struct client_state *csp) b->next = bl->next; bl->next = b; - /* save a copy of the orignal specification */ - if ((b->url->spec = strdup(buf)) == NULL) - { - fclose(fp); - goto load_forwardfile_error; - } - - b->reject = reject; - - if ((p = strchr(buf, '/'))) - { - b->url->path = strdup(p); - b->url->pathlen = strlen(b->url->path); - *p = '\0'; - } - else - { - b->url->path = NULL; - b->url->pathlen = 0; - } -#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)); - - if (errcode) - { - 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; - } - } - 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) + /* Save the URL pattern */ + if (create_url_spec(b->url, buf)) { 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; - /* now parse the gateway specs */ p = vec[2]; @@ -1934,7 +1238,8 @@ int load_forwardfile(struct client_state *csp) return(0); load_forwardfile_error: - log_error(LOG_LEVEL_ERROR, "can't load forwardfile '%s': %E", forwardfile); + log_error(LOG_LEVEL_FATAL, "can't load forwardfile '%s': %E", + csp->config->forwardfile); return(-1); } @@ -1966,10 +1271,7 @@ int load_re_filterfile(struct client_state *csp) int error; pcrs_job *dummy; -#ifndef SPLIT_PROXY_ARGS - char *p; -#endif /* ndef SPLIT_PROXY_ARGS */ - if (!check_file_changed(current_re_filterfile, re_filterfile, &fs)) + if (!check_file_changed(current_re_filterfile, csp->config->re_filterfile, &fs)) { /* No need to load */ if (csp) @@ -1990,7 +1292,7 @@ int load_re_filterfile(struct client_state *csp) } /* Open the file or fail */ - if ((fp = fopen(re_filterfile, "r")) == NULL) + if ((fp = fopen(csp->config->re_filterfile, "r")) == NULL) { goto load_re_filterfile_error; } @@ -2003,7 +1305,7 @@ int load_re_filterfile(struct client_state *csp) /* We have a meaningful line -> make it a job */ if ((dummy = pcrs_make_job(buf, &error)) == NULL) { - log_error(LOG_LEVEL_REF, + log_error(LOG_LEVEL_RE_FILTER, "Adding re_filter job %s failed with error %d.", buf, error); continue; } @@ -2011,7 +1313,7 @@ int load_re_filterfile(struct client_state *csp) { dummy->next = bl->joblist; bl->joblist = dummy; - log_error(LOG_LEVEL_REF, "Adding re_filter job %s succeeded.", buf); + log_error(LOG_LEVEL_RE_FILTER, "Adding re_filter job %s succeeded.", buf); } } @@ -2042,134 +1344,14 @@ int load_re_filterfile(struct client_state *csp) return( 0 ); load_re_filterfile_error: - log_error(LOG_LEVEL_ERROR, "can't load re_filterfile '%s': %E", re_filterfile); + log_error(LOG_LEVEL_FATAL, "can't load re_filterfile '%s': %E", + csp->config->re_filterfile); return(-1); } #endif /* def PCRS */ -#ifdef KILLPOPUPS -/********************************************************************* - * - * Function : load_popupfile - * - * Description : Load, and parse the popup blocklist. - * - * Parameters : - * 1 : csp = Current client state (buffers, headers, etc...) - * - * Returns : 0 => success, else there was an error. - * - *********************************************************************/ -int load_popupfile(struct client_state *csp) -{ - FILE *fp; - char buf[BUFSIZ], *p, *q; - struct popup_blocklist *entry = NULL; - struct popup_settings * data; - struct file_list *fs; - p = buf; - q = buf; - - if (!check_file_changed(current_popupfile, popupfile, &fs)) - { - /* No need to load */ - if (csp) - { - csp->plist = current_popupfile; - } - return(0); - } - if (!fs) - { - goto load_popupfile_error; - } - - fs->f = data = (struct popup_settings *)zalloc(sizeof(*data)); - if (data == NULL) - { - goto load_popupfile_error; - } - - if ((fp = fopen(popupfile, "r")) == NULL) - { - goto load_popupfile_error; - } - - while (read_config_line(buf, sizeof(buf), fp, fs) != NULL) - { - entry = (struct popup_blocklist*)zalloc(sizeof(struct popup_blocklist)); - if (!entry) - { - fclose( fp ); - goto load_popupfile_error; - } - - /* Handle allowed hosts. */ - if ( *buf == '~' ) - { - /* Rememeber: skip the tilde */ - entry->host_name = strdup( buf + 1 ); - if (!entry->host_name) - { - fclose( fp ); - goto load_popupfile_error; - } - - entry->next = data->allowed; - data->allowed = entry; - } - else - { - /* Blocked host */ - entry->host_name = strdup( buf ); - if (!entry->host_name) - { - fclose( fp ); - goto load_popupfile_error; - } - - entry->next = data->blocked; - data->blocked = entry; - } - } - - 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_popupfile ) - { - current_popupfile->unloader = unload_popupfile; - } - - fs->next = files->next; - files->next = fs; - current_popupfile = fs; - - if (csp) - { - csp->plist = fs; - } - - return( 0 ); - -load_popupfile_error: - log_error(LOG_LEVEL_ERROR, "can't load popupfile '%s': %E", popupfile); - return(-1); - -} -#endif /* def KILLPOPUPS */ - - - /********************************************************************* * * Function : add_loader @@ -2180,19 +1362,21 @@ load_popupfile_error: * Parameters : * 1 : loader = pointer to a function that can parse and load * the appropriate config file. + * 2 : config = The configuration_spec to add the loader to. * * 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++) { - if (loaders[i] == NULL) + if (config->loaders[i] == NULL) { - loaders[i] = loader; + config->loaders[i] = loader; break; } } @@ -2211,6 +1395,8 @@ void add_loader(int (*loader)(struct client_state *)) * * Parameters : * 1 : csp = Current client state (buffers, headers, etc...) + * Must be non-null. Reads: "csp->config" + * Writes: various data members. * * Returns : 0 => Ok, everything else is an error. * @@ -2222,34 +1408,17 @@ int run_loader(struct client_state *csp) for (i=0; i < NLOADERS; i++) { - if (loaders[i] == NULL) + if (csp->config->loaders[i] == NULL) { break; } - ret |= (loaders[i])(csp); + ret |= (csp->config->loaders[i])(csp); } return(ret); } -/********************************************************************* - * - * Function : remove_all_loaders - * - * Description : Remove all loaders from the list. - * - * Parameters : N/A - * - * Returns : N/A - * - *********************************************************************/ -void remove_all_loaders(void) -{ - memset( loaders, 0, sizeof( loaders ) ); -} - - /* Local Variables: tab-width: 3