-const char loaders_rcs[] = "$Id: loaders.c,v 1.12 2001/05/31 17:32:31 oes Exp $";
+const char loaders_rcs[] = "$Id: loaders.c,v 1.24 2001/07/30 22:08:36 jongfoster Exp $";
/*********************************************************************
*
* File : $Source: /cvsroot/ijbswa/current/loaders.c,v $
*
* Revisions :
* $Log: loaders.c,v $
+ * Revision 1.24 2001/07/30 22:08:36 jongfoster
+ * Tidying up #defines:
+ * - All feature #defines are now of the form FEATURE_xxx
+ * - Permanently turned off WIN_GUI_EDIT
+ * - Permanently turned on WEBDAV and SPLIT_PROXY_ARGS
+ *
+ * Revision 1.23 2001/07/20 15:51:54 oes
+ * Fixed indentation of prepocessor commands
+ *
+ * Revision 1.22 2001/07/20 15:16:17 haroon
+ * - per Guy's suggestion, added a while loop in sweep() to catch not just
+ * the last inactive CSP but all other consecutive inactive CSPs after that
+ * as well
+ *
+ * Revision 1.21 2001/07/18 17:26:24 oes
+ * Changed to conform to new pcrs interface
+ *
+ * Revision 1.20 2001/07/17 13:07:01 oes
+ * Fixed segv when last line in config files
+ * lacked a terminating (\r)\n
+ *
+ * Revision 1.19 2001/07/13 14:01:54 oes
+ * Removed all #ifdef PCRS
+ *
+ * Revision 1.18 2001/06/29 21:45:41 oes
+ * Indentation, CRLF->LF, Tab-> Space
+ *
+ * Revision 1.17 2001/06/29 13:31:51 oes
+ * Various adaptions
+ *
+ * Revision 1.16 2001/06/09 10:55:28 jongfoster
+ * Changing BUFSIZ ==> BUFFER_SIZE
+ *
+ * Revision 1.15 2001/06/07 23:14:14 jongfoster
+ * Removing ACL and forward file loaders - these
+ * files have been merged into the config file.
+ * Cosmetic: Moving unloader funcs next to their
+ * respective loader funcs
+ *
+ * Revision 1.14 2001/06/01 03:27:04 oes
+ * Fixed line continuation problem
+ *
+ * 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
#include "gateway.h"
#include "actions.h"
-#ifndef SPLIT_PROXY_ARGS
-/* For strsav */
-#include "showargs.h"
-#endif /* ndef SPLIT_PROXY_ARGS */
-
const char loaders_h_rcs[] = LOADERS_H_VERSION;
/* Fix a problem with Solaris. There should be no effect on other
* Currently active files.
* These are also entered in the main linked list of files.
*/
-static struct file_list *current_forwardfile = NULL;
-
-#ifdef ACL_FILES
-static struct file_list *current_aclfile = NULL;
-#endif /* def ACL_FILES */
-#ifdef TRUST_FILES
+#ifdef FEATURE_TRUST
static struct file_list *current_trustfile = NULL;
-#endif /* def TRUST_FILES */
+#endif /* def FEATURE_TRUST */
-#ifdef PCRS
static struct file_list *current_re_filterfile = NULL;
-#endif /* def PCRS */
+
/*********************************************************************
ncsp->actions_list->active = 1;
}
- if (ncsp->flist) /* forward files */
- {
- ncsp->flist->active = 1;
- }
-
-#ifdef ACL_FILES
- if (ncsp->alist) /* acl files */
- {
- ncsp->alist->active = 1;
- }
-#endif /* def ACL_FILES */
-
-#ifdef PCRS
- if (ncsp->rlist) /* perl re files */
+ if (ncsp->rlist) /* pcrsjob files */
{
ncsp->rlist->active = 1;
}
-#endif /* def PCRS */
-#ifdef TRUST_FILES
+#ifdef FEATURE_TRUST
if (ncsp->tlist) /* trust files */
{
ncsp->tlist->active = 1;
}
-#endif /* def TRUST_FILES */
+#endif /* def FEATURE_TRUST */
}
else
+ /*
+ * this client is not active, release its resources
+ * and the ones of all inactive clients that might
+ * follow it
+ */
{
- /* this client one is not active, release its resources */
- 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->iob->buf);
-
- free_http_request(ncsp->http);
-
- destroy_list(ncsp->headers);
- destroy_list(ncsp->cookie_list);
-
- free_current_action(ncsp->action);
-
-#ifdef STATISTICS
- urls_read++;
- if (ncsp->rejected)
+ while( !ncsp->active )
{
- urls_rejected++;
+ csp->next = ncsp->next;
+
+ freez(ncsp->ip_addr_str);
+ freez(ncsp->my_ip_addr_str);
+ freez(ncsp->my_hostname);
+
+#ifdef FEATURE_TRUST
+ freez(ncsp->referrer);
+#endif /* def FEATURE_TRUST */
+ freez(ncsp->x_forwarded);
+ freez(ncsp->iob->buf);
+
+ free_http_request(ncsp->http);
+
+ destroy_list(ncsp->headers);
+ destroy_list(ncsp->cookie_list);
+
+ free_current_action(ncsp->action);
+
+#ifdef FEATURE_STATISTICS
+ urls_read++;
+ if (ncsp->rejected)
+ {
+ urls_rejected++;
+ }
+#endif /* def FEATURE_STATISTICS */
+
+ freez(ncsp);
+
+ /* are there any more in sequence after it? */
+ if( !(ncsp = csp->next) )
+ break;
}
-#endif /* def STATISTICS */
-
- freez(ncsp);
}
}
(nfl->unloader)(nfl->f);
-#ifndef SPLIT_PROXY_ARGS
- freez(nfl->proxy_args);
-#endif /* ndef SPLIT_PROXY_ARGS */
-
freez(nfl->filename);
freez(nfl);
if (url->path)
{
int errcode;
- char rebuf[BUFSIZ];
+ char rebuf[BUFFER_SIZE];
if (NULL == (url->preg = zalloc(sizeof(*url->preg))))
{
(REG_EXTENDED|REG_NOSUB|REG_ICASE));
if (errcode)
{
- size_t errlen =
- regerror(errcode,
- url->preg, buf, sizeof(buf));
+ size_t errlen = regerror(errcode,
+ url->preg, buf, sizeof(buf));
buf[errlen] = '\0';
log_error(LOG_LEVEL_ERROR, "error compiling %s: %s",
- url->spec, buf);
+ url->spec, buf);
freez(url->spec);
freez(url->path);
url->unanchored = tmp_url->unanchored;
return 0; /* OK */
+
}
}
-#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 */
-
-
-#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);
-
- free_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);
-
- free_url(b->url);
-
- freez(b->gw->gateway_host);
- freez(b->gw->forward_host);
-
- freez(b);
-
-}
-
-
-#ifdef PCRS
-/*********************************************************************
- *
- * Function : unload_re_filterfile
- *
- * Description : Unload the re_filter list.
- *
- * Parameters :
- * 1 : f = the data structure associated with the filterfile.
- *
- * Returns : N/A
- *
- *********************************************************************/
-static void unload_re_filterfile(void *f)
-{
- pcrs_job *joblist;
- struct re_filterfile_spec *b = (struct re_filterfile_spec *)f;
-
- if (b == NULL) return;
-
- destroy_list(b->patterns);
-
- joblist = b->joblist;
- while ( NULL != (joblist = pcrs_free_job(joblist)) ) {}
-
- freez(b);
-
-}
-#endif /* def PCRS */
-
-
/*********************************************************************
*
* Function : check_file_changed
* This will be set to NULL, OR a struct
* file_list newly allocated on the
* heap, with the filename and lastmodified
- * fields filled, standard header giving file
- * name in proxy_args, and all others zeroed.
- * (proxy_args is only filled in if !defined
- * SPLIT_PROXY_ARGS and !suppress_blocklists).
+ * fields filled, and all others zeroed.
*
* Returns : If file unchanged: 0 (and sets newfl == NULL)
* If file changed: 1 and sets newfl != NULL
return 1;
}
-#ifndef SPLIT_PROXY_ARGS
- if (!suppress_blocklists)
- {
- char * p = html_encode(filename);
- if (p)
- {
- fs->proxy_args = strsav(fs->proxy_args, "<h2>The file `");
- fs->proxy_args = strsav(fs->proxy_args, p);
- fs->proxy_args = strsav(fs->proxy_args,
- "' contains the following patterns</h2>\n");
- freez(p);
- }
- fs->proxy_args = strsav(fs->proxy_args, "<pre>");
- }
-#endif /* ndef SPLIT_PROXY_ARGS */
*newfl = fs;
return 1;
+
}
char *read_config_line(char *buf, int buflen, FILE *fp, struct file_list *fs)
{
char *p, *q;
- char linebuf[BUFSIZ];
+ char linebuf[BUFFER_SIZE];
int contflag = 0;
*buf = '\0';
while (fgets(linebuf, sizeof(linebuf), fp))
{
-#ifndef SPLIT_PROXY_ARGS
- if (fs && !suppress_blocklists)
- {
- char *html_line = html_encode(linebuf);
- if (html_line != NULL)
- {
- fs->proxy_args = strsav(fs->proxy_args, html_line);
- freez(html_line);
- }
- fs->proxy_args = strsav(fs->proxy_args, "<br>");
- }
-#endif /* ndef SPLIT_PROXY_ARGS */
-
/* Trim off newline */
if ((p = strpbrk(linebuf, "\r\n")) != NULL)
{
*p = '\0';
}
+ else
+ {
+ p = linebuf + strlen(linebuf);
+ }
/* Line continuation? Trim escape and set flag. */
if ((p != linebuf) && (*--p == '\\'))
*p = '\0';
}
}
-
- /* Remove leading and trailing whitespace */
- chomp(linebuf);
+ /* Write to the buffer */
if (*linebuf)
{
strncat(buf, linebuf, buflen - strlen(buf));
- if (contflag)
- {
- contflag = 0;
- continue;
- }
- else
- {
- return buf;
- }
+ }
+
+ /* Continue? */
+ if (contflag)
+ {
+ contflag = 0;
+ continue;
+ }
+
+ /* Remove leading and trailing whitespace */
+ chomp(buf);
+
+ if (*buf)
+ {
+ return buf;
}
}
+
/* EOF */
return NULL;
}
-#ifdef ACL_FILES
+#ifdef FEATURE_TRUST
/*********************************************************************
*
- * Function : load_aclfile
+ * Function : unload_trustfile
*
- * Description : Read and parse an aclfile and add to files list.
+ * Description : Unloads a trustfile.
*
* Parameters :
- * 1 : csp = Current client state (buffers, headers, etc...)
+ * 1 : f = the data structure associated with the trustfile.
*
- * Returns : 0 => Ok, everything else is an error.
+ * Returns : N/A
*
*********************************************************************/
-int load_aclfile(struct client_state *csp)
+static void unload_trustfile(void *f)
{
- FILE *fp;
- char buf[BUFSIZ], *v[3], *p;
- int i;
- struct access_control_list *a, *bl;
- struct file_list *fs;
-
- if (!check_file_changed(current_aclfile, csp->config->aclfile, &fs))
- {
- /* No need to load */
- if (csp)
- {
- csp->alist = current_aclfile;
- }
- return(0);
- }
- if (!fs)
- {
- goto load_aclfile_error;
- }
-
- fs->f = bl = (struct access_control_list *)zalloc(sizeof(*bl));
- if (bl == NULL)
- {
- freez(fs->filename);
- freez(fs);
- goto load_aclfile_error;
- }
-
- fp = fopen(csp->config->aclfile, "r");
-
- if (fp == NULL)
- {
- goto load_aclfile_error;
- }
-
- while (read_config_line(buf, sizeof(buf), fp, fs) != NULL)
- {
- i = ssplit(buf, " \t", v, SZ(v), 1, 1);
-
- /* allocate a new node */
- a = (struct access_control_list *) zalloc(sizeof(*a));
-
- if (a == NULL)
- {
- fclose(fp);
- freez(fs->f);
- freez(fs->filename);
- freez(fs);
- goto load_aclfile_error;
- }
-
- /* add it to the list */
- a->next = bl->next;
- bl->next = a;
-
- switch (i)
- {
- case 3:
- if (acl_addr(v[2], a->dst) < 0)
- {
- goto load_aclfile_error;
- }
- /* no break */
-
- case 2:
- if (acl_addr(v[1], a->src) < 0)
- {
- goto load_aclfile_error;
- }
-
- p = v[0];
- if (strcmpic(p, "permit") == 0)
- {
- a->action = ACL_PERMIT;
- break;
- }
-
- if (strcmpic(p, "deny") == 0)
- {
- a->action = ACL_DENY;
- break;
- }
- /* no break */
-
- default:
- goto load_aclfile_error;
- }
- }
-
- fclose(fp);
-
-#ifndef SPLIT_PROXY_ARGS
- if (!suppress_blocklists)
- {
- fs->proxy_args = strsav(fs->proxy_args, "</pre>");
- }
-#endif /* ndef SPLIT_PROXY_ARGS */
-
- if (current_aclfile)
- {
- current_aclfile->unloader = unload_aclfile;
- }
+ struct block_spec *b = (struct block_spec *)f;
+ if (b == NULL) return;
- fs->next = files->next;
- files->next = fs;
- current_aclfile = fs;
+ unload_trustfile(b->next); /* Stack is cheap, isn't it? */
- if (csp)
- {
- csp->alist = fs;
- }
-
- return(0);
+ free_url(b->url);
-load_aclfile_error:
- log_error(LOG_LEVEL_FATAL, "can't load access control list %s: %E",
- csp->config->aclfile);
- return(-1);
+ freez(b);
}
-#endif /* def ACL_FILES */
-#ifdef TRUST_FILES
/*********************************************************************
*
* Function : load_trustfile
struct block_spec *b, *bl;
struct url_spec **tl;
- char buf[BUFSIZ], *p, *q;
+ char buf[BUFFER_SIZE], *p, *q;
int reject, trusted;
struct file_list *fs;
fclose(fp);
-#ifndef SPLIT_PROXY_ARGS
- if (!suppress_blocklists)
- {
- fs->proxy_args = strsav(fs->proxy_args, "</pre>");
- }
-#endif /* ndef SPLIT_PROXY_ARGS */
-
/* the old one is now obsolete */
if (current_trustfile)
{
return(-1);
}
-#endif /* def TRUST_FILES */
+#endif /* def FEATURE_TRUST */
/*********************************************************************
*
- * Function : load_forwardfile
+ * Function : unload_re_filterfile
*
- * Description : Read and parse a forwardfile and add to files list.
+ * Description : Unload the re_filter list.
*
* 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_forwardfile(struct client_state *csp)
+static void unload_re_filterfile(void *f)
{
- FILE *fp;
-
- struct forward_spec *b, *bl;
- char buf[BUFSIZ];
- char *p, *tmp;
- char *vec[4];
- int n;
- struct file_list *fs;
- const struct gateway *gw;
-
- if (!check_file_changed(current_forwardfile, csp->config->forwardfile, &fs))
- {
- /* No need to load */
- if (csp)
- {
- csp->flist = current_forwardfile;
- }
- return(0);
- }
- if (!fs)
- {
- goto load_forwardfile_error;
- }
-
- fs->f = bl = (struct forward_spec *)zalloc(sizeof(*bl));
-
- if ((fs == NULL) || (bl == NULL))
- {
- goto load_forwardfile_error;
- }
-
- if ((fp = fopen(csp->config->forwardfile, "r")) == NULL)
- {
- goto load_forwardfile_error;
- }
-
- tmp = NULL;
-
- while (read_config_line(buf, sizeof(buf), fp, fs) != NULL)
- {
- freez(tmp);
-
- tmp = strdup(buf);
-
- n = ssplit(tmp, " \t", vec, SZ(vec), 1, 1);
-
- if (n != 4)
- {
- log_error(LOG_LEVEL_ERROR, "error in forwardfile: %s", buf);
- continue;
- }
-
- strcpy(buf, vec[0]);
-
- /* skip lines containing only ~ */
- if (*buf == '\0')
- {
- continue;
- }
-
- /* allocate a new node */
- if (((b = zalloc(sizeof(*b))) == NULL)
- )
- {
- fclose(fp);
- goto load_forwardfile_error;
- }
-
- /* add it to the list */
- b->next = bl->next;
- bl->next = b;
-
- /* Save the URL pattern */
- if (create_url_spec(b->url, buf))
- {
- fclose(fp);
- goto load_forwardfile_error;
- }
-
- /* 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;
- }
-
- /* save this as the gateway type */
- *b->gw = *gw;
-
- /* now parse the gateway host[:port] spec */
- p = vec[3];
-
- if (strcmp(p, ".") != 0)
- {
- 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)
- {
- goto load_forwardfile_error;
- }
- }
-
- /* 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;
- }
- }
- }
-
- freez(tmp);
-
- fclose(fp);
-
-#ifndef SPLIT_PROXY_ARGS
- if (!suppress_blocklists)
- {
- fs->proxy_args = strsav(fs->proxy_args, "</pre>");
- }
-#endif /* ndef SPLIT_PROXY_ARGS */
+ struct re_filterfile_spec *b = (struct re_filterfile_spec *)f;
- /* the old one is now obsolete */
- if (current_forwardfile)
+ if (b == NULL)
{
- current_forwardfile->unloader = unload_forwardfile;
+ return;
}
- fs->next = files->next;
- files->next = fs;
- current_forwardfile = fs;
-
- if (csp)
- {
- csp->flist = fs;
- }
-
- return(0);
-
-load_forwardfile_error:
- log_error(LOG_LEVEL_FATAL, "can't load forwardfile '%s': %E",
- csp->config->forwardfile);
- return(-1);
+ destroy_list(b->patterns);
+ pcrs_free_joblist(b->joblist);
+ freez(b);
+ return;
}
-
-#ifdef PCRS
/*********************************************************************
*
* Function : load_re_filterfile
struct re_filterfile_spec *bl;
struct file_list *fs;
- char buf[BUFSIZ];
+ char buf[BUFFER_SIZE];
int error;
pcrs_job *dummy;
enlist( bl->patterns, buf );
/* We have a meaningful line -> make it a job */
- if ((dummy = pcrs_make_job(buf, &error)) == NULL)
+ if ((dummy = pcrs_compile_command(buf, &error)) == NULL)
{
log_error(LOG_LEVEL_RE_FILTER,
"Adding re_filter job %s failed with error %d.", buf, error);
fclose(fp);
-#ifndef SPLIT_PROXY_ARGS
- if (!suppress_blocklists)
- {
- fs->proxy_args = strsav(fs->proxy_args, "</pre>");
- }
-#endif /* ndef SPLIT_PROXY_ARGS */
-
/* the old one is now obsolete */
if ( NULL != current_re_filterfile )
{
return(-1);
}
-#endif /* def PCRS */
/*********************************************************************
projects / privoxy.git / blobdiff