-const char loaders_rcs[] = "$Id: loaders.c,v 1.11 2001/05/29 23:25:24 oes Exp $";
+const char loaders_rcs[] = "$Id: loaders.c,v 1.40 2002/03/08 17:46:04 jongfoster Exp $";
/*********************************************************************
*
* File : $Source: /cvsroot/ijbswa/current/loaders.c,v $
*
* Purpose : Functions to load and unload the various
* configuration files. Also contains code to manage
- * the list of active loaders, and to automatically
+ * the list of active loaders, and to automatically
* unload files that are no longer in use.
*
* Copyright : Written by and Copyright (C) 2001 the SourceForge
* IJBSWA team. http://ijbswa.sourceforge.net
*
* 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
*
* Revisions :
* $Log: loaders.c,v $
+ * Revision 1.40 2002/03/08 17:46:04 jongfoster
+ * Fixing int/size_t warnings
+ *
+ * Revision 1.39 2002/03/07 03:46:17 oes
+ * Fixed compiler warnings
+ *
+ * Revision 1.38 2002/03/06 22:54:35 jongfoster
+ * Automated function-comment nitpicking.
+ *
+ * Revision 1.37 2002/03/03 15:07:49 oes
+ * Re-enabled automatic config reloading
+ *
+ * Revision 1.36 2002/01/22 23:46:18 jongfoster
+ * Moving edit_read_line() and simple_read_line() to loaders.c, and
+ * extending them to support reading MS-DOS, Mac and UNIX style files
+ * on all platforms.
+ *
+ * Modifying read_config_line() (without changing it's prototype) to
+ * be a trivial wrapper for edit_read_line(). This means that we have
+ * one function to read a line and handle comments, which is common
+ * between the initialization code and the edit interface.
+ *
+ * Revision 1.35 2002/01/17 21:03:08 jongfoster
+ * Moving all our URL and URL pattern parsing code to urlmatch.c.
+ *
+ * Renaming free_url to free_url_spec, since it frees a struct url_spec.
+ *
+ * Revision 1.34 2001/12/30 14:07:32 steudten
+ * - Add signal handling (unix)
+ * - Add SIGHUP handler (unix)
+ * - Add creation of pidfile (unix)
+ * - Add action 'top' in rc file (RH)
+ * - Add entry 'SIGNALS' to manpage
+ * - Add exit message to logfile (unix)
+ *
+ * Revision 1.33 2001/11/13 00:16:38 jongfoster
+ * Replacing references to malloc.h with the standard stdlib.h
+ * (See ANSI or K&R 2nd Ed)
+ *
+ * Revision 1.32 2001/11/07 00:02:13 steudten
+ * Add line number in error output for lineparsing for
+ * actionsfile and configfile.
+ * Special handling for CLF added.
+ *
+ * Revision 1.31 2001/10/26 17:39:01 oes
+ * Removed csp->referrer
+ * Moved ijb_isspace and ijb_tolower to project.h
+ *
+ * Revision 1.30 2001/10/25 03:40:48 david__schmidt
+ * Change in porting tactics: OS/2's EMX porting layer doesn't allow multiple
+ * threads to call select() simultaneously. So, it's time to do a real, live,
+ * native OS/2 port. See defines for __EMX__ (the porting layer) vs. __OS2__
+ * (native). Both versions will work, but using __OS2__ offers multi-threading.
+ *
+ * Revision 1.29 2001/10/23 21:38:53 jongfoster
+ * Adding error-checking to create_url_spec()
+ *
+ * Revision 1.28 2001/10/07 15:40:39 oes
+ * Replaced 6 boolean members of csp with one bitmap (csp->flags)
+ *
+ * Revision 1.27 2001/09/22 16:36:59 jongfoster
+ * Removing unused parameter fs from read_config_line()
+ *
+ * Revision 1.26 2001/09/22 14:05:22 jongfoster
+ * Bugfix: Multiple escaped "#" characters in a configuration
+ * file are now permitted.
+ * Also removing 3 unused headers.
+ *
+ * Revision 1.25 2001/09/13 22:44:03 jongfoster
+ * Adding {} to an if statement
+ *
+ * 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
+ * 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()
#include <stdlib.h>
#include <sys/types.h>
#include <string.h>
-#include <malloc.h>
#include <errno.h>
#include <sys/stat.h>
#include <ctype.h>
+#include <assert.h>
-#ifndef _WIN32
+#if !defined(_WIN32) && !defined(__OS2__)
#include <unistd.h>
#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"
const char loaders_h_rcs[] = LOADERS_H_VERSION;
-/* Fix a problem with Solaris. There should be no effect on other
- * platforms.
- * Solaris's isspace() is a macro which uses it's argument directly
- * as an array index. Therefore we need to make sure that high-bit
- * characters generate +ve values, and ideally we also want to make
- * the argument match the declared parameter type of "int".
- */
-#define ijb_isspace(__X) isspace((int)(unsigned char)(__X))
-
-
/*
* Currently active files.
* These are also entered in the main linked list of files.
*/
-static struct file_list *current_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 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 */
-
-static int create_url_spec(struct url_spec * url, char * buf);
/*********************************************************************
for (csp = clients; csp && (ncsp = csp->next) ; csp = csp->next)
{
- if (ncsp->active)
+ if (ncsp->flags & CSP_FLAG_ACTIVE)
{
/* mark this client's files as active */
*/
ncsp->config->config_file_list->active = 1;
- if (ncsp->permissions_list) /* permissions files */
- {
- ncsp->permissions_list->active = 1;
- }
-
- if (ncsp->flist) /* forward files */
- {
- ncsp->flist->active = 1;
- }
-
-#ifdef ACL_FILES
- if (ncsp->alist) /* acl files */
+ if (ncsp->actions_list) /* actions files */
{
- ncsp->alist->active = 1;
+ ncsp->actions_list->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;
+ while (!(ncsp->flags & CSP_FLAG_ACTIVE))
+ {
+ 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);
+ freez(ncsp->ip_addr_str);
+ freez(ncsp->my_ip_addr_str);
+ freez(ncsp->my_hostname);
+ freez(ncsp->x_forwarded);
+ freez(ncsp->iob->buf);
- free_http_request(ncsp->http);
+ free_http_request(ncsp->http);
- destroy_list(ncsp->headers);
- destroy_list(ncsp->cookie_list);
+ destroy_list(ncsp->headers);
+ destroy_list(ncsp->cookie_list);
-#ifdef STATISTICS
- urls_read++;
- if (ncsp->rejected)
- {
- urls_rejected++;
- }
-#endif /* def STATISTICS */
+ free_current_action(ncsp->action);
+
+#ifdef FEATURE_STATISTICS
+ urls_read++;
+ if (ncsp->flags & CSP_FLAG_REJECTED)
+ {
+ urls_rejected++;
+ }
+#endif /* def FEATURE_STATISTICS */
- freez(ncsp);
+ freez(ncsp);
+
+ /* are there any more in sequence after it? */
+ if( !(ncsp = csp->next) )
+ break;
+ }
}
}
(nfl->unloader)(nfl->f);
-#ifndef SPLIT_PROXY_ARGS
- freez(nfl->proxy_args);
-#endif /* ndef SPLIT_PROXY_ARGS */
-
freez(nfl->filename);
freez(nfl);
}
-/*********************************************************************
- *
- * Function : create_url_spec
- *
- * Description : Creates a "url_spec" structure from a string.
- * When finished, free with unload_url().
- *
- * Parameters :
- * 1 : url = Target url_spec to be filled in. Must be
- * zeroed out before the call (e.g. using zalloc).
- * 2 : buf = Source pattern, null terminated. NOTE: The
- * contents of this buffer are destroyed by this
- * function. If this function succeeds, the
- * buffer is copied to url->spec. If this
- * function fails, the contents of the buffer
- * are lost forever.
- *
- * Returns : 0 => Ok, everything else is an error.
- *
- *********************************************************************/
-static int create_url_spec(struct url_spec * url, char * buf)
-{
- char *p;
- struct url_spec tmp_url[1];
-
- /* paranoia - should never happen. */
- if ((url == NULL) || (buf == NULL))
- {
- return 1;
- }
-
- /* save a copy of the orignal specification */
- if ((url->spec = strdup(buf)) == NULL)
- {
- return 1;
- }
-
- if ((p = strchr(buf, '/')))
- {
- if (NULL == (url->path = strdup(p)))
- {
- freez(url->spec);
- return 1;
- }
- url->pathlen = strlen(url->path);
- *p = '\0';
- }
- else
- {
- url->path = NULL;
- url->pathlen = 0;
- }
-#ifdef REGEX
- if (url->path)
- {
- int errcode;
- char rebuf[BUFSIZ];
-
- if (NULL == (url->preg = zalloc(sizeof(*url->preg))))
- {
- freez(url->spec);
- freez(url->path);
- return 1;
- }
-
- sprintf(rebuf, "^(%s)", url->path);
-
- errcode = regcomp(url->preg, rebuf,
- (REG_EXTENDED|REG_NOSUB|REG_ICASE));
- if (errcode)
- {
- 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);
-
- freez(url->spec);
- freez(url->path);
- freez(url->preg);
-
- return 1;
- }
- }
-#endif
- if ((p = strchr(buf, ':')) == NULL)
- {
- url->port = 0;
- }
- else
- {
- *p++ = '\0';
- url->port = atoi(p);
- }
-
- if ((url->domain = strdup(buf)) == NULL)
- {
- freez(url->spec);
- freez(url->path);
-#ifdef REGEX
- freez(url->preg);
-#endif /* def REGEX */
- return 1;
- }
-
- /* split domain into components */
-
- *tmp_url = dsplit(url->domain);
- url->dbuf = tmp_url->dbuf;
- url->dcnt = tmp_url->dcnt;
- url->dvec = tmp_url->dvec;
- url->unanchored = tmp_url->unanchored;
-
- return 0; /* OK */
-}
-
-
-/*********************************************************************
- *
- * 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_permissions_file
- *
- * Description : Unloads a permissions file.
- *
- * Parameters :
- * 1 : file_data = the data structure associated with the
- * permissions file.
- *
- * Returns : N/A
- *
- *********************************************************************/
-static void unload_permissions_file(void *file_data)
-{
- struct permissions_spec * next;
- struct permissions_spec * cur = (struct permissions_spec *)file_data;
- while (cur != NULL)
- {
- next = cur->next;
- unload_url(cur->url);
- freez(cur);
- cur = next;
- }
-
-}
-
-
-#ifdef TRUST_FILES
-/*********************************************************************
- *
- * Function : unload_trustfile
- *
- * Description : Unloads a trustfile.
- *
- * Parameters :
- * 1 : f = the data structure associated with the trustfile.
- *
- * Returns : N/A
- *
- *********************************************************************/
-static void unload_trustfile(void *f)
-{
- struct block_spec *b = (struct block_spec *)f;
- if (b == NULL) return;
-
- unload_trustfile(b->next);
-
- unload_url(b->url);
-
- freez(b);
-
-}
-#endif /* def TRUST_FILES */
-
-
-/*********************************************************************
- *
- * Function : unload_forwardfile
- *
- * Description : Unloads a forwardfile.
- *
- * Parameters :
- * 1 : f = the data structure associated with the forwardfile.
- *
- * Returns : N/A
- *
- *********************************************************************/
-static void unload_forwardfile(void *f)
-{
- struct forward_spec *b = (struct forward_spec *)f;
- if (b == NULL) return;
-
- unload_forwardfile(b->next);
-
- unload_url(b->url);
-
- freez(b->gw->gateway_host);
- freez(b->gw->forward_host);
-
- freez(b);
-
-}
-
-
-#ifdef PCRS
-/*********************************************************************
- *
- * Function : unload_re_filterfile
- *
- * Description : Unload the re_filter list.
- *
- * Parameters :
- * 1 : f = the data structure associated with the filterfile.
- *
- * Returns : N/A
- *
- *********************************************************************/
-static void unload_re_filterfile(void *f)
-{
- pcrs_job *joblist;
- struct re_filterfile_spec *b = (struct re_filterfile_spec *)f;
-
- if (b == NULL) return;
-
- destroy_list(b->patterns);
-
- joblist = b->joblist;
- while ( NULL != (joblist = pcrs_free_job(joblist)) ) {}
-
- freez(b);
-
-}
-#endif /* def PCRS */
-
-
/*********************************************************************
*
* Function : check_file_changed
*
* Description : Helper function to check if a file needs reloading.
* If "current" is still current, return it. Otherwise
- * allocates a new (zeroed) "struct file_list", fills
+ * 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.
* 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
}
fs = (struct file_list *)zalloc(sizeof(struct file_list));
-
if (fs == NULL)
{
/* Out of memory error */
freez (fs);
return 1;
}
-
-#ifndef SPLIT_PROXY_ARGS
- if (!suppress_blocklists)
- {
- char * p = html_encode(filename);
- if (p)
- {
- fs->proxy_args = strsav(fs->proxy_args, "<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;
}
/*********************************************************************
*
- * 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
- * and respects escaping of newline and comment char.
- * Also writes 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];
- int contflag = 0;
+ 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;
- *buf = '\0';
+/*
+ * 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))
+ while (FOREVER)
{
-#ifndef SPLIT_PROXY_ARGS
- if (fs && !suppress_blocklists)
+ ch = fgetc(fp);
+ if (ch == EOF)
{
- char *html_line = html_encode(linebuf);
- if (html_line != NULL)
+ if (len > 0)
+ {
+ *p = '\0';
+ *dest = buf;
+ return JB_ERR_OK;
+ }
+ else
{
- fs->proxy_args = strsav(fs->proxy_args, html_line);
- freez(html_line);
+ free(buf);
+ *dest = NULL;
+ return JB_ERR_FILE;
}
- fs->proxy_args = strsav(fs->proxy_args, "<br>");
}
-#endif /* ndef SPLIT_PROXY_ARGS */
-
- /* Trim off newline */
- if ((p = strpbrk(linebuf, "\r\n")) != NULL)
+ else if (ch == CHAR_CR)
{
- *p = '\0';
- }
-
- /* Line continuation? Trim escape and set flag. */
- if ((p != linebuf) && (*--p == '\\'))
- {
- contflag = 1;
- *p = '\0';
- }
-
- /* If there's a comment char.. */
- if ((p = strpbrk(linebuf, "#")) != NULL)
- {
- /* ..and it's escaped, left-shift the line over the escape. */
- if ((p != linebuf) && (*(p-1) == '\\'))
+ ch = getc(fp);
+ if (ch == CHAR_LF)
{
- q = p-1;
- while ((*q++ = *p++) != '\0') /* nop */;
+ if (*newline == NEWLINE_UNKNOWN)
+ {
+ *newline = NEWLINE_DOS;
+ }
}
- /* Else, chop off the rest of the line */
else
{
- *p = '\0';
+ if (ch != EOF)
+ {
+ ungetc(ch, fp);
+ }
+ if (*newline == NEWLINE_UNKNOWN)
+ {
+ *newline = NEWLINE_MAC;
+ }
}
+ *p = '\0';
+ *dest = buf;
+ if (*newline == NEWLINE_UNKNOWN)
+ {
+ *newline = realnewline;
+ }
+ return JB_ERR_OK;
}
-
- /* Remove leading and trailing whitespace */
- chomp(linebuf);
-
- if (*linebuf)
+ else if (ch == CHAR_LF)
{
- strncat(buf, linebuf, buflen - strlen(buf));
- if (contflag)
+ *p = '\0';
+ *dest = buf;
+ if (*newline == NEWLINE_UNKNOWN)
{
- contflag = 0;
- continue;
+ *newline = NEWLINE_UNIX;
}
- else
+ return JB_ERR_OK;
+ }
+ else if (ch == 0)
+ {
+ *p = '\0';
+ *dest = buf;
+ return JB_ERR_OK;
+ }
+
+ *p++ = ch;
+
+ if (++len >= buflen)
+ {
+ buflen += BUFFER_SIZE;
+ if (NULL == (p = realloc(buf, buflen)));
{
- return buf;
+ free(buf);
+ return JB_ERR_MEMORY;
}
+ buf = p;
+ p = buf + len;
}
}
- /* EOF */
- return NULL;
-
}
-#ifdef ACL_FILES
/*********************************************************************
*
- * Function : load_aclfile
+ * Function : edit_read_line
*
- * Description : Read and parse an aclfile 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_aclfile(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 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)
+ char *p; /* Temporary pointer */
+ char *linebuf; /* Line read from file */
+ char *linestart; /* Start of linebuf, usually first non-whitespace char */
+ int contflag = 0; /* Nonzero for line continuation - i.e. line ends '\' */
+ int is_empty = 1; /* Flag if not got any data yet */
+ char *raw = NULL; /* String to be stored in raw_out */
+ char *prefix = NULL; /* String to be stored in prefix_out */
+ char *data = NULL; /* String to be stored in data_out */
+ int scrapnewline; /* Used for (*newline) if newline==NULL */
+ jb_err rval = JB_ERR_OK;
+
+ assert(fp);
+ assert(raw_out || data_out);
+ assert(newline == NULL
+ || *newline == NEWLINE_UNKNOWN
+ || *newline == NEWLINE_UNIX
+ || *newline == NEWLINE_DOS
+ || *newline == NEWLINE_MAC);
+
+ if (newline == NULL)
{
- freez(fs->filename);
- freez(fs);
- goto load_aclfile_error;
+ scrapnewline = NEWLINE_UNKNOWN;
+ newline = &scrapnewline;
}
- fp = fopen(csp->config->aclfile, "r");
-
- if (fp == NULL)
+ /* Set output parameters to NULL */
+ if (raw_out)
{
- 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;
- }
+ *raw_out = NULL;
}
-
- fclose(fp);
-
-#ifndef SPLIT_PROXY_ARGS
- if (!suppress_blocklists)
+ if (prefix_out)
{
- fs->proxy_args = strsav(fs->proxy_args, "</pre>");
+ *prefix_out = NULL;
}
-#endif /* ndef SPLIT_PROXY_ARGS */
-
- if (current_aclfile)
+ if (data_out)
{
- current_aclfile->unloader = unload_aclfile;
+ *data_out = NULL;
}
- fs->next = files->next;
- files->next = fs;
- current_aclfile = fs;
+ /* Set string variables to new, empty strings. */
- if (csp)
+ if (raw_out)
{
- csp->alist = fs;
- }
-
- return(0);
-
-load_aclfile_error:
- log_error(LOG_LEVEL_FATAL, "can't load access control list %s: %E",
- csp->config->aclfile);
- return(-1);
-
-}
-#endif /* def ACL_FILES */
-
-
-struct permission_alias
-{
- const char * name;
- unsigned mask; /* a bit set to "0" = remove permission */
- unsigned add; /* a bit set to "1" = add permission */
- struct permission_alias * next;
-};
-
-
-/*
- * Note: this is special-cased in the code so we don't need to
- * fill in the ->next fields.
- */
-static const struct permission_alias standard_aliases[] =
-{
- { "+block", PERMIT_MASK_ALL, PERMIT_BLOCK },
-/* { "+cookies", PERMIT_MASK_ALL, PERMIT_COOKIE_SET | PERMIT_COOKIE_READ }, */
- { "+cookies-read", PERMIT_MASK_ALL, PERMIT_COOKIE_READ },
- { "+cookies-set", PERMIT_MASK_ALL, PERMIT_COOKIE_SET },
- { "+fast-redirects", PERMIT_MASK_ALL, PERMIT_FAST_REDIRECTS },
- { "+filter", PERMIT_MASK_ALL, PERMIT_RE_FILTER },
- { "+image", PERMIT_MASK_ALL, PERMIT_IMAGE },
- { "+popup", PERMIT_MASK_ALL, PERMIT_POPUPS },
- { "+popups", PERMIT_MASK_ALL, PERMIT_POPUPS },
- { "+referer", PERMIT_MASK_ALL, PERMIT_REFERER },
- { "+referrer", PERMIT_MASK_ALL, PERMIT_REFERER },
- { "-block", ~PERMIT_BLOCK, 0 },
-/* { "-cookies", ~(PERMIT_COOKIE_SET | PERMIT_COOKIE_READ), 0 }, */
- { "-cookies-read", ~PERMIT_COOKIE_READ, 0 },
- { "-cookies-set", ~PERMIT_COOKIE_SET, 0 },
- { "-fast-redirects", ~PERMIT_FAST_REDIRECTS, 0 },
- { "-filter", ~PERMIT_RE_FILTER, 0 },
- { "-image", ~PERMIT_IMAGE, 0 },
- { "-popup", ~PERMIT_POPUPS, 0 },
- { "-popups", ~PERMIT_POPUPS, 0 },
- { "-referer", ~PERMIT_REFERER, 0 },
- { "-referrer", ~PERMIT_REFERER, 0 },
- { NULL, 0, 0 } /* End marker */
-};
-
-
-/*********************************************************************
- *
- * 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 *last_perm;
- struct permissions_spec *perm;
- char buf[BUFSIZ];
- struct file_list *fs;
-#define MODE_START_OF_FILE 1
-#define MODE_PERMISSIONS 2
-#define MODE_ALIAS 3
- int mode = MODE_START_OF_FILE;
- unsigned curmask = PERMIT_MASK_ALL;
- unsigned curadd = 0;
- struct permission_alias * alias_list = NULL;
-
- if (!check_file_changed(current_permissions_file, csp->config->permissions_file, &fs))
- {
- /* No need to load */
- if (csp)
+ if ((raw = malloc(1)) == NULL)
{
- csp->permissions_list = current_permissions_file;
+ return JB_ERR_MEMORY;
}
- return 0;
+ *raw = '\0';
}
- if (!fs)
+ if (prefix_out)
{
- log_error(LOG_LEVEL_FATAL, "can't load permissions file '%s': error finding file: %E",
- csp->config->permissions_file);
- return 1; /* never get here */
+ if ((prefix = malloc(1)) == NULL)
+ {
+ freez(raw);
+ return JB_ERR_MEMORY;
+ }
+ *prefix = '\0';
}
-
- fs->f = last_perm = (struct permissions_spec *)zalloc(sizeof(*last_perm));
- if (last_perm == NULL)
+ if (data_out)
{
- log_error(LOG_LEVEL_FATAL, "can't load permissions file '%s': out of memory!",
- csp->config->permissions_file);
- return 1; /* never get here */
+ if ((data = malloc(1)) == NULL)
+ {
+ freez(raw);
+ freez(prefix);
+ return JB_ERR_MEMORY;
+ }
+ *data = '\0';
}
- if ((fp = fopen(csp->config->permissions_file, "r")) == NULL)
- {
- log_error(LOG_LEVEL_FATAL, "can't load permissions file '%s': error opening file: %E",
- csp->config->permissions_file);
- return 1; /* never get here */
- }
+ /* 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))))
{
- if (*buf == '{')
+ if (line_number)
+ {
+ (*line_number)++;
+ }
+ if (raw)
{
- /* It's a header block */
- if (buf[1] == '{')
+ string_append(&raw,linebuf);
+ if (string_append(&raw,NEWLINE(*newline)))
{
- /* It's {{settings}} or {{alias}} */
- int len = strlen(buf);
- char * start = buf + 2;
- char * end = buf + len - 1;
- if ((len < 5) || (*end-- != '}') || (*end-- != '}'))
- {
- /* too short */
- fclose(fp);
- log_error(LOG_LEVEL_FATAL,
- "can't load permissions file '%s': invalid line: %s",
- csp->config->permissions_file, buf);
- return 1; /* never get here */
- }
-
- /* Trim leading and trailing whitespace. */
- end[1] = '\0';
- chomp(start);
+ freez(prefix);
+ freez(data);
+ free(linebuf);
+ return JB_ERR_MEMORY;
+ }
+ }
- if (*start == '\0')
- {
- /* too short */
- fclose(fp);
- log_error(LOG_LEVEL_FATAL,
- "can't load permissions file '%s': invalid line: {{ }}",
- csp->config->permissions_file);
- return 1; /* never get here */
- }
+ /* Line continuation? Trim escape and set flag. */
+ p = linebuf + strlen(linebuf) - 1;
+ contflag = ((*linebuf != '\0') && (*p == '\\'));
+ if (contflag)
+ {
+ *p = '\0';
+ }
- if (0 == strcmpic(start, "alias"))
- {
- /* it's an {{alias}} block */
+ /* Trim leading spaces if we're at the start of the line */
+ linestart = linebuf;
+ if (*data == '\0')
+ {
+ /* Trim leading spaces */
+ while (*linestart && isspace((int)(unsigned char)*linestart))
+ {
+ linestart++;
+ }
+ }
- mode = MODE_ALIAS;
- }
- else
+ /* Handle comment characters. */
+ p = linestart;
+ while ((p = strchr(p, '#')) != NULL)
+ {
+ /* Found a comment char.. */
+ if ((p != linebuf) && (*(p-1) == '\\'))
+ {
+ /* ..and it's escaped, left-shift the line over the escape. */
+ char *q = p - 1;
+ while ((*q = *(q + 1)) != '\0')
{
- /* invalid {{something}} block */
- fclose(fp);
- log_error(LOG_LEVEL_FATAL,
- "can't load permissions file '%s': invalid line: {{%s}}",
- csp->config->permissions_file, start);
- return 1; /* never get here */
+ q++;
}
+ /* Now scan from just after the "#". */
}
else
{
- /* It's a permissions block */
-
- int more = 1;
-
- int len = strlen(buf);
- char * start = buf + 1;
- char * end = buf + len - 1;
-
- if ((len < 3) || (*end-- != '}'))
+ /* Real comment. Save it... */
+ if (p == linestart)
{
- /* too short */
- fclose(fp);
- log_error(LOG_LEVEL_FATAL,
- "can't load permissions file '%s': invalid line: %s",
- csp->config->permissions_file, buf);
- return 1; /* never get here */
+ /* 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;
}
-
- end[1] = '\0';
- chomp(start);
-
- if (*start == '\0')
- {
- /* too short */
- fclose(fp);
- log_error(LOG_LEVEL_FATAL,
- "can't load permissions file '%s': invalid line: { }",
- csp->config->permissions_file);
- return 1; /* never get here */
- }
-
- mode = MODE_PERMISSIONS;
-
- curmask = PERMIT_MASK_ALL;
- curadd = 0;
-
- while (more)
+ if (prefix)
{
- const struct permission_alias * alias = standard_aliases;
- char * option = start;
- while ((*start != '\0') && (*start != ' ') && (*start != '\t'))
- {
- start++;
- }
-
- more = (*start != 0);
- if (more)
- {
- *start++ = '\0';
-
- /* Eat all the whitespace between the options */
- while ((*start == ' ') || (*start == '\t'))
- {
- start++;
- }
- }
-
- /* handle option in 'option' */
-
- /* Check for standard permission name */
- while ( (alias->name != NULL) && (0 != strcmpic(alias->name, option)) )
- {
- alias++;
- }
- if (alias->name == NULL)
+ string_append(&prefix,p);
+ if (string_append(&prefix, NEWLINE(*newline)))
{
- /* try user aliases. */
- alias = alias_list;
- while ( (alias != NULL) && (0 != strcmpic(alias->name, option)) )
- {
- alias = alias->next;
- }
+ freez(raw);
+ freez(data);
+ free(linebuf);
+ return JB_ERR_MEMORY;
}
- if (alias == NULL)
- {
- /* Bad permission name */
- fclose(fp);
- log_error(LOG_LEVEL_FATAL,
- "can't load permissions file '%s': invalid permission name: %s",
- csp->config->permissions_file, option);
- return 1; /* never get here */
- }
- curmask &= alias->mask;
- curadd &= alias->mask;
- curadd |= alias->add;
}
- }
- }
- else if (mode == MODE_ALIAS)
- {
- /* define an alias */
- struct permission_alias * new_alias;
- int more = 1;
-
- char * start = strchr(buf, '=');
- char * end = start;
-
- if ((start == NULL) || (start == buf))
- {
- log_error(LOG_LEVEL_FATAL,
- "can't load permissions file '%s': invalid alias line: %s",
- csp->config->permissions_file, buf);
- return 1; /* never get here */
- }
- if ((new_alias = zalloc(sizeof(*new_alias))) == NULL)
- {
- fclose(fp);
- log_error(LOG_LEVEL_FATAL,
- "can't load permissions file '%s': out of memory!",
- csp->config->permissions_file);
- return 1; /* never get here */
- }
-
- /* Eat any the whitespace after the '=' */
- start++;
- while ((*start == ' ') || (*start == '\t'))
- {
- start++;
- }
- if (*start == '\0')
- {
- log_error(LOG_LEVEL_FATAL,
- "can't load permissions file '%s': invalid alias line: %s",
- csp->config->permissions_file, buf);
- return 1; /* never get here */
+ /* ... and chop off the rest of the line */
+ *p = '\0';
}
+ } /* END while (there's a # character) */
- /* Eat any the whitespace before the '=' */
- end--;
- while ((*end == ' ') || (*end == '\t'))
+ /* Write to the buffer */
+ if (*linestart)
+ {
+ is_empty = 0;
+ if (data)
{
- /*
- * we already know we must have at least 1 non-ws char
- * at start of buf - no need to check
- */
- end--;
+ if (string_append(&data, linestart))
+ {
+ freez(raw);
+ freez(prefix);
+ free(linebuf);
+ return JB_ERR_MEMORY;
+ }
}
- end[1] = '\0';
-
- new_alias->name = strdup(buf);
+ }
- curmask = PERMIT_MASK_ALL;
- curadd = 0;
+ free(linebuf);
+ } /* END while(we need more data) */
- while (more)
- {
- const struct permission_alias * alias = standard_aliases;
- char * option = start;
- while ((*start != '\0') && (*start != ' ') && (*start != '\t'))
- {
- start++;
- }
+ /* Handle simple_read_line() errors - ignore EOF */
+ if ((rval != JB_ERR_OK) && (rval != JB_ERR_FILE))
+ {
+ freez(raw);
+ freez(prefix);
+ freez(data);
+ return rval;
+ }
- more = (*start != 0);
- if (more)
- {
- *start++ = '\0';
+ 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").
+ */
- /* Eat all the whitespace between the options */
- while ((*start == ' ') || (*start == '\t'))
- {
- start++;
- }
- }
+ free(raw);
+ free(prefix);
+ free(data);
- /* handle option in 'option' */
+ return JB_ERR_FILE;
+ }
+ else
+ {
+ /* Got at least some data */
- /* Check for standard permission name */
- while ( (alias->name != NULL) && (0 != strcmpic(alias->name, option)) )
- {
- alias++;
- }
- if (alias->name == NULL)
- {
- /* try user aliases. */
- alias = alias_list;
- while ( (alias != NULL) && (0 != strcmpic(alias->name, option)) )
- {
- alias = alias->next;
- }
- }
- if (alias == NULL)
- {
- /* Bad permission name */
- fclose(fp);
- log_error(LOG_LEVEL_FATAL,
- "can't load permissions file '%s': invalid permission name: %s",
- csp->config->permissions_file, option);
- return 1; /* never get here */
- }
- curmask &= alias->mask;
- curadd &= alias->mask;
- curadd |= alias->add;
- }
+ /* Remove trailing whitespace */
+ chomp(data);
- /* save alias permissions */
- new_alias->mask = curmask;
- new_alias->add = curadd;
-
- /* add to list */
- new_alias->next = alias_list;
- alias_list = new_alias;
+ if (raw_out)
+ {
+ *raw_out = raw;
}
- else if (mode == MODE_PERMISSIONS)
+ else
{
- /* it's a URL pattern */
-
- /* allocate a new node */
- if ((perm = zalloc(sizeof(*perm))) == NULL)
- {
- fclose(fp);
- log_error(LOG_LEVEL_FATAL,
- "can't load permissions file '%s': out of memory!",
- csp->config->permissions_file);
- return 1; /* never get here */
- }
-
- /* Save flags */
- perm->mask = curmask;
- perm->add = curadd;
-
- /* Save the URL pattern */
- if (create_url_spec(perm->url, buf))
- {
- fclose(fp);
- log_error(LOG_LEVEL_FATAL,
- "can't load permissions file '%s': cannot create URL permission from: %s",
- csp->config->permissions_file, buf);
- return 1; /* never get here */
- }
-
- /* add it to the list */
- last_perm->next = perm;
- last_perm = perm;
+ free(raw);
}
- else if (mode == MODE_START_OF_FILE)
+ if (prefix_out)
{
- /* oops - please have a {} line as 1st line in file. */
- fclose(fp);
- log_error(LOG_LEVEL_FATAL,
- "can't load permissions file '%s': first line is invalid: %s",
- csp->config->permissions_file, buf);
- return 1; /* never get here */
+ *prefix_out = prefix;
}
else
{
- /* How did we get here? This is impossible! */
- fclose(fp);
- log_error(LOG_LEVEL_FATAL,
- "can't load permissions file '%s': INTERNAL ERROR - mode = %d",
- csp->config->permissions_file, mode);
- return 1; /* never get here */
+ free(prefix);
+ }
+ if (data_out)
+ {
+ *data_out = data;
+ }
+ else
+ {
+ free(data);
}
+ return JB_ERR_OK;
}
+}
- fclose(fp);
-
- while (alias_list != NULL)
- {
- struct permission_alias * next = alias_list->next;
- freez((char *)alias_list->name);
- free(alias_list);
- alias_list = next;
- }
-#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, "</pre>");
+ 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_permissions_file)
+ else
{
- current_permissions_file->unloader = unload_permissions_file;
+ assert(buf2);
+ assert(strlen(buf2) + 1U < buflen);
+ strncpy(buf, buf2, buflen - 1);
+ free(buf2);
+ buf[buflen - 1] = '\0';
+ return buf;
}
+}
- fs->next = files->next;
- files->next = fs;
- current_permissions_file = fs;
- if (csp)
- {
- csp->permissions_list = fs;
- }
+#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 *b = (struct block_spec *)f;
+ if (b == NULL) return;
- return(0);
+ unload_trustfile(b->next); /* Stack is cheap, isn't it? */
+
+ free_url_spec(b->url);
+
+ freez(b);
}
-#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;
+ unsigned long linenum = 0;
if (!check_file_changed(current_trustfile, csp->config->trustfile, &fs))
{
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)
{
trusted = 0;
reject = 1;
if (trusted)
{
*tl++ = b->url;
+ /* FIXME BUFFER OVERFLOW if >=64 entries */
}
}
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 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_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;
- }
+ struct re_filterfile_spec *a, *b = (struct re_filterfile_spec *)f;
- 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)
+ while (b != 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;
+ a = b->next;
- /* now parse the gateway host[:port] spec */
- p = vec[3];
+ destroy_list(b->patterns);
+ pcrs_free_joblist(b->joblist);
+ freez(b);
- 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>");
+ b = a;
}
-#endif /* ndef SPLIT_PROXY_ARGS */
-
- /* the old one is now obsolete */
- if (current_forwardfile)
- {
- current_forwardfile->unloader = unload_forwardfile;
- }
-
- fs->next = files->next;
- files->next = fs;
- current_forwardfile = fs;
-
- if (csp)
- {
- csp->flist = fs;
- }
-
- return(0);
-
-load_forwardfile_error:
- log_error(LOG_LEVEL_FATAL, "can't load forwardfile '%s': %E",
- csp->config->forwardfile);
- return(-1);
+ return;
}
-#ifdef PCRS
/*********************************************************************
*
* Function : load_re_filterfile
*
- * Description : Load the re_filterfile. Each non-comment, non-empty
- * line is instantly added to the joblist, which is
- * a chained list of pcrs_job structs.
+ * Description : Load the 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...)
{
FILE *fp;
- struct re_filterfile_spec *bl;
+ struct re_filterfile_spec *bl, *new_bl;
struct file_list *fs;
- char buf[BUFSIZ];
+ char buf[BUFFER_SIZE];
int error;
+ unsigned long linenum = 0;
pcrs_job *dummy;
+ /*
+ * No need to reload if unchanged
+ */
if (!check_file_changed(current_re_filterfile, csp->config->re_filterfile, &fs))
{
- /* No need to load */
if (csp)
{
csp->rlist = current_re_filterfile;
goto load_re_filterfile_error;
}
+ /*
+ * Allocate the first re_filterfile_spec struct
+ */
fs->f = bl = (struct re_filterfile_spec *)zalloc(sizeof(*bl));
if (bl == NULL)
{
goto load_re_filterfile_error;
}
- /* Open the file or fail */
+ /*
+ * Initialize the name in case there are
+ * expressions before the first block header
+ */
+ bl->filtername = "default";
+
+ /*
+ * Open the file or fail
+ */
if ((fp = fopen(csp->config->re_filterfile, "r")) == NULL)
{
goto load_re_filterfile_error;
}
- /* Read line by line */
- while (read_config_line(buf, sizeof(buf), fp, fs) != NULL)
+ /*
+ * Read line by line
+ */
+ while (read_config_line(buf, sizeof(buf), fp, &linenum) != NULL)
{
- enlist( bl->patterns, 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 (strncmp(buf, "FILTER:", 7) == 0)
+ {
+ new_bl = (struct re_filterfile_spec *)zalloc(sizeof(*bl));
+ if (new_bl == NULL)
+ {
+ goto load_re_filterfile_error;
+ }
+ else
+ {
+ new_bl->filtername = strdup(chomp(buf + 7));
+ bl->next = new_bl;
+ bl = new_bl;
+ }
+ continue;
+ }
- /* We have a meaningful line -> make it a job */
- if ((dummy = pcrs_make_job(buf, &error)) == NULL)
+ /*
+ * Else, save the expression, make it a pcrs_job
+ * and chain it into the current filter's joblist
+ */
+ enlist(bl->patterns, buf);
+
+ 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);
+ log_error(LOG_LEVEL_RE_FILTER,
+ "Adding re_filter job %s to filter %s failed with error %d.", buf, bl->filtername, error);
continue;
}
else
{
dummy->next = bl->joblist;
bl->joblist = dummy;
- log_error(LOG_LEVEL_RE_FILTER, "Adding re_filter job %s succeeded.", buf);
+ log_error(LOG_LEVEL_RE_FILTER, "Adding re_filter job %s to filter %s succeeded.", buf, bl->filtername);
}
}
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 */
+ /*
+ * Schedule the now-obsolete old data for unloading
+ */
if ( NULL != current_re_filterfile )
{
current_re_filterfile->unloader = unload_re_filterfile;
}
+ /*
+ * Chain this file into the global list of loaded files
+ */
fs->next = files->next;
files->next = fs;
current_re_filterfile = fs;
return( 0 );
load_re_filterfile_error:
- log_error(LOG_LEVEL_FATAL, "can't load re_filterfile '%s': %E",
+ log_error(LOG_LEVEL_FATAL, "can't load re_filterfile '%s': %E",
csp->config->re_filterfile);
return(-1);
}
-#endif /* def PCRS */
/*********************************************************************
* 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;
projects / privoxy.git / blobdiff