-const char loadcfg_rcs[] = "$Id: loadcfg.c,v 1.5 2001/05/25 22:34:30 jongfoster Exp $";
+const char loadcfg_rcs[] = "$Id: loadcfg.c,v 1.18 2001/07/13 14:01:14 oes Exp $";
/*********************************************************************
*
* File : $Source: /cvsroot/ijbswa/current/loadcfg.c,v $
*
* Revisions :
* $Log: loadcfg.c,v $
+ * Revision 1.18 2001/07/13 14:01:14 oes
+ * - Removed all #ifdef PCRS
+ * - Removed vim-settings
+ *
+ * Revision 1.17 2001/06/29 13:31:03 oes
+ * - Improved comments
+ * - Fixed (actionsfile) and sorted hashes
+ * - Introduced admin_address and proxy-info-url
+ * as config parameters
+ * - Renamed config->proxy_args_invocation (which didn't have
+ * the invocation but the options!) to config->proxy_args
+ * - Various adaptions
+ * - Removed logentry from cancelled commit
+ *
+ * Revision 1.16 2001/06/09 10:55:28 jongfoster
+ * Changing BUFSIZ ==> BUFFER_SIZE
+ *
+ * Revision 1.15 2001/06/07 23:13:40 jongfoster
+ * Merging ACL and forward files into config file.
+ * Cosmetic: Sorting config file options alphabetically.
+ * Cosmetic: Adding brief syntax comments to config file options.
+ *
+ * Revision 1.14 2001/06/07 14:46:25 joergs
+ * Missing make_path() added for re_filterfile.
+ *
+ * Revision 1.13 2001/06/05 22:33:54 jongfoster
+ *
+ * Fixed minor memory leak.
+ * Also now uses make_path to prepend the pathnames.
+ *
+ * Revision 1.12 2001/06/05 20:04:09 jongfoster
+ * Now uses _snprintf() in place of snprintf() under Win32.
+ *
+ * Revision 1.11 2001/06/04 18:31:58 swa
+ * files are now prefixed with either `confdir' or `logdir'.
+ * `make redhat-dist' replaces both entries confdir and logdir
+ * with redhat values
+ *
+ * Revision 1.10 2001/06/03 19:11:54 oes
+ * introduced confdir option
+ *
+ * Revision 1.9 2001/06/01 20:06:24 jongfoster
+ * Removed support for "tinygif" option - moved to actions file.
+ *
+ * Revision 1.8 2001/05/31 21:27:13 jongfoster
+ * Removed many options from the config file and into the
+ * "actions" file: add_forwarded, suppress_vanilla_wafer,
+ * wafer, add_header, user_agent, referer, from
+ * Also globally replaced "permission" with "action".
+ *
+ * Revision 1.7 2001/05/29 09:50:24 jongfoster
+ * Unified blocklist/imagelist/permissionslist.
+ * File format is still under discussion, but the internal changes
+ * are (mostly) done.
+ *
+ * Also modified interceptor behaviour:
+ * - We now intercept all URLs beginning with one of the following
+ * prefixes (and *only* these prefixes):
+ * * http://i.j.b/
+ * * http://ijbswa.sf.net/config/
+ * * http://ijbswa.sourceforge.net/config/
+ * - New interceptors "home page" - go to http://i.j.b/ to see it.
+ * - Internal changes so that intercepted and fast redirect pages
+ * are not replaced with an image.
+ * - Interceptors now have the option to send a binary page direct
+ * to the client. (i.e. ijb-send-banner uses this)
+ * - Implemented show-url-info interceptor. (Which is why I needed
+ * the above interceptors changes - a typical URL is
+ * "http://i.j.b/show-url-info?url=www.somesite.com/banner.gif".
+ * The previous mechanism would not have intercepted that, and
+ * if it had been intercepted then it then it would have replaced
+ * it with an image.)
+ *
+ * Revision 1.6 2001/05/26 00:28:36 jongfoster
+ * Automatic reloading of config file.
+ * Removed obsolete SIGHUP support (Unix) and Reload menu option (Win32).
+ * Most of the global variables have been moved to a new
+ * struct configuration_spec, accessed through csp->config->globalname
+ * Most of the globals remaining are used by the Win32 GUI.
+ *
* Revision 1.5 2001/05/25 22:34:30 jongfoster
* Hard tabs->Spaces
*
#ifdef _WIN32
-# include <sys/timeb.h>
# include <windows.h>
-# include <io.h>
-# include <process.h>
-# ifdef TOGGLE
-# include <time.h>
-# endif /* def TOGGLE */
# include "win32.h"
# ifndef _WIN_CONSOLE
# include "w32log.h"
# endif /* ndef _WIN_CONSOLE */
+/* VC++ has "_snprintf", not "snprintf" */
+#define snprintf _snprintf
+
#else /* ifndef _WIN32 */
# include <unistd.h>
#endif
#include "loadcfg.h"
+#include "list.h"
#include "jcc.h"
#include "filters.h"
#include "loaders.h"
#include "errlog.h"
#include "jbsockets.h"
#include "gateway.h"
+#include "ssplit.h"
const char loadcfg_h_rcs[] = LOADCFG_H_VERSION;
#define ijb_isupper(__X) isupper((int)(unsigned char)(__X))
#define ijb_tolower(__X) tolower((int)(unsigned char)(__X))
-static const char VANILLA_WAFER[] =
- "NOTICE=TO_WHOM_IT_MAY_CONCERN_"
- "Do_not_send_me_any_copyrighted_information_other_than_the_"
- "document_that_I_am_requesting_or_any_of_its_necessary_components._"
- "In_particular_do_not_send_me_any_cookies_that_"
- "are_subject_to_a_claim_of_copyright_by_anybody._"
- "Take_notice_that_I_refuse_to_be_bound_by_any_license_condition_"
- "(copyright_or_otherwise)_applying_to_any_cookie._";
-
#ifdef TOGGLE
/* by haroon - indicates if ijb is enabled */
int g_bToggleIJB = 1; /* JunkBusters is enabled by default. */
const char *configfile = NULL;
/*
- * The load_config function is now going to call `init_proxy_args',
- * so it will need argc and argv. So we need to have these
- * globally available.
+ * CGI functions will later need access to the invocation args,
+ * so we will make argc and argv global.
*/
int Argc = 0;
const char **Argv = NULL;
* Use the included "hash" program to find out what the hash will be
* for any string supplied on the command line. (Or just put it in the
* config file and read the number from the error message in the log).
+ *
+ * Please keep this list sorted alphabetically (but with the Windows
+ * console and GUI specific options last).
*/
-#define hash_trustfile 56494766ul
-#define hash_trust_info_url 449869467ul
-#define hash_debug 78263ul
-#define hash_tinygif 2227702ul
-#define hash_add_forwarded_header 3191044770ul
-#define hash_single_threaded 4250084780ul
-#define hash_suppress_vanilla_wafer 3121233547ul
-#define hash_wafer 89669ul
-#define hash_add_header 237434619ul
-#define hash_permissions_file 3825730796lu /* "permissionsfile" */
-#define hash_logfile 2114766ul
-#define hash_blockfile 48845391ul
-#define hash_imagefile 51447891ul
-#define hash_jarfile 2046641ul
-#define hash_listen_address 1255650842ul
-#define hash_forwardfile 1268669141ul
-#define hash_aclfile 1908516ul
-#define hash_re_filterfile 3877522444ul
-#define hash_user_agent 283326691ul
-#define hash_referrer 10883969ul
-#define hash_referer 2176719ul
-#define hash_from 16264ul
-#define hash_fast_redirects 464873764lu
-#define hash_hide_console 2048809870ul
-#define hash_include_stats 2174146548ul
-#define hash_suppress_blocklists 1948693308ul
-#define hash_toggle 447966ul
-
-#define hash_activity_animation 1817904738ul
-#define hash_log_messages 2291744899ul
-#define hash_log_highlight_messages 4032101240ul
-#define hash_log_buffer_size 2918070425ul
-#define hash_log_max_lines 2868344173ul
-#define hash_log_font_name 2866730124ul
-#define hash_log_font_size 2866731014ul
-#define hash_show_on_task_bar 215410365ul
-#define hash_close_button_minimizes 3651284693ul
+#define hash_actions_file 1196306641ul /* "actionsfile" */
+#define hash_admin_address 4112573064ul /* "admin-address" */
+#define hash_confdir 1978389ul /* "confdir" */
+#define hash_debug 78263ul /* "debug" */
+#define hash_deny_access 1227333715ul /* "deny-access" */
+#define hash_forward 2029845ul /* "forward" */
+#define hash_forward_socks4 3963965521ul /* "forward-socks4" */
+#define hash_forward_socks4a 2639958518ul /* "forward-socks4a" */
+#define hash_jarfile 2046641ul /* "jarfile" */
+#define hash_listen_address 1255650842ul /* "listen-address" */
+#define hash_logdir 422889ul /* "logdir" */
+#define hash_logfile 2114766ul /* "logfile" */
+#define hash_permit_access 3587953268ul /* "permit-access" */
+#define hash_proxy_info_url 3903079059ul /* "proxy-info-url" */
+#define hash_re_filterfile 3877522444ul /* "re_filterfile" */
+#define hash_single_threaded 4250084780ul /* "single-threaded" */
+#define hash_suppress_blocklists 1948693308ul /* "suppress-blocklists" */
+#define hash_toggle 447966ul /* "toggle" */
+#define hash_trust_info_url 430331967ul /* "trust-info-url" */
+#define hash_trustfile 56494766ul /* "trustfile" */
+
+#define hash_activity_animation 1817904738ul /* "activity-animation" */
+#define hash_close_button_minimizes 3651284693ul /* "close-button-minimizes" */
+#define hash_hide_console 2048809870ul /* "hide-console" */
+#define hash_log_buffer_size 2918070425ul /* "log-buffer-size" */
+#define hash_log_font_name 2866730124ul /* "log-font-name" */
+#define hash_log_font_size 2866731014ul /* "log-font-size" */
+#define hash_log_highlight_messages 4032101240ul /* "log-highlight-messages" */
+#define hash_log_max_lines 2868344173ul /* "log-max-lines" */
+#define hash_log_messages 2291744899ul /* "log-messages" */
+#define hash_show_on_task_bar 215410365ul /* "show-on-task-bar" */
void unload_configfile (void * data)
{
struct configuration_spec * config = (struct configuration_spec *)data;
+ struct forward_spec *cur_fwd = config->forward;
+#ifdef ACL_FILES
+ struct access_control_list *cur_acl = config->acl;
+ while (cur_acl != NULL)
+ {
+ struct access_control_list * next_acl = cur_acl->next;
+ free(cur_acl);
+ cur_acl = next_acl;
+ }
+ config->acl = NULL;
+#endif /* def ACL_FILES */
+
+ while (cur_fwd != NULL)
+ {
+ struct forward_spec * next_fwd = cur_fwd->next;
+ free_url(cur_fwd->url);
+
+ freez(cur_fwd->gateway_host);
+ freez(cur_fwd->forward_host);
+ free(cur_fwd);
+ cur_fwd = next_fwd;
+ }
+ config->forward = NULL;
+
#ifdef JAR_FILES
if ( NULL != config->jar )
{
config->jar = NULL;
}
#endif /* def JAR_FILES */
-#if defined(DETECT_MSIE_IMAGES) || defined(USE_IMAGE_LIST)
- freez((char *)config->tinygifurl);
-#endif /* defined(DETECT_MSIE_IMAGES) || defined(USE_IMAGE_LIST) */
- freez((char *)config->from);
+ freez((char *)config->confdir);
+ freez((char *)config->logdir);
+
freez((char *)config->haddr);
- freez((char *)config->uagent);
- freez((char *)config->referrer);
freez((char *)config->logfile);
- freez((char *)config->blockfile);
- freez((char *)config->permissions_file);
- freez((char *)config->forwardfile);
-
-#ifdef ACL_FILES
- freez((char *)config->aclfile);
-#endif /* def ACL_FILES */
-
-#ifdef USE_IMAGE_LIST
- freez((char *)config->imagefile);
-#endif /* def USE_IMAGE_LIST */
+ freez((char *)config->actions_file);
+ freez((char *)config->admin_address);
+ freez((char *)config->proxy_info_url);
+ freez((char *)config->proxy_args);
#ifdef JAR_FILES
freez((char *)config->jarfile);
freez((char *)config->suppress_message);
#endif /* ndef SPLIT_PROXY_ARGS */
-#ifdef PCRS
freez((char *)config->re_filterfile);
-#endif /* def PCRS */
}
*********************************************************************/
struct configuration_spec * load_config(void)
{
- char buf[BUFSIZ];
+ char buf[BUFFER_SIZE];
char *p, *q;
FILE *configfp = NULL;
struct configuration_spec * config = NULL;
- int suppress_vanilla_wafer;
struct client_state * fake_csp;
-
struct file_list *fs;
if (!check_file_changed(current_configfile, configfile, &fs))
*/
config->config_file_list = fs;
- init_proxy_args(Argc, Argv, config);
-
/*
* Set to defaults
*/
config->multi_threaded = 1;
- config->default_permissions = PERMIT_RE_FILTER;
config->hport = HADDR_PORT;
if ((configfp = fopen(configfile, "r")) == NULL)
while (read_config_line(buf, sizeof(buf), configfp, fs) != NULL)
{
- char cmd[BUFSIZ];
- char arg[BUFSIZ];
- char tmp[BUFSIZ];
+ char cmd[BUFFER_SIZE];
+ char arg[BUFFER_SIZE];
+ char tmp[BUFFER_SIZE];
+#ifdef ACL_FILES
+ struct access_control_list *cur_acl;
+#endif /* def ACL_FILES */
+ struct forward_spec *cur_fwd;
+ int vec_count;
+ char *vec[3];
strcpy(tmp, buf);
switch( hash_string( cmd ) )
{
-#ifdef TRUST_FILES
- case hash_trustfile :
- freez((char *)config->trustfile);
- config->trustfile = strdup(arg);
+/****************************************************************************
+ * actionsfile actions-file-name
+ * In confdir by default
+ ****************************************************************************/
+ case hash_actions_file :
+ freez((char *)config->actions_file);
+ config->actions_file = make_path(config->confdir, arg);
continue;
- case hash_trust_info_url :
- enlist(config->trust_info, arg);
- continue;
-#endif /* def TRUST_FILES */
-
+/****************************************************************************
+ * admin-address email-address
+ ****************************************************************************/
+ case hash_admin_address :
+ freez((char *)config->admin_address);
+ config->admin_address = strdup(arg);
+ continue;
+
+/****************************************************************************
+ * confdir directory-name
+ ****************************************************************************/
+ case hash_confdir :
+ freez((char *)config->confdir);
+ config->confdir = strdup(arg);
+ continue;
+
+/****************************************************************************
+ * debug n
+ * Specifies debug level, multiple values are ORed together.
+ ****************************************************************************/
case hash_debug :
config->debug |= atoi(arg);
continue;
-#if defined(DETECT_MSIE_IMAGES) || defined(USE_IMAGE_LIST)
- case hash_tinygif :
- freez((char *)config->tinygifurl);
- config->tinygif = atoi(arg);
- if(3 == config->tinygif)
+/****************************************************************************
+ * deny-access source-ip[/significant-bits] [dest-ip[/significant-bits]]
+ ****************************************************************************/
+#ifdef ACL_FILES
+ case hash_deny_access:
+ vec_count = ssplit(arg, " \t", vec, SZ(vec), 1, 1);
+
+ if ((vec_count != 1) && (vec_count != 2))
+ {
+ log_error(LOG_LEVEL_ERROR, "Wrong number of parameters for "
+ "deny-access directive in configuration file.");
+ config->proxy_args = strsav( config->proxy_args,
+ "<br>\nWARNING: Wrong number of parameters for "
+ "deny-access directive in configuration file.<br><br>\n");
+ continue;
+ }
+
+ /* allocate a new node */
+ cur_acl = (struct access_control_list *) zalloc(sizeof(*cur_acl));
+
+ if (cur_acl == NULL)
+ {
+ log_error(LOG_LEVEL_FATAL, "can't allocate memory for configuration");
+ /* Never get here - LOG_LEVEL_FATAL causes program exit */
+ continue;
+ }
+ cur_acl->action = ACL_DENY;
+
+ if (acl_addr(vec[0], cur_acl->src) < 0)
{
- p = arg;
- while((*p >= '0') && (*p <= '9'))
+ log_error(LOG_LEVEL_ERROR, "Invalid source IP for deny-access "
+ "directive in configuration file: \"%s\"", vec[0]);
+ config->proxy_args = strsav( config->proxy_args,
+ "<br>\nWARNING: Invalid source IP for deny-access directive"
+ " in configuration file: \"");
+ config->proxy_args = strsav( config->proxy_args,
+ vec[0]);
+ config->proxy_args = strsav( config->proxy_args,
+ "\"<br><br>\n");
+ freez(cur_acl);
+ continue;
+ }
+ if (vec_count == 2)
+ {
+ if (acl_addr(vec[1], cur_acl->dst) < 0)
{
- p++;
+ log_error(LOG_LEVEL_ERROR, "Invalid destination IP for deny-access "
+ "directive in configuration file: \"%s\"", vec[0]);
+ config->proxy_args = strsav( config->proxy_args,
+ "<br>\nWARNING: Invalid destination IP for deny-access directive"
+ " in configuration file: \"");
+ config->proxy_args = strsav( config->proxy_args,
+ vec[0]);
+ config->proxy_args = strsav( config->proxy_args,
+ "\"<br><br>\n");
+ freez(cur_acl);
+ continue;
}
- while((*p == ' ') || (*p == '\t'))
+ }
+
+ /*
+ * Add it to the list. Note we reverse the list to get the
+ * behaviour the user expects. With both the ACL and
+ * actions file, the last match wins. However, the internal
+ * implementations are different: The actions file is stored
+ * in the same order as the file, and scanned completely.
+ * With the ACL, we reverse the order as we load it, then
+ * when we scan it we stop as soon as we get a match.
+ */
+ cur_acl->next = config->acl;
+ config->acl = cur_acl;
+
+ continue;
+#endif /* def ACL_FILES */
+
+/****************************************************************************
+ * forward url-pattern (.|http-proxy-host[:port])
+ ****************************************************************************/
+ case hash_forward:
+ vec_count = ssplit(arg, " \t", vec, SZ(vec), 1, 1);
+
+ if (vec_count != 2)
+ {
+ log_error(LOG_LEVEL_ERROR, "Wrong number of parameters for forward "
+ "directive in configuration file.");
+ config->proxy_args = strsav( config->proxy_args,
+ "<br>\nWARNING: Wrong number of parameters for "
+ "forward directive in configuration file.");
+ continue;
+ }
+
+ /* allocate a new node */
+ cur_fwd = zalloc(sizeof(*cur_fwd));
+ if (cur_fwd == NULL)
+ {
+ log_error(LOG_LEVEL_FATAL, "can't allocate memory for configuration");
+ /* Never get here - LOG_LEVEL_FATAL causes program exit */
+ continue;
+ }
+
+ cur_fwd->type = SOCKS_NONE;
+
+ /* Save the URL pattern */
+ if (create_url_spec(cur_fwd->url, vec[0]))
+ {
+ log_error(LOG_LEVEL_ERROR, "Bad URL specifier for forward "
+ "directive in configuration file.");
+ config->proxy_args = strsav( config->proxy_args,
+ "<br>\nWARNING: Bad URL specifier for "
+ "forward directive in configuration file.");
+ continue;
+ }
+
+ /* Parse the parent HTTP proxy host:port */
+ p = vec[1];
+
+ if (strcmp(p, ".") != 0)
+ {
+ cur_fwd->forward_host = strdup(p);
+
+ if ((p = strchr(cur_fwd->forward_host, ':')))
{
- p++;
+ *p++ = '\0';
+ cur_fwd->forward_port = atoi(p);
}
- if (*p)
+
+ if (cur_fwd->forward_port <= 0)
{
- q = malloc(strlen(p) + 5);
- if (q)
- {
- strcpy(q, p);
- strcat(q, "\r\n\r\n");
- config->tinygifurl = q;
- }
+ cur_fwd->forward_port = 8000;
}
}
- if ((config->tinygif != 1) &&
- (config->tinygif != 2) &&
- ((config->tinygif != 3) || (config->tinygifurl==NULL)) )
+
+ /* Add to list. */
+ cur_fwd->next = config->forward;
+ config->forward = cur_fwd;
+
+ continue;
+
+/****************************************************************************
+ * forward-socks4 url-pattern socks-proxy[:port] (.|http-proxy[:port])
+ ****************************************************************************/
+ case hash_forward_socks4:
+ vec_count = ssplit(arg, " \t", vec, SZ(vec), 1, 1);
+
+ if (vec_count != 3)
{
- log_error(LOG_LEVEL_ERROR, "tinygif setting invalid.");
+ log_error(LOG_LEVEL_ERROR, "Wrong number of parameters for "
+ "forward-socks4 directive in configuration file.");
+ config->proxy_args = strsav( config->proxy_args,
+ "<br>\nWARNING: Wrong number of parameters for "
+ "forward-socks4 directive in configuration file.");
+ continue;
}
- continue;
-#endif /* defined(DETECT_MSIE_IMAGES) || defined(USE_IMAGE_LIST) */
- case hash_add_forwarded_header :
- config->add_forwarded = 1;
- continue;
+ /* allocate a new node */
+ cur_fwd = zalloc(sizeof(*cur_fwd));
+ if (cur_fwd == NULL)
+ {
+ log_error(LOG_LEVEL_FATAL, "can't allocate memory for configuration");
+ /* Never get here - LOG_LEVEL_FATAL causes program exit */
+ continue;
+ }
- case hash_single_threaded :
- config->multi_threaded = 0;
- continue;
+ cur_fwd->type = SOCKS_4;
- case hash_suppress_vanilla_wafer :
- suppress_vanilla_wafer = 1;
- continue;
+ /* Save the URL pattern */
+ if (create_url_spec(cur_fwd->url, vec[0]))
+ {
+ log_error(LOG_LEVEL_ERROR, "Bad URL specifier for forward-socks4 "
+ "directive in configuration file.");
+ config->proxy_args = strsav( config->proxy_args,
+ "<br>\nWARNING: Bad URL specifier for "
+ "forward-socks4 directive in configuration file.");
+ continue;
+ }
- case hash_wafer :
- enlist(config->wafer_list, arg);
- continue;
+ /* Parse the SOCKS proxy host[:port] */
+ p = vec[1];
- case hash_add_header :
- enlist(config->xtra_list, arg);
- continue;
+ if (strcmp(p, ".") != 0)
+ {
+ cur_fwd->gateway_host = strdup(p);
- case hash_permissions_file :
- freez((char *)config->permissions_file);
- config->permissions_file = strdup(arg);
- continue;
+ if ((p = strchr(cur_fwd->gateway_host, ':')))
+ {
+ *p++ = '\0';
+ cur_fwd->gateway_port = atoi(p);
+ }
+ if (cur_fwd->gateway_port <= 0)
+ {
+ cur_fwd->gateway_port = 1080;
+ }
+ }
- case hash_logfile :
- freez((char *)config->logfile);
- config->logfile = strdup(arg);
- continue;
+ /* Parse the parent HTTP proxy host[:port] */
+ p = vec[2];
+
+ if (strcmp(p, ".") != 0)
+ {
+ cur_fwd->forward_host = strdup(p);
- case hash_blockfile :
- freez((char *)config->blockfile);
- config->blockfile = strdup(arg);
+ if ((p = strchr(cur_fwd->forward_host, ':')))
+ {
+ *p++ = '\0';
+ cur_fwd->forward_port = atoi(p);
+ }
+
+ if (cur_fwd->forward_port <= 0)
+ {
+ cur_fwd->forward_port = 8000;
+ }
+ }
+
+ /* Add to list. */
+ cur_fwd->next = config->forward;
+ config->forward = cur_fwd;
+
continue;
-#ifdef USE_IMAGE_LIST
- case hash_imagefile :
- freez((char *)config->imagefile);
- config->imagefile = strdup(arg);
+/****************************************************************************
+ * forward-socks4a url-pattern socks-proxy[:port] (.|http-proxy[:port])
+ ****************************************************************************/
+ case hash_forward_socks4a:
+ vec_count = ssplit(arg, " \t", vec, SZ(vec), 1, 1);
+
+ if (vec_count != 3)
+ {
+ log_error(LOG_LEVEL_ERROR, "Wrong number of parameters for "
+ "forward-socks4a directive in configuration file.");
+ config->proxy_args = strsav( config->proxy_args,
+ "<br>\nWARNING: Wrong number of parameters for "
+ "forward-socks4a directive in configuration file.");
+ continue;
+ }
+
+ /* allocate a new node */
+ cur_fwd = zalloc(sizeof(*cur_fwd));
+ if (cur_fwd == NULL)
+ {
+ log_error(LOG_LEVEL_FATAL, "can't allocate memory for configuration");
+ /* Never get here - LOG_LEVEL_FATAL causes program exit */
+ continue;
+ }
+
+ cur_fwd->type = SOCKS_4A;
+
+ /* Save the URL pattern */
+ if (create_url_spec(cur_fwd->url, vec[0]))
+ {
+ log_error(LOG_LEVEL_ERROR, "Bad URL specifier for forward-socks4a "
+ "directive in configuration file.");
+ config->proxy_args = strsav( config->proxy_args,
+ "<br>\nWARNING: Bad URL specifier for "
+ "forward-socks4a directive in configuration file.");
+ continue;
+ }
+
+ /* Parse the SOCKS proxy host[:port] */
+ p = vec[1];
+
+ cur_fwd->gateway_host = strdup(p);
+
+ if ((p = strchr(cur_fwd->gateway_host, ':')))
+ {
+ *p++ = '\0';
+ cur_fwd->gateway_port = atoi(p);
+ }
+ if (cur_fwd->gateway_port <= 0)
+ {
+ cur_fwd->gateway_port = 1080;
+ }
+
+ /* Parse the parent HTTP proxy host[:port] */
+ p = vec[2];
+
+ if (strcmp(p, ".") != 0)
+ {
+ cur_fwd->forward_host = strdup(p);
+
+ if ((p = strchr(cur_fwd->forward_host, ':')))
+ {
+ *p++ = '\0';
+ cur_fwd->forward_port = atoi(p);
+ }
+
+ if (cur_fwd->forward_port <= 0)
+ {
+ cur_fwd->forward_port = 8000;
+ }
+ }
+
+ /* Add to list. */
+ cur_fwd->next = config->forward;
+ config->forward = cur_fwd;
+
continue;
-#endif /* def USE_IMAGE_LIST */
+/****************************************************************************
+ * jarfile jar-file-name
+ * In logdir by default
+ ****************************************************************************/
#ifdef JAR_FILES
case hash_jarfile :
freez((char *)config->jarfile);
- config->jarfile = strdup(arg);
+ config->jarfile = make_path(config->logdir, arg);
continue;
#endif /* def JAR_FILES */
+/****************************************************************************
+ * listen-address [ip][:port]
+ ****************************************************************************/
case hash_listen_address :
freez((char *)config->haddr);
config->haddr = strdup(arg);
continue;
- case hash_forwardfile :
- freez((char *)config->forwardfile);
- config->forwardfile = strdup(arg);
+/****************************************************************************
+ * logdir directory-name
+ ****************************************************************************/
+ case hash_logdir :
+ freez((char *)config->logdir);
+ config->logdir = strdup(arg);
+ continue;
+
+/****************************************************************************
+ * logfile log-file-name
+ * In logdir by default
+ ****************************************************************************/
+ case hash_logfile :
+ freez((char *)config->logfile);
+ config->logfile = make_path(config->logdir, arg);
continue;
+/****************************************************************************
+ * permit-access source-ip[/significant-bits] [dest-ip[/significant-bits]]
+ ****************************************************************************/
#ifdef ACL_FILES
- case hash_aclfile :
- freez((char *)config->aclfile);
- config->aclfile = strdup(arg);
- continue;
-#endif /* def ACL_FILES */
+ case hash_permit_access:
+ vec_count = ssplit(arg, " \t", vec, SZ(vec), 1, 1);
-#ifdef PCRS
- case hash_re_filterfile :
- freez((char *)config->re_filterfile);
- config->re_filterfile = strdup(arg);
- continue;
-#endif /* def PCRS */
+ if ((vec_count != 1) && (vec_count != 2))
+ {
+ log_error(LOG_LEVEL_ERROR, "Wrong number of parameters for "
+ "permit-access directive in configuration file.");
+ config->proxy_args = strsav( config->proxy_args,
+ "<br>\nWARNING: Wrong number of parameters for "
+ "permit-access directive in configuration file.<br><br>\n");
- case hash_user_agent :
- freez((char *)config->uagent);
- config->uagent = strdup(arg);
- continue;
+ continue;
+ }
+
+ /* allocate a new node */
+ cur_acl = (struct access_control_list *) zalloc(sizeof(*cur_acl));
+
+ if (cur_acl == NULL)
+ {
+ log_error(LOG_LEVEL_FATAL, "can't allocate memory for configuration");
+ /* Never get here - LOG_LEVEL_FATAL causes program exit */
+ continue;
+ }
+ cur_acl->action = ACL_PERMIT;
+
+ if (acl_addr(vec[0], cur_acl->src) < 0)
+ {
+ log_error(LOG_LEVEL_ERROR, "Invalid source IP for permit-access "
+ "directive in configuration file: \"%s\"", vec[0]);
+ config->proxy_args = strsav( config->proxy_args,
+ "<br>\nWARNING: Invalid source IP for permit-access directive"
+ " in configuration file: \"");
+ config->proxy_args = strsav( config->proxy_args,
+ vec[0]);
+ config->proxy_args = strsav( config->proxy_args,
+ "\"<br><br>\n");
+ freez(cur_acl);
+ continue;
+ }
+ if (vec_count == 2)
+ {
+ if (acl_addr(vec[1], cur_acl->dst) < 0)
+ {
+ log_error(LOG_LEVEL_ERROR, "Invalid destination IP for "
+ "permit-access directive in configuration file: \"%s\"",
+ vec[0]);
+ config->proxy_args = strsav( config->proxy_args,
+ "<br>\nWARNING: Invalid destination IP for permit-access directive"
+ " in configuration file: \"");
+ config->proxy_args = strsav( config->proxy_args,
+ vec[0]);
+ config->proxy_args = strsav( config->proxy_args,
+ "\"<br><br>\n");
+ freez(cur_acl);
+ continue;
+ }
+ }
/*
- * Offer choice of correct spelling according to dictionary,
- * or the misspelling used in the HTTP spec.
+ * Add it to the list. Note we reverse the list to get the
+ * behaviour the user expects. With both the ACL and
+ * actions file, the last match wins. However, the internal
+ * implementations are different: The actions file is stored
+ * in the same order as the file, and scanned completely.
+ * With the ACL, we reverse the order as we load it, then
+ * when we scan it we stop as soon as we get a match.
*/
- case hash_referrer :
- case hash_referer :
- freez((char *)config->referrer);
- config->referrer = strdup(arg);
+ cur_acl->next = config->acl;
+ config->acl = cur_acl;
+
continue;
+#endif /* def ACL_FILES */
- case hash_from :
- freez((char *)config->from);
- config->from = strdup(arg);
+/****************************************************************************
+ * proxy-info-url url
+ ****************************************************************************/
+ case hash_proxy_info_url :
+ freez((char *)config->proxy_info_url);
+ config->proxy_info_url = strdup(arg);
continue;
-#ifdef FAST_REDIRECTS
- case hash_fast_redirects :
- config->fast_redirects = 1;
- continue;
-#endif /* def FAST_REDIRECTS */
+/****************************************************************************
+ * re_filterfile file-name
+ * In confdir by default.
+ ****************************************************************************/
+ case hash_re_filterfile :
+ freez((char *)config->re_filterfile);
+ config->re_filterfile = make_path(config->confdir, arg);
+ continue;
-#ifdef _WIN_CONSOLE
- case hash_hide_console :
- hideConsole = 1;
+/****************************************************************************
+ * single-threaded
+ ****************************************************************************/
+ case hash_single_threaded :
+ config->multi_threaded = 0;
continue;
-#endif /*def _WIN_CONSOLE*/
+/****************************************************************************
+ * FIXME: Document this FIXME2: Shouldn't we throw this out? --oes
+ ****************************************************************************/
#ifndef SPLIT_PROXY_ARGS
case hash_suppress_blocklists :
if (arg[0] != '\0')
continue;
#endif /* ndef SPLIT_PROXY_ARGS */
+/****************************************************************************
+ * toggle (0|1)
+ ****************************************************************************/
#ifdef TOGGLE
case hash_toggle :
g_bToggleIJB = atoi(arg);
continue;
#endif /* def TOGGLE */
+/****************************************************************************
+ * trust-info-url url
+ ****************************************************************************/
+#ifdef TRUST_FILES
+ case hash_trust_info_url :
+ enlist(config->trust_info, arg);
+ continue;
+#endif /* def TRUST_FILES */
+
+/****************************************************************************
+ * trustfile filename
+ * (In confdir by default.)
+ ****************************************************************************/
+#ifdef TRUST_FILES
+ case hash_trustfile :
+ freez((char *)config->trustfile);
+ config->trustfile = make_path(config->confdir, arg);
+ continue;
+#endif /* def TRUST_FILES */
+
+
+/****************************************************************************
+ * Win32 Console options:
+ ****************************************************************************/
+
+/****************************************************************************
+ * hide-console
+ ****************************************************************************/
+#ifdef _WIN_CONSOLE
+ case hash_hide_console :
+ hideConsole = 1;
+ continue;
+#endif /*def _WIN_CONSOLE*/
+
+
+/****************************************************************************
+ * Win32 GUI options:
+ ****************************************************************************/
+
#if defined(_WIN32) && ! defined(_WIN_CONSOLE)
+/****************************************************************************
+ * activity-animation (0|1)
+ ****************************************************************************/
case hash_activity_animation :
g_bShowActivityAnimation = atoi(arg);
continue;
- case hash_log_messages :
- g_bLogMessages = atoi(arg);
- continue;
-
- case hash_log_highlight_messages :
- g_bHighlightMessages = atoi(arg);
+/****************************************************************************
+ * close-button-minimizes (0|1)
+ ****************************************************************************/
+ case hash_close_button_minimizes :
+ g_bCloseHidesWindow = atoi(arg);
continue;
+/****************************************************************************
+ * log-buffer-size (0|1)
+ ****************************************************************************/
case hash_log_buffer_size :
g_bLimitBufferSize = atoi(arg);
continue;
- case hash_log_max_lines :
- g_nMaxBufferLines = atoi(arg);
- continue;
-
+/****************************************************************************
+ * log-font-name fontnane
+ ****************************************************************************/
case hash_log_font_name :
strcpy( g_szFontFaceName, arg );
continue;
+/****************************************************************************
+ * log-font-size n
+ ****************************************************************************/
case hash_log_font_size :
g_nFontSize = atoi(arg);
continue;
+/****************************************************************************
+ * log-highlight-messages (0|1)
+ ****************************************************************************/
+ case hash_log_highlight_messages :
+ g_bHighlightMessages = atoi(arg);
+ continue;
+
+/****************************************************************************
+ * log-max-lines n
+ ****************************************************************************/
+ case hash_log_max_lines :
+ g_nMaxBufferLines = atoi(arg);
+ continue;
+
+/****************************************************************************
+ * log-messages (0|1)
+ ****************************************************************************/
+ case hash_log_messages :
+ g_bLogMessages = atoi(arg);
+ continue;
+
+/****************************************************************************
+ * show-on-task-bar (0|1)
+ ****************************************************************************/
case hash_show_on_task_bar :
g_bShowOnTaskBar = atoi(arg);
continue;
- case hash_close_button_minimizes :
- g_bCloseHidesWindow = atoi(arg);
- continue;
#endif /* defined(_WIN32) && ! defined(_WIN_CONSOLE) */
- /* Warnings about unsupported features */
-#ifndef USE_IMAGE_LIST
- case hash_imagefile :
-#endif /* ndef USE_IMAGE_LIST */
-#ifndef PCRS
- case hash_re_filterfile :
-#endif /* ndef PCRS */
+/****************************************************************************/
+/* Warnings about unsupported features */
+/****************************************************************************/
+#ifndef ACL_FILES
+ case hash_deny_access:
+#endif /* ndef ACL_FILES */
+#ifndef JAR_FILES
+ case hash_jarfile :
+#endif /* ndef JAR_FILES */
+#ifndef ACL_FILES
+ case hash_permit_access:
+#endif /* ndef ACL_FILES */
+#ifdef SPLIT_PROXY_ARGS
+ case hash_suppress_blocklists :
+#endif /* def SPLIT_PROXY_ARGS */
#ifndef TOGGLE
case hash_toggle :
#endif /* ndef TOGGLE */
+#ifndef TRUST_FILES
+ case hash_trustfile :
+ case hash_trust_info_url :
+#endif /* ndef TRUST_FILES */
+
+#ifndef _WIN_CONSOLE
+ case hash_hide_console :
+#endif /* ndef _WIN_CONSOLE */
+
#if defined(_WIN_CONSOLE) || ! defined(_WIN32)
case hash_activity_animation :
- case hash_log_messages :
- case hash_log_highlight_messages :
+ case hash_close_button_minimizes :
case hash_log_buffer_size :
- case hash_log_max_lines :
case hash_log_font_name :
case hash_log_font_size :
+ case hash_log_highlight_messages :
+ case hash_log_max_lines :
+ case hash_log_messages :
case hash_show_on_task_bar :
- case hash_close_button_minimizes :
#endif /* defined(_WIN_CONSOLE) || ! defined(_WIN32) */
-#ifndef _WIN_CONSOLE
- case hash_hide_console :
-#endif /* ndef _WIN_CONSOLE */
-#if !defined(DETECT_MSIE_IMAGES) && !defined(USE_IMAGE_LIST)
- case hash_tinygif :
-#endif /* !defined(DETECT_MSIE_IMAGES) && !defined(USE_IMAGE_LIST) */
-#ifndef JAR_FILES
- case hash_jarfile :
-#endif /* ndef JAR_FILES */
-#ifndef ACL_FILES
- case hash_aclfile :
-#endif /* ndef ACL_FILES */
-#ifndef FAST_REDIRECTS
- case hash_fast_redirects :
-#endif /* ndef FAST_REDIRECTS */
-#ifdef SPLIT_PROXY_ARGS
- case hash_suppress_blocklists :
-#endif /* def SPLIT_PROXY_ARGS */
- log_error(LOG_LEVEL_INFO, "Unsupported directive \"%s\" ignored.", cmd);
+ /* These warnings are annoying - so hide them. -- Jon */
+ /* log_error(LOG_LEVEL_INFO, "Unsupported directive \"%s\" ignored.", cmd); */
continue;
+/****************************************************************************/
default :
+/****************************************************************************/
/*
* I decided that I liked this better as a warning than an
* error. To change back to an error, just change log level
* to LOG_LEVEL_FATAL.
*/
- log_error(LOG_LEVEL_ERROR, "Unrecognized directive (%lulu) in "
+ log_error(LOG_LEVEL_ERROR, "Unrecognized directive (%luul) in "
"configuration file: \"%s\"", hash_string( cmd ), buf);
- p = malloc( BUFSIZ );
- if (p != NULL)
- {
- sprintf( p, "<br>\nWARNING: unrecognized directive : %s<br><br>\n", buf );
- config->proxy_args->invocation = strsav( config->proxy_args->invocation, p );
- freez( p );
- }
+ config->proxy_args = strsav( config->proxy_args, "<br>\nWARNING: unrecognized directive : ");
+ config->proxy_args = strsav( config->proxy_args, buf);
+ config->proxy_args = strsav( config->proxy_args, "<br><br>\n");
continue;
+
+/****************************************************************************/
} /* end switch( hash_string(cmd) ) */
} /* end while ( read_config_line(...) ) */
init_error_log(Argv[0], config->logfile, config->debug);
- if (config->permissions_file)
+ if (config->actions_file)
{
- add_loader(load_permissions_file, config);
+ add_loader(load_actions_file, config);
}
- if (config->blockfile)
- {
- add_loader(load_blockfile, config);
- }
-
-#ifdef USE_IMAGE_LIST
- if (config->imagefile)
- {
- add_loader(load_imagefile, config);
- }
-#endif /* def USE_IMAGE_LIST */
-
- if (config->forwardfile)
- {
- add_loader(load_forwardfile, config);
- }
-
-#ifdef ACL_FILES
- if (config->aclfile)
+ if (config->re_filterfile)
{
- add_loader(load_aclfile, config);
+ add_loader(load_re_filterfile, config);
}
-#endif /* def ACL_FILES */
-#ifdef PCRS
- if (config->re_filterfile)
+#ifdef TRUST_FILES
+ if (config->trustfile)
{
- add_loader(load_re_filterfile, config);
+ add_loader(load_trustfile, config);
}
-#endif /* def PCRS */
-\r
-#ifdef TRUST_FILES\r
- if (config->trustfile)\r
- {\r
- add_loader(load_trustfile, config);\r
- }\r
-#endif\r
+#endif
#ifdef JAR_FILES
if ( NULL != config->jarfile )
}
freez(fake_csp);
-#ifdef JAR_FILES
- /*
- * If we're logging cookies in a cookie jar, and the user has not
- * supplied any wafers, and the user has not told us to suppress the
- * vanilla wafer, then send the vanilla wafer.
- */
- if ((config->jarfile != NULL)
- && (config->wafer_list->next == NULL)
- && (suppress_vanilla_wafer == 0))
- {
- enlist(config->wafer_list, VANILLA_WAFER);
- }
-#endif /* def JAR_FILES */
-
- end_proxy_args(config);
-
#ifndef SPLIT_PROXY_ARGS
if (!suppress_blocklists)
{
/* FIXME: this is a kludge for win32 */
#if defined(_WIN32) && !defined (_WIN_CONSOLE)
- g_blockfile = config->blockfile;
- g_permissions_file = config->permissions_file;
- g_forwardfile = config->forwardfile;
-#ifdef ACL_FILES
- g_aclfile = config->aclfile;
-#endif /* def ACL_FILES */
-#ifdef USE_IMAGE_LIST
- g_imagefile = config->imagefile;
-#endif /* def USE_IMAGE_LIST */
-#ifdef PCRS\r
- g_re_filterfile = config->re_filterfile;\r
-#endif\r
-#ifdef TRUST_FILES\r
- g_trustfile = config->trustfile;\r
-#endif\r
+ g_actions_file = config->actions_file;
+ g_re_filterfile = config->re_filterfile;
+
+#ifdef TRUST_FILES
+ g_trustfile = config->trustfile;
+#endif
#endif /* defined(_WIN32) && !defined (_WIN_CONSOLE) */
projects / privoxy.git / blobdiff