X-Git-Url: http://www.privoxy.org/gitweb/?p=privoxy.git;a=blobdiff_plain;f=loaders.c;h=85c8d29694a3be611b976eadb038fb92d133f5ac;hp=71ff3fa0ce4127c4b57f5998d60915c1073a4f82;hb=5f1bd5c145ac9cf6e01821b315802639d668a1d5;hpb=c75584ebcc79f939fb4ec9c8f842cef6692640c7 diff --git a/loaders.c b/loaders.c index 71ff3fa0..85c8d296 100644 --- a/loaders.c +++ b/loaders.c @@ -1,21 +1,21 @@ -const char loaders_rcs[] = "$Id: loaders.c,v 1.1 2001/05/13 21:57:06 administrator Exp $"; +const char loaders_rcs[] = "$Id: loaders.c,v 1.73 2009/05/16 13:27:20 fabiankeil Exp $"; /********************************************************************* * - * File : $Source: /home/administrator/cvs/ijb/loaders.c,v $ + * 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-2009 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,11 +33,8 @@ const char loaders_rcs[] = "$Id: loaders.c,v 1.1 2001/05/13 21:57:06 administrat * or write to the Free Software Foundation, Inc., 59 * Temple Place - Suite 330, Boston, MA 02111-1307, USA. * - * Revisions : - * $Log: loaders.c,v $ - * *********************************************************************/ - + #include "config.h" @@ -45,74 +42,49 @@ const char loaders_rcs[] = "$Id: loaders.c,v 1.1 2001/05/13 21:57:06 administrat #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)) - - -#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 FEATURE_TRUST +static struct file_list *current_trustfile = NULL; +#endif /* def FEATURE_TRUST */ -#ifdef KILLPOPUPS -static struct file_list * current_popupfile = NULL; -#endif /* def KILLPOPUPS */ +static int load_one_re_filterfile(struct client_state *csp, int fileid); -#ifdef TRUST_FILES -static struct file_list *current_trustfile = NULL; -#endif /* def TRUST_FILES */ +static struct file_list *current_re_filterfile[MAX_AF_FILES] = { + NULL, NULL, NULL, NULL, NULL, + NULL, NULL, NULL, NULL, NULL +}; -#ifdef PCRS -static struct file_list *current_re_filterfile = NULL; -#endif /* def PCRS */ +/* + * Pseudo filter type for load_one_re_filterfile + */ +#define NO_NEW_FILTER -1 /********************************************************************* @@ -136,13 +108,15 @@ static struct file_list *current_re_filterfile = NULL; * * 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, *last_active; + int i; + unsigned int active_threads = 0; /* clear all of the file's active flags */ for ( fl = files->next; NULL != fl; fl = fl->next ) @@ -150,382 +124,122 @@ void sweep(void) fl->active = 0; } - for (csp = clients; csp && (ncsp = csp->next) ; csp = csp->next) + last_active = clients; + csp = clients->next; + + while (NULL != csp) { - if (ncsp->active) + if (csp->flags & CSP_FLAG_ACTIVE) { - /* mark this client's files as active */ + /* 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.) + */ + csp->config->config_file_list->active = 1; - if (ncsp->clist) /* cookie files */ + /* + * Actions files + */ + for (i = 0; i < MAX_AF_FILES; i++) { - ncsp->clist->active = 1; + if (csp->actions_list[i]) + { + csp->actions_list[i]->active = 1; + } } - /* FIXME: These were left out of the "10" release. Should they be here? */ - if (ncsp->flist) /* forward files */ + /* + * Filter files + */ + for (i = 0; i < MAX_AF_FILES; i++) { - ncsp->flist->active = 1; + if (csp->rlist[i]) + { + csp->rlist[i]->active = 1; + } } -#ifdef ACL_FILES - if (ncsp->alist) /* acl files */ + /* + * Trust file + */ +#ifdef FEATURE_TRUST + if (csp->tlist) { - ncsp->alist->active = 1; + csp->tlist->active = 1; } -#endif /* def ACL_FILES */ +#endif /* def FEATURE_TRUST */ -#ifdef USE_IMAGE_LIST - if (ncsp->ilist) /* image files */ - { - ncsp->ilist->active = 1; - } -#endif /* def USE_IMAGE_LIST */ + active_threads++; -#ifdef KILLPOPUPS - if (ncsp->plist) /* killpopup files */ - { - ncsp->plist->active = 1; - } -#endif /* def KILLPOPUPS */ + last_active = csp; + csp = csp->next; + } + else + /* + * This client is not active. Free its resources. + */ + { + last_active->next = csp->next; -#ifdef PCRS - if (ncsp->rlist) /* perl re files */ - { - ncsp->rlist->active = 1; - } -#endif /* def PCRS */ + freez(csp->ip_addr_str); + freez(csp->iob->buf); + freez(csp->error_message); -#ifdef TRUST_FILES - if (ncsp->tlist) /* trust files */ + if (csp->action->flags & ACTION_FORWARD_OVERRIDE && + NULL != csp->fwd) { - ncsp->tlist->active = 1; + unload_forward_spec(csp->fwd); } -#endif /* def TRUST_FILES */ - - } - else - { - /* this client one is not active, release its resources */ - csp->next = ncsp->next; - - freez(ncsp->ip_addr_str); - freez(ncsp->referrer); - freez(ncsp->x_forwarded); - freez(ncsp->ip_addr_str); - freez(ncsp->iob->buf); + 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(csp); + + csp = 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->unloader)(nfl->f); + nfl->next = fl->next; -#ifndef SPLIT_PROXY_ARGS - freez(nfl->proxy_args); -#endif /* ndef SPLIT_PROXY_ARGS */ + (fl->unloader)(fl->f); - freez(nfl->filename); + freez(fl->filename); + freez(fl); - freez(nfl); + fl = nfl->next; + } + else + { + nfl = fl; + fl = fl->next; } } -} - - -/********************************************************************* - * - * Function : unload_url - * - * Description : Called from the "unloaders". Freez the url - * structure elements. - * - * Parameters : - * 1 : url = pointer to a url_spec structure. - * - * Returns : N/A - * - *********************************************************************/ -static void unload_url(struct url_spec *url) -{ - if (url == NULL) return; - - 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 - -} - - -#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; - - 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_cookiefile - * - * Description : Unloads a cookiefile. - * - * Parameters : - * 1 : f = the data structure associated with the cookiefile. - * - * Returns : N/A - * - *********************************************************************/ -static void unload_cookiefile(void *f) -{ - struct cookie_spec *b = (struct cookie_spec *)f; - if (b == NULL) return; - - unload_cookiefile(b->next); - - unload_url(b->url); - - freez(b); - -} - - -#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 */ - - -#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; + return active_threads; } -#endif /* def KILLPOPUPS */ /********************************************************************* @@ -534,12 +248,12 @@ static void unload_popupfile(void * b) * * 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 + * 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. + * 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. @@ -547,19 +261,16 @@ static void unload_popupfile(void * b) * 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 - * SPLIT_PROXY_ARGS and !suppress_blocklists). + * fields filled, and all others zeroed. * * 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 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]; @@ -580,13 +291,13 @@ static int check_file_changed(const struct file_list * current, } 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; @@ -596,23 +307,6 @@ static int check_file_changed(const struct file_list * current, 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;
 }
