X-Git-Url: http://www.privoxy.org/gitweb/?p=privoxy.git;a=blobdiff_plain;f=loaders.c;h=ae8faaa6fa9f14ef96b6c78fb8184483eab80fbd;hp=c0b6a2424a3f8974c05d1d2c3fe79284f6599f4c;hb=30383f8818d04c81822fc30a648fa8f3d0a0e560;hpb=774d0d30fba47b7bc37aa0e401df20ca099b04d2 diff --git a/loaders.c b/loaders.c index c0b6a242..ae8faaa6 100644 --- a/loaders.c +++ b/loaders.c @@ -1,4 +1,4 @@ -const char loaders_rcs[] = "$Id: loaders.c,v 1.8 2001/05/26 00:55:20 jongfoster Exp $"; +const char loaders_rcs[] = "$Id: loaders.c,v 1.12 2001/05/31 17:32:31 oes Exp $"; /********************************************************************* * * File : $Source: /cvsroot/ijbswa/current/loaders.c,v $ @@ -35,6 +35,41 @@ const char loaders_rcs[] = "$Id: loaders.c,v 1.8 2001/05/26 00:55:20 jongfoster * * Revisions : * $Log: loaders.c,v $ + * 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() * @@ -98,6 +133,7 @@ const char loaders_rcs[] = "$Id: loaders.c,v 1.8 2001/05/26 00:55:20 jongfoster #endif #include "project.h" +#include "list.h" #include "loaders.h" #include "encode.h" #include "filters.h" @@ -107,6 +143,7 @@ const char loaders_rcs[] = "$Id: loaders.c,v 1.8 2001/05/26 00:55:20 jongfoster #include "miscutil.h" #include "errlog.h" #include "gateway.h" +#include "actions.h" #ifndef SPLIT_PROXY_ARGS /* For strsav */ @@ -129,18 +166,12 @@ const char loaders_h_rcs[] = LOADERS_H_VERSION; * 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 static struct file_list *current_trustfile = NULL; #endif /* def TRUST_FILES */ @@ -150,9 +181,6 @@ static struct file_list *current_re_filterfile = NULL; #endif /* def PCRS */ -static int create_url_spec(struct url_spec * url, char * buf); - - /********************************************************************* * * Function : sweep @@ -201,14 +229,9 @@ void sweep(void) */ ncsp->config->config_file_list->active = 1; - if (ncsp->blist) /* block files */ - { - ncsp->blist->active = 1; - } - - if (ncsp->permissions_list) /* permissions files */ + if (ncsp->actions_list) /* actions files */ { - ncsp->permissions_list->active = 1; + ncsp->actions_list->active = 1; } if (ncsp->flist) /* forward files */ @@ -223,13 +246,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 PCRS if (ncsp->rlist) /* perl re files */ { @@ -251,9 +267,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); @@ -261,6 +278,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) @@ -314,7 +333,7 @@ void sweep(void) * Returns : 0 => Ok, everything else is an error. * *********************************************************************/ -static int create_url_spec(struct url_spec * url, char * buf) +int create_url_spec(struct url_spec * url, char * buf) { char *p; struct url_spec tmp_url[1]; @@ -408,6 +427,7 @@ static int create_url_spec(struct url_spec * url, char * buf) url->dbuf = tmp_url->dbuf; url->dcnt = tmp_url->dcnt; url->dvec = tmp_url->dvec; + url->unanchored = tmp_url->unanchored; return 0; /* OK */ } @@ -415,7 +435,7 @@ static int create_url_spec(struct url_spec * url, char * buf) /********************************************************************* * - * Function : unload_url + * Function : free_url * * Description : Called from the "unloaders". Freez the url * structure elements. @@ -426,7 +446,7 @@ static int create_url_spec(struct url_spec * url, char * buf) * Returns : N/A * *********************************************************************/ -static void unload_url(struct url_spec *url) +void free_url(struct url_spec *url) { if (url == NULL) return; @@ -471,87 +491,6 @@ static void unload_aclfile(void *f) } #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 /********************************************************************* @@ -573,7 +512,7 @@ static void unload_trustfile(void *f) unload_trustfile(b->next); - unload_url(b->url); + free_url(b->url); freez(b); @@ -600,7 +539,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); @@ -803,61 +742,26 @@ char *read_config_line(char *buf, int buflen, FILE *fp, struct file_list *fs) } } - /* Trim leading whitespace */ - p = linebuf; - while (*p && ijb_isspace(*p)) - { - p++; - } + /* Remove leading and trailing whitespace */ + chomp(linebuf); - if (*p) + if (*linebuf) { - /* There is something other than whitespace on the line. */ - - /* Move the data to the start of buf */ - if (p != linebuf) + strncat(buf, linebuf, buflen - strlen(buf)); + if (contflag) { - /* strcpy that can cope with overlap. */ - q = linebuf; - while ((*q++ = *p++) != '\0') - { - /* Do nothing */ - } + contflag = 0; + continue; } - - /* 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) + else { - strncat(buf, linebuf, buflen - strlen(buf)); - if (contflag) - { - contflag = 0; - continue; - } - else - { - return buf; - } + return buf; } } } - /* EOF */ return NULL; + } @@ -999,448 +903,6 @@ load_aclfile_error: #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_FATAL, "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 */ - - /* 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_FATAL, "can't load imagefile '%s': %E", csp->config->imagefile); - return(-1); - -} -#endif /* def USE_IMAGE_LIST */ - - -/********************************************************************* - * - * Function : load_permissions_file - * - * Description : Read and parse a permissions file and add to files - * list. - * - * Parameters : - * 1 : csp = Current client state (buffers, headers, etc...) - * - * Returns : 0 => Ok, everything else is an error. - * - *********************************************************************/ -int load_permissions_file(struct client_state *csp) -{ - 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) - { - csp->permissions_list = fs; - } - - return(0); - -load_permissions_error: - log_error(LOG_LEVEL_FATAL, "can't load permissions file '%s': %E", - csp->config->permissions_file); - return(-1); - -} - - #ifdef TRUST_FILES /********************************************************************* * @@ -1603,9 +1065,10 @@ int load_forwardfile(struct client_state *csp) FILE *fp; struct forward_spec *b, *bl; - char buf[BUFSIZ], *p, *q, *tmp; - char *vec[4]; - int n, reject; + char buf[BUFSIZ]; + char *p, *tmp; + char *vec[4]; + int n; struct file_list *fs; const struct gateway *gw; @@ -1653,19 +1116,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') { @@ -1684,14 +1134,12 @@ int load_forwardfile(struct client_state *csp) 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_forwardfile_error; - } + /* Save the URL pattern */ + if (create_url_spec(b->url, buf)) + { + fclose(fp); + goto load_forwardfile_error; + } /* now parse the gateway specs */