X-Git-Url: http://www.privoxy.org/gitweb/?p=privoxy.git;a=blobdiff_plain;f=loadcfg.c;h=18db099187adae7d9c226ca7b1ff94986fbe0ead;hp=e5b656475d18307fcddaf638b698de47a05bcfce;hb=622f8b00129cfb6abeb0d90f095b5ca5dd9d6c35;hpb=41bf6ada0fed388cf0f11c2ca6a4bf0cebc01afe diff --git a/loadcfg.c b/loadcfg.c index e5b65647..18db0991 100644 --- a/loadcfg.c +++ b/loadcfg.c @@ -1,4 +1,4 @@ -const char loadcfg_rcs[] = "$Id: loadcfg.c,v 1.11 2001/06/04 18:31:58 swa Exp $"; +const char loadcfg_rcs[] = "$Id: loadcfg.c,v 1.19 2001/07/15 17:45:16 jongfoster Exp $"; /********************************************************************* * * File : $Source: /cvsroot/ijbswa/current/loadcfg.c,v $ @@ -35,67 +35,49 @@ const char loadcfg_rcs[] = "$Id: loadcfg.c,v 1.11 2001/06/04 18:31:58 swa Exp $" * * Revisions : * $Log: loadcfg.c,v $ - * 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.10 2001/06/03 11:03:48 oes - * Makefile/in - * - * introduced cgi.c - * - * actions.c: - * - * adapted to new enlist_unique arg format - * - * conf loadcfg.c - * - * introduced confdir option - * - * filters.c filtrers.h - * - * extracted-CGI relevant stuff + * Revision 1.19 2001/07/15 17:45:16 jongfoster + * Removing some unused #includes * - * jbsockets.c + * Revision 1.18 2001/07/13 14:01:14 oes + * - Removed all #ifdef PCRS + * - Removed vim-settings * - * filled comment + * 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 * - * jcc.c + * Revision 1.16 2001/06/09 10:55:28 jongfoster + * Changing BUFSIZ ==> BUFFER_SIZE * - * support for new cgi mechansim + * 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. * - * list.c list.h + * Revision 1.14 2001/06/07 14:46:25 joergs + * Missing make_path() added for re_filterfile. * - * functions for new list type: "map" - * extended enlist_unique + * Revision 1.13 2001/06/05 22:33:54 jongfoster * - * miscutil.c .h - * introduced bindup() + * Fixed minor memory leak. + * Also now uses make_path to prepend the pathnames. * - * parsers.c parsers.h + * Revision 1.12 2001/06/05 20:04:09 jongfoster + * Now uses _snprintf() in place of snprintf() under Win32. * - * deleted const struct interceptors - * - * pcrs.c - * added FIXME - * - * project.h - * - * added struct map - * added struct http_response - * changes struct interceptors to struct cgi_dispatcher - * moved HTML stuff to cgi.h - * - * re_filterfile: - * - * changed + * 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 * - * showargs.c - * NO TIME LEFT + * 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. @@ -219,13 +201,7 @@ const char loadcfg_rcs[] = "$Id: loadcfg.c,v 1.11 2001/06/04 18:31:58 swa Exp $" #ifdef _WIN32 -# include # include -# include -# include -# ifdef TOGGLE -# include -# endif /* def TOGGLE */ # include "win32.h" # ifndef _WIN_CONSOLE @@ -257,6 +233,7 @@ const char loadcfg_rcs[] = "$Id: loadcfg.c,v 1.11 2001/06/04 18:31:58 swa Exp $" #include "errlog.h" #include "jbsockets.h" #include "gateway.h" +#include "ssplit.h" const char loadcfg_h_rcs[] = LOADCFG_H_VERSION; @@ -271,18 +248,17 @@ 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)) -#ifdef TOGGLE +#ifdef FEATURE_TOGGLE /* by haroon - indicates if ijb is enabled */ int g_bToggleIJB = 1; /* JunkBusters is enabled by default. */ -#endif +#endif /* def FEATURE_TOGGLE */ /* The filename of the configfile */ 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; @@ -297,36 +273,42 @@ static struct file_list *current_configfile = 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_aclfile 1908516ul -#define hash_actions_file 3825730796ul /* FIXME "permissionsfile" */ -#define hash_debug 78263ul -#define hash_confdir 1978389lu -#define hash_logdir 422889lu -#define hash_forwardfile 1268669141ul -#define hash_jarfile 2046641ul -#define hash_listen_address 1255650842ul -#define hash_logfile 2114766ul -#define hash_re_filterfile 3877522444ul -#define hash_single_threaded 4250084780ul -#define hash_suppress_blocklists 1948693308ul -#define hash_toggle 447966ul -#define hash_trust_info_url 449869467ul -#define hash_trustfile 56494766ul - -#define hash_hide_console 2048809870ul - -#define hash_activity_animation 1817904738ul -#define hash_close_button_minimizes 3651284693ul -#define hash_log_buffer_size 2918070425ul -#define hash_log_font_name 2866730124ul -#define hash_log_font_size 2866731014ul -#define hash_log_highlight_messages 4032101240ul -#define hash_log_max_lines 2868344173ul -#define hash_log_messages 2291744899ul -#define hash_show_on_task_bar 215410365ul +#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" */ @@ -345,36 +327,55 @@ static struct file_list *current_configfile = NULL; void unload_configfile (void * data) { struct configuration_spec * config = (struct configuration_spec *)data; + struct forward_spec *cur_fwd = config->forward; +#ifdef FEATURE_ACL + 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 FEATURE_ACL */ + + while (cur_fwd != NULL) + { + struct forward_spec * next_fwd = cur_fwd->next; + free_url(cur_fwd->url); -#ifdef JAR_FILES + freez(cur_fwd->gateway_host); + freez(cur_fwd->forward_host); + free(cur_fwd); + cur_fwd = next_fwd; + } + config->forward = NULL; + +#ifdef FEATURE_COOKIE_JAR if ( NULL != config->jar ) { fclose( config->jar ); config->jar = NULL; } -#endif /* def JAR_FILES */ +#endif /* def FEATURE_COOKIE_JAR */ + + freez((char *)config->confdir); + freez((char *)config->logdir); freez((char *)config->haddr); freez((char *)config->logfile); freez((char *)config->actions_file); - freez((char *)config->forwardfile); + freez((char *)config->admin_address); + freez((char *)config->proxy_info_url); + freez((char *)config->proxy_args); -#ifdef ACL_FILES - freez((char *)config->aclfile); -#endif /* def ACL_FILES */ - -#ifdef JAR_FILES +#ifdef FEATURE_COOKIE_JAR freez((char *)config->jarfile); -#endif /* def JAR_FILES */ - -#ifndef SPLIT_PROXY_ARGS - freez((char *)config->suppress_message); -#endif /* ndef SPLIT_PROXY_ARGS */ +#endif /* def FEATURE_COOKIE_JAR */ -#ifdef PCRS freez((char *)config->re_filterfile); -#endif /* def PCRS */ } @@ -394,12 +395,11 @@ void unload_configfile (void * data) *********************************************************************/ struct configuration_spec * load_config(void) { - char buf[BUFSIZ]; + char buf[BUFFER_SIZE]; char *p, *q; FILE *configfp = NULL; struct configuration_spec * config = NULL; struct client_state * fake_csp; - struct file_list *fs; if (!check_file_changed(current_configfile, configfile, &fs)) @@ -415,9 +415,9 @@ struct configuration_spec * load_config(void) log_error(LOG_LEVEL_INFO, "loading configuration file '%s':", configfile); -#ifdef TOGGLE +#ifdef FEATURE_TOGGLE g_bToggleIJB = 1; -#endif +#endif /* def FEATURE_TOGGLE */ fs->f = config = (struct configuration_spec *)zalloc(sizeof(*config)); @@ -440,8 +440,6 @@ struct configuration_spec * load_config(void) */ config->config_file_list = fs; - init_proxy_args(Argc, Argv, config); - /* * Set to defaults */ @@ -458,11 +456,15 @@ struct configuration_spec * load_config(void) while (read_config_line(buf, sizeof(buf), configfp, fs) != NULL) { - char cmd[BUFSIZ]; - char arg[BUFSIZ]; - char tmp[BUFSIZ]; - - char arg2[BUFSIZ]; + char cmd[BUFFER_SIZE]; + char arg[BUFFER_SIZE]; + char tmp[BUFFER_SIZE]; +#ifdef FEATURE_ACL + struct access_control_list *cur_acl; +#endif /* def FEATURE_ACL */ + struct forward_spec *cur_fwd; + int vec_count; + char *vec[3]; strcpy(tmp, buf); @@ -505,196 +507,643 @@ struct configuration_spec * load_config(void) switch( hash_string( cmd ) ) { -#ifdef TRUST_FILES - case hash_trustfile : - freez((char *)config->trustfile); - snprintf(arg2, BUFSIZ, "%s/%s", config->confdir, arg); - config->trustfile = strdup(arg2); +/**************************************************************************** + * 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; - case hash_confdir : - config->confdir = strdup(arg); - continue; +/**************************************************************************** + * deny-access source-ip[/significant-bits] [dest-ip[/significant-bits]] + ****************************************************************************/ +#ifdef FEATURE_ACL + case hash_deny_access: + vec_count = ssplit(arg, " \t", vec, SZ(vec), 1, 1); - case hash_logdir : - config->logdir = strdup(arg); - continue; + 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, + "
\nWARNING: Wrong number of parameters for " + "deny-access directive in configuration file.