@@ -620,1060 +314,525 @@ static int check_file_changed(const struct file_list * current,
 
 /*********************************************************************
  *
- * Function    :  read_config_line
+ * Function    :  simple_read_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.
+ * 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  :  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.
+ * 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.
  *
  *********************************************************************/
-char *read_config_line(char *buf, int buflen, FILE *fp, struct file_list *fs)
+jb_err simple_read_line(FILE *fp, char **dest, int *newline)
 {
-   char *p, *q;
-   char linebuf[BUFSIZ];
+   size_t len = 0;
+   size_t buflen = BUFFER_SIZE;
+   char * buf;
+   char * p;
+   int ch;
+   int realnewline = NEWLINE_UNKNOWN;
+
+   if (NULL == (buf = malloc(buflen)))
+   {
+      return JB_ERR_MEMORY;
+   }
+
+   p = buf;
+
+/*
+ * Character codes.  If you have a wierd 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 */
 
-   while (fgets(linebuf, sizeof(linebuf), fp))
+   for (;;)
    {
-#ifndef SPLIT_PROXY_ARGS
-      if (fs && !suppress_blocklists)
+      ch = getc(fp);
+      if (ch == EOF)
       {
-         char *html_line = html_encode(linebuf);
-         if (html_line != NULL)
+         if (len > 0)
          {
-            fs->proxy_args = strsav(fs->proxy_args, html_line);
-            freez(html_line);
+            *p = '\0';
+            *dest = buf;
+            return JB_ERR_OK;
+         }
+         else
+         {
+            free(buf);
+            *dest = NULL;
+            return JB_ERR_FILE;
          }
-         fs->proxy_args = strsav(fs->proxy_args, "
");
-      }
-#endif /* ndef SPLIT_PROXY_ARGS */
-
-      /* Trim off newline and any comment */
-      if ((p = strpbrk(linebuf, "\r\n#")) != NULL)
-      {
-         *p = '\0';
-      }
-      
-      /* Trim leading whitespace */
-      p = linebuf;
-      while (*p && ijb_isspace(*p))
-      {
-         *p++;
       }
-
-      if (*p)
+      else if (ch == CHAR_CR)
       {
-         /* There is something other than whitespace on the line. */
-
-         /* Move the data to the start of buf */
-         if (p != linebuf)
+         ch = getc(fp);
+         if (ch == CHAR_LF)
          {
-            /* strcpy that can cope with overlap. */
-            q = linebuf;
-            while ((*q++ = *p++) != '\0')
+            if (*newline == NEWLINE_UNKNOWN)
             {
-               /* Do nothing */
+               *newline = NEWLINE_DOS;
             }
          }
-
-         /* 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
          {
-            p--;
-         }
-         p[1] = '\0';
-
-         /* More paranoia.  This if statement is always true. */
-         if (*linebuf)
-         {
-            strcpy(buf, linebuf);
-            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, 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(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", 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 port, reject; - struct file_list *fs; - struct url_spec url[1]; - - if (!check_file_changed(current_blockfile, 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(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) -#ifdef REGEX - || ((b->url->preg = zalloc(sizeof(*b->url->preg))) == NULL) -#endif - ) - { - fclose(fp); - goto load_blockfile_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) - { - port = 0; - } - else - { - *p++ = '\0'; - port = atoi(p); - } - - b->url->port = port; - - if ((b->url->domain = strdup(buf)) == NULL) - { - fclose(fp); - goto load_blockfile_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_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", 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 port, reject; - struct file_list *fs; - struct url_spec url[1]; - - if (!check_file_changed(current_imagefile, 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(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); + if (ch != EOF) + { + ungetc(ch, fp); + } + if (*newline == NEWLINE_UNKNOWN) + { + *newline = NEWLINE_MAC; + } + } *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) + *dest = buf; + if (*newline == NEWLINE_UNKNOWN) { - 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; + *newline = realnewline; } + return JB_ERR_OK; } - else - { - freez(b->url->preg); - } -#endif - if ((p = strchr(buf, ':')) == NULL) + else if (ch == CHAR_LF) { - port = 0; + *p = '\0'; + *dest = buf; + if (*newline == NEWLINE_UNKNOWN) + { + *newline = NEWLINE_UNIX; + } + return JB_ERR_OK; } - else + else if (ch == 0) { - *p++ = '\0'; - port = atoi(p); + *p = '\0'; + *dest = buf; + return JB_ERR_OK; } - b->url->port = port; + *p++ = (char)ch; - if ((b->url->domain = strdup(buf)) == NULL) + if (++len >= buflen) { - fclose(fp); - goto load_cookie_error; + buflen += BUFFER_SIZE; + if (NULL == (p = realloc(buf, buflen))) + { + free(buf); + return JB_ERR_MEMORY; + } + buf = p; + p = buf + len; } - - /* 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 + * Function : edit_read_line * - * Description : Read and parse a trustfile and add to files list. + * 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 : csp = Current client state (buffers, headers, etc...) - * - * Returns : 0 => Ok, everything else is an error. + * 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. * *********************************************************************/ -int load_trustfile(struct client_state *csp) +jb_err edit_read_line(FILE *fp, + char **raw_out, + char **prefix_out, + char **data_out, + int *newline, + unsigned long *line_number) { - FILE *fp; + 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; - struct block_spec *b, *bl; - struct url_spec **tl; + assert(fp); + assert(raw_out || data_out); + assert(newline == NULL + || *newline == NEWLINE_UNKNOWN + || *newline == NEWLINE_UNIX + || *newline == NEWLINE_DOS + || *newline == NEWLINE_MAC); - char buf[BUFSIZ], *p, *q; - int port, reject, trusted; - struct file_list *fs; - struct url_spec url[1]; + if (newline == NULL) + { + scrapnewline = NEWLINE_UNKNOWN; + newline = &scrapnewline; + } - if (!check_file_changed(current_trustfile, trustfile, &fs)) + /* Set output parameters to NULL */ + if (raw_out) { - /* No need to load */ - if (csp) - { - csp->tlist = current_trustfile; - } - return(0); + *raw_out = NULL; } - if (!fs) + if (prefix_out) { - goto load_trustfile_error; + *prefix_out = NULL; } - - fs->f = bl = (struct block_spec *)zalloc(sizeof(*bl)); - if (bl == NULL) + if (data_out) { - goto load_trustfile_error; + *data_out = NULL; } - if ((fp = fopen(trustfile, "r")) == NULL) + /* Set string variables to new, empty strings. */ + + if (raw_out) { - goto load_trustfile_error; + raw = strdup(""); + if (NULL == raw) + { + return JB_ERR_MEMORY; + } + } + if (prefix_out) + { + prefix = strdup(""); + if (NULL == prefix) + { + freez(raw); + return JB_ERR_MEMORY; + } + } + if (data_out) + { + data = strdup(""); + if (NULL == data) + { + freez(raw); + freez(prefix); + return JB_ERR_MEMORY; + } } - tl = trust_list; + /* Main loop. Loop while we need more data & it's not EOF. */ - while (read_config_line(buf, sizeof(buf), fp, fs) != NULL) + while ( (contflag || is_empty) + && (JB_ERR_OK == (rval = simple_read_line(fp, &linebuf, newline)))) { - trusted = 0; - reject = 1; - - if (*buf == '+') + if (line_number) { - trusted = 1; - *buf = '~'; + (*line_number)++; } - - if (*buf == '~') + if (raw) { - reject = 0; - p = buf; - q = p+1; - while ((*p++ = *q++)) + string_append(&raw,linebuf); + if (string_append(&raw,NEWLINE(*newline))) { - /* nop */ + freez(prefix); + freez(data); + free(linebuf); + return JB_ERR_MEMORY; } } - /* skip blank lines */ - if (*buf == '\0') + /* Line continuation? Trim escape and set flag. */ + p = linebuf + strlen(linebuf) - 1; + contflag = ((*linebuf != '\0') && (*p == '\\')); + if (contflag) { - continue; + *p = '\0'; } - /* allocate a new node */ - if (((b = zalloc(sizeof(*b))) == NULL) -#ifdef REGEX - || ((b->url->preg = zalloc(sizeof(*b->url->preg))) == NULL) -#endif - ) + /* Trim leading spaces if we're at the start of the line */ + linestart = linebuf; + assert(NULL != data); + if (*data == '\0') { - fclose(fp); - goto load_trustfile_error; + /* Trim leading spaces */ + while (*linestart && isspace((int)(unsigned char)*linestart)) + { + linestart++; + } } - /* 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) + /* Handle comment characters. */ + p = linestart; + while ((p = strchr(p, '#')) != NULL) { - fclose(fp); - goto load_trustfile_error; - } + /* 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; + } + } - b->reject = reject; + /* ... and chop off the rest of the line */ + *p = '\0'; + } + } /* END while (there's a # character) */ - if ((p = strchr(buf, '/'))) + /* Write to the buffer */ + if (*linestart) { - b->url->path = strdup(p); - b->url->pathlen = strlen(b->url->path); - *p = '\0'; - } - else - { - b->url->path = NULL; - b->url->pathlen = 0; + is_empty = 0; + if (data) + { + if (string_append(&data, linestart)) + { + freez(raw); + freez(prefix); + free(linebuf); + return JB_ERR_MEMORY; + } + } } -#ifdef REGEX - if (b->url->path) - { - int errcode; - char rebuf[BUFSIZ]; - sprintf(rebuf, "^(%s)", b->url->path); + free(linebuf); + } /* END while(we need more data) */ - errcode = regcomp(b->url->preg, rebuf, - (REG_EXTENDED|REG_NOSUB|REG_ICASE)); + /* Handle simple_read_line() errors - ignore EOF */ + if ((rval != JB_ERR_OK) && (rval != JB_ERR_FILE)) + { + freez(raw); + freez(prefix); + freez(data); + return rval; + } - if (errcode) - { - size_t errlen = - regerror(errcode, - b->url->preg, buf, sizeof(buf)); + 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"). + */ - buf[errlen] = '\0'; + freez(raw); + freez(prefix); + freez(data); - log_error(LOG_LEVEL_ERROR, "error compiling %s: %s", - b->url->spec, buf); - fclose(fp); - goto load_trustfile_error; - } + return JB_ERR_FILE; + } + else + { + /* Got at least some data */ + + /* Remove trailing whitespace */ + chomp(data); + + if (raw_out) + { + *raw_out = raw; } else { - freez(b->url->preg); + freez(raw); } -#endif - if ((p = strchr(buf, ':')) == NULL) + if (prefix_out) { - port = 0; + *prefix_out = prefix; } else { - *p++ = '\0'; - port = atoi(p); + freez(prefix); } - - b->url->port = port; - - if ((b->url->domain = strdup(buf)) == NULL) + if (data_out) { - fclose(fp); - goto load_trustfile_error; + *data_out = data; } - - /* 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) + else { - *tl++ = b->url; + freez(data); } + return JB_ERR_OK; } +} - *tl = NULL; - - fclose(fp); -#ifndef SPLIT_PROXY_ARGS - if (!suppress_blocklists) +/********************************************************************* + * + * 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. + * + * Parameters : + * 1 : buf = Buffer to use. + * 2 : buflen = Size of buffer in bytes. + * 3 : fp = File to read from + * 4 : linenum = linenumber in file + * + * Returns : NULL on EOF or error + * Otherwise, returns buf. + * + *********************************************************************/ +char *read_config_line(char *buf, size_t buflen, FILE *fp, unsigned long *linenum) +{ + jb_err err; + char *buf2 = NULL; + err = edit_read_line(fp, NULL, NULL, &buf2, NULL, linenum); + if (err) { - fs->proxy_args = strsav(fs->proxy_args, ""); + if (err == JB_ERR_MEMORY) + { + log_error(LOG_LEVEL_FATAL, "Out of memory loading a config file"); + } + return NULL; } -#endif /* ndef SPLIT_PROXY_ARGS */ - - /* the old one is now obsolete */ - if (current_trustfile) + else { - current_trustfile->unloader = unload_trustfile; + assert(buf2); + if (strlen(buf2) + 1U > buflen) + { + log_error(LOG_LEVEL_FATAL, + "Max line limit reached. Linenumber: %u. Lenght: %u. Max lenght: %u.", + *linenum, strlen(buf2), buflen-1); + } + strlcpy(buf, buf2, buflen); + free(buf2); + return buf; } +} - fs->next = files->next; - files->next = fs; - current_trustfile = fs; - if (csp) +#ifdef FEATURE_TRUST +/********************************************************************* + * + * 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 *cur = (struct block_spec *)f; + struct block_spec *next; + + while (cur != NULL) { - csp->tlist = fs; + next = cur->next; + + free_url_spec(cur->url); + free(cur); + + cur = next; } - return(0); +} -load_trustfile_error: - log_error(LOG_LEVEL_ERROR, "can't load trustfile '%s': %E", trustfile); - return(-1); +#ifdef FEATURE_GRACEFUL_TERMINATION +/********************************************************************* + * + * Function : unload_current_trust_file + * + * Description : Unloads current trust file - reset to state at + * beginning of program. + * + * Parameters : None + * + * Returns : N/A + * + *********************************************************************/ +void unload_current_trust_file(void) +{ + if (current_trustfile) + { + current_trustfile->unloader = unload_trustfile; + current_trustfile = NULL; + } } -#endif /* def TRUST_FILES */ +#endif /* FEATURE_GRACEFUL_TERMINATION */ /********************************************************************* * - * Function : load_forwardfile + * Function : load_trustfile * - * Description : Read and parse a forwardfile 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...) @@ -1681,490 +840,515 @@ load_trustfile_error: * Returns : 0 => Ok, everything else is an error. * *********************************************************************/ -int load_forwardfile(struct client_state *csp) +int load_trustfile(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 block_spec *b, *bl; + struct url_spec **tl; + + char buf[BUFFER_SIZE], *p, *q; + int reject, trusted; struct file_list *fs; - const struct gateway *gw; - struct url_spec url[1]; + unsigned long linenum = 0; + int trusted_referrers = 0; - if (!check_file_changed(current_forwardfile, forwardfile, &fs)) + if (!check_file_changed(current_trustfile, csp->config->trustfile, &fs)) { /* No need to load */ if (csp) { - csp->flist = current_forwardfile; + csp->tlist = current_trustfile; } return(0); } if (!fs) { - goto load_forwardfile_error; + goto load_trustfile_error; } - fs->f = bl = (struct forward_spec *)zalloc(sizeof(*bl)); - - if ((fs == NULL) || (bl == NULL)) + fs->f = bl = (struct block_spec *)zalloc(sizeof(*bl)); + if (bl == NULL) { - goto load_forwardfile_error; + goto load_trustfile_error; } - if ((fp = fopen(forwardfile, "r")) == NULL) + if ((fp = fopen(csp->config->trustfile, "r")) == NULL) { - goto load_forwardfile_error; + goto load_trustfile_error; } - tmp = NULL; + tl = csp->config->trust_list; - while (read_config_line(buf, sizeof(buf), fp, fs) != NULL) + while (read_config_line(buf, sizeof(buf), fp, &linenum) != NULL) { - freez(tmp); - - tmp = strdup(buf); - - n = ssplit(tmp, " \t", vec, SZ(vec), 1, 1); + trusted = 0; + reject = 1; - if (n != 4) + if (*buf == '+') { - log_error(LOG_LEVEL_ERROR, "error in forwardfile: %s", buf); - continue; + trusted = 1; + *buf = '~'; } - strcpy(buf, vec[0]); - - reject = 1; - if (*buf == '~') { reject = 0; p = buf; q = p+1; - while ((*p++ = *q++)) + while ((*p++ = *q++) != '\0') { /* nop */ } } - /* 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_forwardfile_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_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]; - - for (gw = gateways; gw->name; gw++) - { - if (strcmp(gw->name, p) == 0) - { - break; - } - } - - if (gw->name == NULL) - { - goto load_forwardfile_error; + goto load_trustfile_error; } - /* save this as the gateway type */ - *b->gw = *gw; - - /* now parse the gateway host[:port] spec */ - p = vec[3]; - - if (strcmp(p, ".") != 0) + /* + * save a pointer to URL's spec in the list of trusted URL's, too + */ + if (trusted) { - b->gw->gateway_host = strdup(p); - - if ((p = strchr(b->gw->gateway_host, ':'))) - { - *p++ = '\0'; - b->gw->gateway_port = atoi(p); - } - - if (b->gw->gateway_port <= 0) + if(++trusted_referrers < MAX_TRUSTED_REFERRERS) { - goto load_forwardfile_error; + *tl++ = b->url; } } + } - /* now parse the forwarding spec */ - p = vec[1]; - - if (strcmp(p, ".") != 0) - { - b->gw->forward_host = strdup(p); - - if ((p = strchr(b->gw->forward_host, ':'))) - { - *p++ = '\0'; - b->gw->forward_port = atoi(p); - } - - if (b->gw->forward_port <= 0) - { - b->gw->forward_port = 8000; - } - } + 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); } - freez(tmp); + *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_forwardfile) + if (current_trustfile) { - current_forwardfile->unloader = unload_forwardfile; + current_trustfile->unloader = unload_trustfile; } fs->next = files->next; files->next = fs; - current_forwardfile = fs; + current_trustfile = fs; if (csp) { - csp->flist = fs; + csp->tlist = fs; } return(0); -load_forwardfile_error: - log_error(LOG_LEVEL_ERROR, "can't load forwardfile '%s': %E", forwardfile); +load_trustfile_error: + log_error(LOG_LEVEL_FATAL, "can't load trustfile '%s': %E", + csp->config->trustfile); return(-1); } +#endif /* def FEATURE_TRUST */ -#ifdef PCRS /********************************************************************* * - * Function : load_re_filterfile + * Function : unload_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. + * Description : Unload the re_filter list by freeing all chained + * re_filterfile specs and their data. * * Parameters : - * 1 : csp = Current client state (buffers, headers, etc...) + * 1 : f = the data structure associated with the filterfile. * - * Returns : 0 => Ok, everything else is an error. + * Returns : N/A * *********************************************************************/ -int load_re_filterfile(struct client_state *csp) +static void unload_re_filterfile(void *f) { - FILE *fp; + struct re_filterfile_spec *a, *b = (struct re_filterfile_spec *)f; - struct re_filterfile_spec *bl; - struct file_list *fs; + while (b != NULL) + { + a = b->next; - char buf[BUFSIZ]; - int error; - pcrs_job *dummy; + destroy_list(b->patterns); + pcrs_free_joblist(b->joblist); + freez(b->name); + freez(b->description); + freez(b); -#ifndef SPLIT_PROXY_ARGS - char *p; -#endif /* ndef SPLIT_PROXY_ARGS */ - if (!check_file_changed(current_re_filterfile, re_filterfile, &fs)) - { - /* No need to load */ - if (csp) - { - csp->rlist = current_re_filterfile; - } - return(0); - } - if (!fs) - { - goto load_re_filterfile_error; + b = a; } - fs->f = bl = (struct re_filterfile_spec *)zalloc(sizeof(*bl)); - if (bl == NULL) - { - goto load_re_filterfile_error; - } + return; +} - /* Open the file or fail */ - if ((fp = fopen(re_filterfile, "r")) == NULL) - { - goto load_re_filterfile_error; - } +/********************************************************************* + * + * 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_url_spec(fwd->url); + freez(fwd->gateway_host); + freez(fwd->forward_host); + free(fwd); - /* Read line by line */ - while (read_config_line(buf, sizeof(buf), fp, fs) != NULL) - { - enlist( bl->patterns, buf ); + return; +} - /* We have a meaningful line -> make it a job */ - if ((dummy = pcrs_make_job(buf, &error)) == NULL) - { - log_error(LOG_LEVEL_REF, - "Adding re_filter job %s failed with error %d.", buf, error); - continue; - } - else - { - dummy->next = bl->joblist; - bl->joblist = dummy; - log_error(LOG_LEVEL_REF, "Adding re_filter job %s succeeded.", buf); - } - } - fclose(fp); +#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; -#ifndef SPLIT_PROXY_ARGS - if (!suppress_blocklists) + for (i = 0; i < MAX_AF_FILES; i++) { - fs->proxy_args = strsav(fs->proxy_args, ""); + if (current_re_filterfile[i]) + { + current_re_filterfile[i]->unloader = unload_re_filterfile; + current_re_filterfile[i] = NULL; + } } -#endif /* ndef SPLIT_PROXY_ARGS */ +} +#endif - /* the old one is now obsolete */ - if ( NULL != current_re_filterfile ) - { - current_re_filterfile->unloader = unload_re_filterfile; - } - fs->next = files->next; - files->next = fs; - current_re_filterfile = fs; +/********************************************************************* + * + * 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; - if (csp) + for (i = 0; i < MAX_AF_FILES; i++) { - csp->rlist = fs; + 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 ); - -load_re_filterfile_error: - log_error(LOG_LEVEL_ERROR, "can't load re_filterfile '%s': %E", re_filterfile); - return(-1); - + return 0; } -#endif /* def PCRS */ -#ifdef KILLPOPUPS /********************************************************************* * - * Function : load_popupfile + * Function : load_one_re_filterfile * - * Description : Load, and parse the popup blocklist. + * 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...) * - * Returns : 0 => success, else there was an error. + * Returns : 0 => Ok, everything else is an error. * *********************************************************************/ -int load_popupfile(struct client_state *csp) +int load_one_re_filterfile(struct client_state *csp, int fileid) { FILE *fp; - char buf[BUFSIZ], *p, *q; - struct popup_blocklist *entry = NULL; - struct popup_settings * data; + + struct re_filterfile_spec *new_bl, *bl = NULL; struct file_list *fs; - p = buf; - q = buf; - if (!check_file_changed(current_popupfile, popupfile, &fs)) + char buf[BUFFER_SIZE]; + 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->plist = current_popupfile; + csp->rlist[fileid] = current_re_filterfile[fileid]; } return(0); } if (!fs) { - goto load_popupfile_error; + goto load_re_filterfile_error; } - fs->f = data = (struct popup_settings *)zalloc(sizeof(*data)); - if (data == NULL) + /* + * Open the file or fail + */ + if ((fp = fopen(csp->config->re_filterfile[fileid], "r")) == NULL) { - goto load_popupfile_error; + goto load_re_filterfile_error; } - if ((fp = fopen(popupfile, "r")) == NULL) + /* + * Read line by line + */ + while (read_config_line(buf, sizeof(buf), fp, &linenum) != NULL) { - goto load_popupfile_error; - } + int new_filter = NO_NEW_FILTER; - while (read_config_line(buf, sizeof(buf), fp, fs) != NULL) - { - entry = (struct popup_blocklist*)zalloc(sizeof(struct popup_blocklist)); - if (!entry) + if (strncmp(buf, "FILTER:", 7) == 0) + { + new_filter = FT_CONTENT_FILTER; + } + else if (strncmp(buf, "SERVER-HEADER-FILTER:", 21) == 0) + { + new_filter = FT_SERVER_HEADER_FILTER; + } + else if (strncmp(buf, "CLIENT-HEADER-FILTER:", 21) == 0) + { + new_filter = FT_CLIENT_HEADER_FILTER; + } + else if (strncmp(buf, "CLIENT-HEADER-TAGGER:", 21) == 0) + { + new_filter = FT_CLIENT_HEADER_TAGGER; + } + else if (strncmp(buf, "SERVER-HEADER-TAGGER:", 21) == 0) { - fclose( fp ); - goto load_popupfile_error; + new_filter = FT_SERVER_HEADER_TAGGER; } - /* Handle allowed hosts. */ - if ( *buf == '~' ) + /* + * 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 != NO_NEW_FILTER) { - /* Rememeber: skip the tilde */ - entry->host_name = strdup( buf + 1 ); - if (!entry->host_name) + new_bl = (struct re_filterfile_spec *)zalloc(sizeof(*bl)); + if (new_bl == NULL) + { + goto load_re_filterfile_error; + } + if (new_filter == FT_CONTENT_FILTER) + { + new_bl->name = chomp(buf + 7); + } + else + { + new_bl->name = chomp(buf + 21); + } + new_bl->type = new_filter; + + /* + * 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("Out of memory while encoding this filter's description to HTML"); + } + } + else + { + new_bl->description = strdup("No description available for this filter"); + } + + new_bl->name = strdup(chomp(new_bl->name)); + + /* + * If this is the first filter block, chain it + * to the file_list rather than its (nonexistant) + * predecessor + */ + if (fs->f == NULL) { - fclose( fp ); - goto load_popupfile_error; + fs->f = new_bl; } + else + { + assert(NULL != bl); + bl->next = new_bl; + } + bl = new_bl; - entry->next = data->allowed; - data->allowed = entry; + log_error(LOG_LEVEL_RE_FILTER, "Reading in filter \"%s\" (\"%s\")", bl->name, bl->description); + + continue; } - else + + /* + * Else, save the expression, make it a pcrs_job + * and chain it into the current filter's joblist + */ + if (bl != NULL) { - /* Blocked host */ - entry->host_name = strdup( buf ); - if (!entry->host_name) + error = enlist(bl->patterns, buf); + if (JB_ERR_MEMORY == error) + { + 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 (pcrs_job_is_dynamic(buf)) + { + /* + * 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); + continue; + } + else if (bl->dynamic) { - fclose( fp ); - goto load_popupfile_error; + /* + * 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); + continue; } - entry->next = data->blocked; - data->blocked = entry; + if ((dummy = pcrs_compile_command(buf, &error)) == NULL) + { + log_error(LOG_LEVEL_ERROR, + "Adding re_filter job \'%s\' to filter %s failed with error %d.", buf, bl->name, error); + 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 + { + log_error(LOG_LEVEL_ERROR, "Ignoring job %s outside filter block in %s, line %d", + buf, csp->config->re_filterfile[fileid], linenum); } } - fclose( fp ); - -#ifndef SPLIT_PROXY_ARGS - if (!suppress_blocklists) - { - fs->proxy_args = strsav(fs->proxy_args, ""); - } -#endif /* ndef SPLIT_PROXY_ARGS */ + fclose(fp); - /* the old one is now obsolete */ - if ( NULL != current_popupfile ) + /* + * Schedule the now-obsolete old data for unloading + */ + if ( NULL != current_re_filterfile[fileid] ) { - current_popupfile->unloader = unload_popupfile; + 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_popupfile = fs; + current_re_filterfile[fileid] = fs; if (csp) { - csp->plist = fs; + csp->rlist[fileid] = fs; } return( 0 ); -load_popupfile_error: - log_error(LOG_LEVEL_ERROR, "can't load popupfile '%s': %E", popupfile); +load_re_filterfile_error: + log_error(LOG_LEVEL_FATAL, "can't load re_filterfile '%s': %E", + csp->config->re_filterfile[fileid]); return(-1); } -#endif /* def KILLPOPUPS */ - /********************************************************************* @@ -2177,19 +1361,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; } } @@ -2208,6 +1394,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. * @@ -2219,34 +1407,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