\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) + { + 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, + "
\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, + "\"

\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 deny-access " + "directive in configuration file: \"%s\"", vec[0]); + config->proxy_args = strsav( config->proxy_args, + "
\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, + "\"

\n"); + freez(cur_acl); + continue; + } + } + + /* + * 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; - case hash_single_threaded : - config->multi_threaded = 0; continue; +#endif /* def FEATURE_ACL */ + +/**************************************************************************** + * 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, + "
\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, + "
\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++ = '\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; - case hash_actions_file : - freez((char *)config->actions_file); - snprintf(arg2, BUFSIZ, "%s/%s", config->confdir, arg); - config->actions_file = strdup(arg2); continue; - case hash_logfile : - freez((char *)config->logfile); - snprintf(arg2, BUFSIZ, "%s/%s", config->logdir, arg); - config->logfile = strdup(arg2); +/**************************************************************************** + * 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, "Wrong number of parameters for " + "forward-socks4 directive in configuration file."); + config->proxy_args = strsav( config->proxy_args, + "
\nWARNING: Wrong number of parameters for " + "forward-socks4 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_4; + + /* 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, + "
\nWARNING: Bad URL specifier for " + "forward-socks4 directive in configuration file."); + continue; + } + + /* Parse the SOCKS proxy host[:port] */ + p = vec[1]; + + if (strcmp(p, ".") != 0) + { + 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; + +/**************************************************************************** + * 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, + "
\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, + "
\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; -#ifdef JAR_FILES +/**************************************************************************** + * jarfile jar-file-name + * In logdir by default + ****************************************************************************/ +#ifdef FEATURE_COOKIE_JAR case hash_jarfile : freez((char *)config->jarfile); - snprintf(arg2, BUFSIZ, "%s/%s", config->logdir, arg); - config->jarfile = strdup(arg2); + config->jarfile = make_path(config->logdir, arg); continue; -#endif /* def JAR_FILES */ +#endif /* def FEATURE_COOKIE_JAR */ +/**************************************************************************** + * listen-address [ip][:port] + ****************************************************************************/ case hash_listen_address : freez((char *)config->haddr); config->haddr = strdup(arg); continue; - case hash_forwardfile : - freez((char *)config->forwardfile); - snprintf(arg2, BUFSIZ, "%s/%s", config->confdir, arg); - config->forwardfile = strdup(arg2); - continue; +/**************************************************************************** + * logdir directory-name + ****************************************************************************/ + case hash_logdir : + freez((char *)config->logdir); + config->logdir = strdup(arg); + continue; -#ifdef ACL_FILES - case hash_aclfile : - freez((char *)config->aclfile); - snprintf(arg2, BUFSIZ, "%s/%s", config->confdir, arg); - config->aclfile = strdup(arg2); +/**************************************************************************** + * logfile log-file-name + * In logdir by default + ****************************************************************************/ + case hash_logfile : + freez((char *)config->logfile); + config->logfile = make_path(config->logdir, arg); continue; -#endif /* def ACL_FILES */ -#ifdef PCRS - case hash_re_filterfile : - freez((char *)config->re_filterfile); - config->re_filterfile = strdup(arg); - continue; -#endif /* def PCRS */ +/**************************************************************************** + * permit-access source-ip[/significant-bits] [dest-ip[/significant-bits]] + ****************************************************************************/ +#ifdef FEATURE_ACL + case hash_permit_access: + vec_count = ssplit(arg, " \t", vec, SZ(vec), 1, 1); -#ifdef _WIN_CONSOLE - case hash_hide_console : - hideConsole = 1; - continue; -#endif /*def _WIN_CONSOLE*/ + 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, + "
\nWARNING: Wrong number of parameters for " + "permit-access directive in configuration file.

\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_PERMIT; -#ifndef SPLIT_PROXY_ARGS - case hash_suppress_blocklists : - if (arg[0] != '\0') + if (acl_addr(vec[0], cur_acl->src) < 0) { - config->suppress_message = strdup(arg); + 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, + "
\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, + "\"

\n"); + freez(cur_acl); + continue; } - else + if (vec_count == 2) { - /* There will be NO reference in proxy-args. */ - config->suppress_message = NULL; + 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, + "
\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, + "\"

\n"); + freez(cur_acl); + continue; + } } - config->suppress_blocklists = 1; + /* + * 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 FEATURE_ACL */ + +/**************************************************************************** + * proxy-info-url url + ****************************************************************************/ + case hash_proxy_info_url : + freez((char *)config->proxy_info_url); + config->proxy_info_url = strdup(arg); + continue; + +/**************************************************************************** + * 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; + +/**************************************************************************** + * single-threaded + ****************************************************************************/ + case hash_single_threaded : + config->multi_threaded = 0; continue; -#endif /* ndef SPLIT_PROXY_ARGS */ -#ifdef TOGGLE +/**************************************************************************** + * toggle (0|1) + ****************************************************************************/ +#ifdef FEATURE_TOGGLE case hash_toggle : g_bToggleIJB = atoi(arg); continue; -#endif /* def TOGGLE */ +#endif /* def FEATURE_TOGGLE */ + +/**************************************************************************** + * trust-info-url url + ****************************************************************************/ +#ifdef FEATURE_TRUST + case hash_trust_info_url : + enlist(config->trust_info, arg); + continue; +#endif /* def FEATURE_TRUST */ + +/**************************************************************************** + * trustfile filename + * (In confdir by default.) + ****************************************************************************/ +#ifdef FEATURE_TRUST + case hash_trustfile : + freez((char *)config->trustfile); + config->trustfile = make_path(config->confdir, arg); + continue; +#endif /* def FEATURE_TRUST */ + + +/**************************************************************************** + * 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 PCRS - case hash_re_filterfile : -#endif /* ndef PCRS */ -#ifndef TOGGLE +/****************************************************************************/ +/* Warnings about unsupported features */ +/****************************************************************************/ +#ifndef FEATURE_ACL + case hash_deny_access: +#endif /* ndef FEATURE_ACL */ +#ifndef FEATURE_COOKIE_JAR + case hash_jarfile : +#endif /* ndef FEATURE_COOKIE_JAR */ +#ifndef FEATURE_ACL + case hash_permit_access: +#endif /* ndef FEATURE_ACL */ +#ifndef FEATURE_TOGGLE case hash_toggle : -#endif /* ndef TOGGLE */ +#endif /* ndef FEATURE_TOGGLE */ +#ifndef FEATURE_TRUST + case hash_trustfile : + case hash_trust_info_url : +#endif /* ndef FEATURE_TRUST */ + +#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 */ -#ifndef JAR_FILES - case hash_jarfile : -#endif /* ndef JAR_FILES */ -#ifndef ACL_FILES - case hash_aclfile : -#endif /* ndef ACL_FILES */ -#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, "
\nWARNING: unrecognized directive : %s

\n", buf ); - config->proxy_args_invocation = strsav( config->proxy_args_invocation, p ); - freez( p ); - } + config->proxy_args = strsav( config->proxy_args, "
\nWARNING: unrecognized directive : "); + config->proxy_args = strsav( config->proxy_args, buf); + config->proxy_args = strsav( config->proxy_args, "

\n"); continue; + +/****************************************************************************/ } /* end switch( hash_string(cmd) ) */ } /* end while ( read_config_line(...) ) */ @@ -707,33 +1156,19 @@ struct configuration_spec * load_config(void) add_loader(load_actions_file, config); } - if (config->forwardfile) - { - add_loader(load_forwardfile, config); - } - -#ifdef ACL_FILES - if (config->aclfile) - { - add_loader(load_aclfile, config); - } -#endif /* def ACL_FILES */ - -#ifdef PCRS if (config->re_filterfile) { add_loader(load_re_filterfile, config); } -#endif /* def PCRS */ -#ifdef TRUST_FILES +#ifdef FEATURE_TRUST if (config->trustfile) { add_loader(load_trustfile, config); } -#endif +#endif /* def FEATURE_TRUST */ -#ifdef JAR_FILES +#ifdef FEATURE_COOKIE_JAR if ( NULL != config->jarfile ) { if ( NULL == (config->jar = fopen(config->jarfile, "a")) ) @@ -743,7 +1178,7 @@ struct configuration_spec * load_config(void) } setbuf(config->jar, NULL); } -#endif /* def JAR_FILES */ +#endif /* def FEATURE_COOKIE_JAR */ if ( NULL == config->haddr ) { @@ -789,27 +1224,15 @@ struct configuration_spec * load_config(void) } freez(fake_csp); -#ifndef SPLIT_PROXY_ARGS - if (!suppress_blocklists) - { - fs->proxy_args = strsav(fs->proxy_args, ""); - } -#endif /* ndef SPLIT_PROXY_ARGS */ - /* FIXME: this is a kludge for win32 */ #if defined(_WIN32) && !defined (_WIN_CONSOLE) g_actions_file = config->actions_file; - g_forwardfile = config->forwardfile; -#ifdef ACL_FILES - g_aclfile = config->aclfile; -#endif /* def ACL_FILES */ -#ifdef PCRS g_re_filterfile = config->re_filterfile; -#endif -#ifdef TRUST_FILES + +#ifdef FEATURE_TRUST g_trustfile = config->trustfile; -#endif +#endif /* def FEATURE_TRUST */ #endif /* defined(_WIN32) && !defined (_WIN_CONSOLE) */