X-Git-Url: http://www.privoxy.org/gitweb/?p=privoxy.git;a=blobdiff_plain;f=loadcfg.c;h=338e8ceda6265e8e12a29c356a5b0c50c77f184c;hp=4ce1d20d3ebace16e3d082f77efbca637ba884fa;hb=df84e4eef1fa09173aabc261157c6baec44c8b2d;hpb=d413f089844873c5d88bb1580357124b45fab66c diff --git a/loadcfg.c b/loadcfg.c index 4ce1d20d..338e8ced 100644 --- a/loadcfg.c +++ b/loadcfg.c @@ -1,22 +1,21 @@ -/* vim:ts=3: */ -const char loadcfg_rcs[] = "$Id: loadcfg.c,v 1.15 2001/06/07 23:13:40 jongfoster Exp $"; +const char loadcfg_rcs[] = "$Id: loadcfg.c,v 1.112 2011/03/03 14:38:36 fabiankeil Exp $"; /********************************************************************* * * File : $Source: /cvsroot/ijbswa/current/loadcfg.c,v $ * * Purpose : Loads settings from the configuration file into - * global variables. This file contains both the + * global variables. This file contains both the * routine to load the configuration and the global * variables it writes to. * - * Copyright : Written by and Copyright (C) 2001 the SourceForge - * IJBSWA team. http://ijbswa.sourceforge.net + * Copyright : Written by and Copyright (C) 2001-2009 the + * Privoxy team. http://www.privoxy.org/ * * Based on the Internet Junkbuster originally written - * by and Copyright (C) 1997 Anonymous Coders and + * by and Copyright (C) 1997 Anonymous Coders and * Junkbusters Corporation. http://www.junkbusters.com * - * This program is free software; you can redistribute it + * This program is free software; you can redistribute it * and/or modify it under the terms of the GNU General * Public License as published by the Free Software * Foundation; either version 2 of the License, or (at @@ -34,194 +33,8 @@ const char loadcfg_rcs[] = "$Id: loadcfg.c,v 1.15 2001/06/07 23:13:40 jongfoster * or write to the Free Software Foundation, Inc., 59 * Temple Place - Suite 330, Boston, MA 02111-1307, USA. * - * Revisions : - * $Log: loadcfg.c,v $ - * 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.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 - * - * jbsockets.c - * - * filled comment - * - * jcc.c - * - * support for new cgi mechansim - * - * list.c list.h - * - * functions for new list type: "map" - * extended enlist_unique - * - * miscutil.c .h - * introduced bindup() - * - * parsers.c parsers.h - * - * 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 - * - * showargs.c - * NO TIME LEFT - * - * 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 - * - * Revision 1.4 2001/05/22 18:46:04 oes - * - * - Enabled filtering banners by size rather than URL - * by adding patterns that replace all standard banner - * sizes with the "Junkbuster" gif to the re_filterfile - * - * - Enabled filtering WebBugs by providing a pattern - * which kills all 1x1 images - * - * - Added support for PCRE_UNGREEDY behaviour to pcrs, - * which is selected by the (nonstandard and therefore - * capital) letter 'U' in the option string. - * It causes the quantifiers to be ungreedy by default. - * Appending a ? turns back to greedy (!). - * - * - Added a new interceptor ijb-send-banner, which - * sends back the "Junkbuster" gif. Without imagelist or - * MSIE detection support, or if tinygif = 1, or the - * URL isn't recognized as an imageurl, a lame HTML - * explanation is sent instead. - * - * - Added new feature, which permits blocking remote - * script redirects and firing back a local redirect - * to the browser. - * The feature is conditionally compiled, i.e. it - * can be disabled with --disable-fast-redirects, - * plus it must be activated by a "fast-redirects" - * line in the config file, has its own log level - * and of course wants to be displayed by show-proxy-args - * Note: Boy, all the #ifdefs in 1001 locations and - * all the fumbling with configure.in and acconfig.h - * were *way* more work than the feature itself :-( - * - * - Because a generic redirect template was needed for - * this, tinygif = 3 now uses the same. - * - * - Moved GIFs, and other static HTTP response templates - * to project.h - * - * - Some minor fixes - * - * - Removed some >400 CRs again (Jon, you really worked - * a lot! ;-) - * - * Revision 1.3 2001/05/20 01:21:20 jongfoster - * Version 2.9.4 checkin. - * - Merged popupfile and cookiefile, and added control over PCRS - * filtering, in new "permissionsfile". - * - Implemented LOG_LEVEL_FATAL, so that if there is a configuration - * file error you now get a message box (in the Win32 GUI) rather - * than the program exiting with no explanation. - * - Made killpopup use the PCRS MIME-type checking and HTTP-header - * skipping. - * - Removed tabs from "config" - * - Moved duplicated url parsing code in "loaders.c" to a new funcition. - * - Bumped up version number. - * - * Revision 1.2 2001/05/17 23:01:01 oes - * - Cleaned CRLF's from the sources and related files - * - * Revision 1.1.1.1 2001/05/15 13:58:58 oes - * Initial import of version 2.9.3 source tree - * - * *********************************************************************/ - + #include "config.h" @@ -233,30 +46,27 @@ const char loadcfg_rcs[] = "$Id: loadcfg.c,v 1.15 2001/06/07 23:13:40 jongfoster #include #include #include +#include #ifdef _WIN32 -# include +# ifndef STRICT +# define STRICT +# endif # include -# include -# include -# ifdef TOGGLE -# include -# 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 */ +#ifndef __OS2__ # include -# include # include +#endif +# include # include # include @@ -267,14 +77,13 @@ const char loadcfg_rcs[] = "$Id: loadcfg.c,v 1.15 2001/06/07 23:13:40 jongfoster #include "jcc.h" #include "filters.h" #include "loaders.h" -#include "showargs.h" -#include "parsers.h" -#include "killpopup.h" #include "miscutil.h" #include "errlog.h" -#include "jbsockets.h" -#include "gateway.h" #include "ssplit.h" +#include "encode.h" +#include "urlmatch.h" +#include "cgi.h" +#include "gateway.h" const char loadcfg_h_rcs[] = LOADCFG_H_VERSION; @@ -289,21 +98,20 @@ 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 -/* by haroon - indicates if ijb is enabled */ -int g_bToggleIJB = 1; /* JunkBusters is enabled by default. */ -#endif +#ifdef FEATURE_TOGGLE +/* Privoxy is enabled by default. */ +int global_toggle_state = 1; +#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; +char * const * Argv = NULL; static struct file_list *current_configfile = NULL; @@ -320,37 +128,58 @@ static struct file_list *current_configfile = NULL; * console and GUI specific options last). */ -#define hash_actions_file 3825730796ul /* FIXME "permissionsfile" */ -#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_re_filterfile 3877522444ul /* "re_filterfile" */ -#define hash_single_threaded 4250084780ul /* "single-threaded" */ -#define hash_suppress_blocklists 1948693308ul /* ??? */ -#define hash_toggle 447966ul /* "toggle" */ -#define hash_trust_info_url 449869467ul /* ??? */ -#define hash_trustfile 56494766ul /* "trustfile" */ - -#define hash_hide_console 2048809870ul /* "hide-console" */ - -#define hash_activity_animation 1817904738ul /* "activity-animation" */ -#define hash_close_button_minimizes 3651284693ul /* "close-button-minimizes" */ -#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" */ - +#define hash_actions_file 1196306641ul /* "actionsfile" */ +#define hash_accept_intercepted_requests 1513024973ul /* "accept-intercepted-requests" */ +#define hash_admin_address 4112573064ul /* "admin-address" */ +#define hash_allow_cgi_request_crunching 258915987ul /* "allow-cgi-request-crunching" */ +#define hash_buffer_limit 1881726070ul /* "buffer-limit */ +#define hash_compression_level 2464423563ul /* "compression-level" */ +#define hash_confdir 1978389ul /* "confdir" */ +#define hash_connection_sharing 1348841265ul /* "connection-sharing" */ +#define hash_debug 78263ul /* "debug" */ +#define hash_default_server_timeout 2530089913ul /* "default-server-timeout" */ +#define hash_deny_access 1227333715ul /* "deny-access" */ +#define hash_enable_edit_actions 2517097536ul /* "enable-edit-actions" */ +#define hash_enable_remote_toggle 2979744683ul /* "enable-remote-toggle" */ +#define hash_enable_remote_http_toggle 110543988ul /* "enable-remote-http-toggle" */ +#define hash_enforce_blocks 1862427469ul /* "enforce-blocks" */ +#define hash_filterfile 250887266ul /* "filterfile" */ +#define hash_forward 2029845ul /* "forward" */ +#define hash_forward_socks4 3963965521ul /* "forward-socks4" */ +#define hash_forward_socks4a 2639958518ul /* "forward-socks4a" */ +#define hash_forward_socks5 3963965522ul /* "forward-socks5" */ +#define hash_forwarded_connect_retries 101465292ul /* "forwarded-connect-retries" */ +#define hash_handle_as_empty_returns_ok 1444873247ul /* "handle-as-empty-doc-returns-ok" */ +#define hash_hostname 10308071ul /* "hostname" */ +#define hash_keep_alive_timeout 3878599515ul /* "keep-alive-timeout" */ +#define hash_listen_address 1255650842ul /* "listen-address" */ +#define hash_logdir 422889ul /* "logdir" */ +#define hash_logfile 2114766ul /* "logfile" */ +#define hash_max_client_connections 3595884446ul /* "max-client-connections" */ +#define hash_permit_access 3587953268ul /* "permit-access" */ +#define hash_proxy_info_url 3903079059ul /* "proxy-info-url" */ +#define hash_single_threaded 4250084780ul /* "single-threaded" */ +#define hash_socket_timeout 1809001761ul /* "socket-timeout" */ +#define hash_split_large_cgi_forms 671658948ul /* "split-large-cgi-forms" */ +#define hash_suppress_blocklists 1948693308ul /* "suppress-blocklists" */ +#define hash_templdir 11067889ul /* "templdir" */ +#define hash_toggle 447966ul /* "toggle" */ +#define hash_trust_info_url 430331967ul /* "trust-info-url" */ +#define hash_trustfile 56494766ul /* "trustfile" */ +#define hash_usermanual 1416668518ul /* "user-manual" */ +#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" */ + + +static void savearg(char *command, char *argument, struct configuration_spec * config); /********************************************************************* * @@ -364,11 +193,13 @@ static struct file_list *current_configfile = NULL; * Returns : N/A * *********************************************************************/ -void unload_configfile (void * data) +static void unload_configfile (void * data) { struct configuration_spec * config = (struct configuration_spec *)data; struct forward_spec *cur_fwd = config->forward; -#ifdef ACL_FILES + int i; + +#ifdef FEATURE_ACL struct access_control_list *cur_acl = config->acl; while (cur_acl != NULL) @@ -378,12 +209,12 @@ void unload_configfile (void * data) cur_acl = next_acl; } config->acl = NULL; -#endif /* def ACL_FILES */ +#endif /* def FEATURE_ACL */ while (cur_fwd != NULL) { struct forward_spec * next_fwd = cur_fwd->next; - free_url(cur_fwd->url); + free_url_spec(cur_fwd->url); freez(cur_fwd->gateway_host); freez(cur_fwd->forward_host); @@ -391,36 +222,59 @@ void unload_configfile (void * data) cur_fwd = next_fwd; } config->forward = NULL; - -#ifdef JAR_FILES - if ( NULL != config->jar ) - { - fclose( config->jar ); - config->jar = NULL; - } -#endif /* def JAR_FILES */ - freez((char *)config->confdir); - freez((char *)config->logdir); + freez(config->confdir); + freez(config->logdir); + freez(config->templdir); + freez(config->hostname); - freez((char *)config->haddr); - freez((char *)config->logfile); + freez(config->haddr); + freez(config->logfile); - freez((char *)config->actions_file); + for (i = 0; i < MAX_AF_FILES; i++) + { + freez(config->actions_file_short[i]); + freez(config->actions_file[i]); + freez(config->re_filterfile_short[i]); + freez(config->re_filterfile[i]); + } -#ifdef JAR_FILES - freez((char *)config->jarfile); -#endif /* def JAR_FILES */ + freez(config->admin_address); + freez(config->proxy_info_url); + freez(config->proxy_args); + freez(config->usermanual); -#ifndef SPLIT_PROXY_ARGS - freez((char *)config->suppress_message); -#endif /* ndef SPLIT_PROXY_ARGS */ +#ifdef FEATURE_TRUST + freez(config->trustfile); + list_remove_all(config->trust_info); +#endif /* def FEATURE_TRUST */ + + freez(config); +} -#ifdef PCRS - freez((char *)config->re_filterfile); -#endif /* def PCRS */ +#ifdef FEATURE_GRACEFUL_TERMINATION +/********************************************************************* + * + * Function : unload_current_config_file + * + * Description : Unloads current config file - reset to state at + * beginning of program. + * + * Parameters : None + * + * Returns : N/A + * + *********************************************************************/ +void unload_current_config_file(void) +{ + if (current_configfile) + { + current_configfile->unloader = unload_configfile; + current_configfile = NULL; + } } +#endif /********************************************************************* @@ -429,89 +283,117 @@ void unload_configfile (void * data) * * Description : Load the config file and all parameters. * - * Parameters : - * 1 : csp = Client state (the config member will be - * filled in by this function). + * XXX: more than thousand lines long + * and thus in serious need of refactoring. * - * Returns : 0 => Ok, everything else is an error. + * Parameters : None + * + * Returns : The configuration_spec, or NULL on error. * *********************************************************************/ struct configuration_spec * load_config(void) { - char buf[BUFFER_SIZE]; + char *buf = NULL; char *p, *q; FILE *configfp = NULL; struct configuration_spec * config = NULL; struct client_state * fake_csp; struct file_list *fs; + unsigned long linenum = 0; + int i; + char *logfile = NULL; if (!check_file_changed(current_configfile, configfile, &fs)) { /* No need to load */ return ((struct configuration_spec *)current_configfile->f); } - if (!fs) + if (NULL == fs) { - log_error(LOG_LEVEL_FATAL, "can't check configuration file '%s': %E", - configfile); + log_error(LOG_LEVEL_FATAL, + "can't check configuration file '%s': %E", configfile); + return NULL; } - log_error(LOG_LEVEL_INFO, "loading configuration file '%s':", configfile); + if (NULL != current_configfile) + { + log_error(LOG_LEVEL_INFO, "Reloading configuration file '%s'", configfile); + } -#ifdef TOGGLE - g_bToggleIJB = 1; -#endif +#ifdef FEATURE_TOGGLE + global_toggle_state = 1; +#endif /* def FEATURE_TOGGLE */ fs->f = config = (struct configuration_spec *)zalloc(sizeof(*config)); - if (config==NULL) + if (NULL == config) { freez(fs->filename); freez(fs); log_error(LOG_LEVEL_FATAL, "can't allocate memory for configuration"); - /* Never get here - LOG_LEVEL_FATAL causes program exit */ + return NULL; } /* * This is backwards from how it's usually done. - * Following the usual pattern, "fs" would be stored in a member + * Following the usual pattern, "fs" would be stored in a member * variable in "csp", and then we'd access "config" from "fs->f", - * using a cast. However, "config" is used so often that a + * using a cast. However, "config" is used so often that a * cast each time would be very ugly, and the extra indirection * would waste CPU cycles. Therefore we store "config" in * "csp->config", and "fs" in "csp->config->config_file_list". */ config->config_file_list = fs; - init_proxy_args(Argc, Argv, config); - /* * Set to defaults */ + config->multi_threaded = 1; + config->buffer_limit = 4096 * 1024; + config->usermanual = strdup(USER_MANUAL_URL); + config->proxy_args = strdup(""); + config->forwarded_connect_retries = 0; + config->max_client_connections = 0; + config->socket_timeout = 300; /* XXX: Should be a macro. */ +#ifdef FEATURE_CONNECTION_KEEP_ALIVE + config->default_server_timeout = 0; + config->keep_alive_timeout = DEFAULT_KEEP_ALIVE_TIMEOUT; + config->feature_flags &= ~RUNTIME_FEATURE_CONNECTION_KEEP_ALIVE; + config->feature_flags &= ~RUNTIME_FEATURE_CONNECTION_SHARING; +#endif + config->feature_flags &= ~RUNTIME_FEATURE_CGI_TOGGLE; + config->feature_flags &= ~RUNTIME_FEATURE_SPLIT_LARGE_FORMS; + config->feature_flags &= ~RUNTIME_FEATURE_ACCEPT_INTERCEPTED_REQUESTS; + config->feature_flags &= ~RUNTIME_FEATURE_EMPTY_DOC_RETURNS_OK; +#ifdef FEATURE_COMPRESSION + /* + * XXX: Run some benchmarks to see if there are better default values. + */ + config->compression_level = 1; +#endif - config->multi_threaded = 1; - config->hport = HADDR_PORT; - - if ((configfp = fopen(configfile, "r")) == NULL) + configfp = fopen(configfile, "r"); + if (NULL == configfp) { - log_error(LOG_LEVEL_FATAL, "can't open configuration file '%s': %E", - configfile); + log_error(LOG_LEVEL_FATAL, + "can't open configuration file '%s': %E", configfile); /* Never get here - LOG_LEVEL_FATAL causes program exit */ } - while (read_config_line(buf, sizeof(buf), configfp, fs) != NULL) + while (read_config_line(configfp, &linenum, &buf) != NULL) { char cmd[BUFFER_SIZE]; char arg[BUFFER_SIZE]; char tmp[BUFFER_SIZE]; -#ifdef ACL_FILES +#ifdef FEATURE_ACL struct access_control_list *cur_acl; -#endif /* def ACL_FILES */ +#endif /* def FEATURE_ACL */ struct forward_spec *cur_fwd; int vec_count; char *vec[3]; + unsigned long directive_hash; - strcpy(tmp, buf); + strlcpy(tmp, buf, sizeof(tmp)); /* Copy command (i.e. up to space or tab) into cmd */ p = buf; @@ -529,69 +411,189 @@ struct configuration_spec * load_config(void) } /* Copy the argument into arg */ - strcpy(arg, p); + if (strlcpy(arg, p, sizeof(arg)) >= sizeof(arg)) + { + log_error(LOG_LEVEL_FATAL, "Config line too long: %s", buf); + } /* Should never happen, but check this anyway */ if (*cmd == '\0') { + freez(buf); continue; } /* Make sure the command field is lower case */ - for (p=cmd; *p; p++) + for (p = cmd; *p; p++) { if (ijb_isupper(*p)) { - *p = ijb_tolower(*p); + *p = (char)ijb_tolower(*p); } } - /* Save the argument for show-proxy-args */ - savearg(cmd, arg, config); - - - switch( hash_string( cmd ) ) + directive_hash = hash_string(cmd); + switch (directive_hash) { -/**************************************************************************** - * permissionsfile actions-file-name +/* ************************************************************************* + * 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; + i = 0; + while ((i < MAX_AF_FILES) && (NULL != config->actions_file[i])) + { + i++; + } + + if (i >= MAX_AF_FILES) + { + log_error(LOG_LEVEL_FATAL, "Too many 'actionsfile' directives in config file - limit is %d.\n" + "(You can increase this limit by changing MAX_AF_FILES in project.h and recompiling).", + MAX_AF_FILES); + } + config->actions_file_short[i] = strdup(arg); + config->actions_file[i] = make_path(config->confdir, arg); + + break; +/* ************************************************************************* + * accept-intercepted-requests + * *************************************************************************/ + case hash_accept_intercepted_requests: + if ((*arg != '\0') && (0 != atoi(arg))) + { + config->feature_flags |= RUNTIME_FEATURE_ACCEPT_INTERCEPTED_REQUESTS; + } + else + { + config->feature_flags &= ~RUNTIME_FEATURE_ACCEPT_INTERCEPTED_REQUESTS; + } + break; + +/* ************************************************************************* + * admin-address email-address + * *************************************************************************/ + case hash_admin_address : + freez(config->admin_address); + config->admin_address = strdup(arg); + break; + +/* ************************************************************************* + * allow-cgi-request-crunching + * *************************************************************************/ + case hash_allow_cgi_request_crunching: + if ((*arg != '\0') && (0 != atoi(arg))) + { + config->feature_flags |= RUNTIME_FEATURE_CGI_CRUNCHING; + } + else + { + config->feature_flags &= ~RUNTIME_FEATURE_CGI_CRUNCHING; + } + break; + +/* ************************************************************************* + * buffer-limit n + * *************************************************************************/ + case hash_buffer_limit : + config->buffer_limit = (size_t)(1024 * atoi(arg)); + break; -/**************************************************************************** +/* ************************************************************************* * confdir directory-name - ****************************************************************************/ + * *************************************************************************/ case hash_confdir : - freez((char *)config->confdir); - config->confdir = strdup(arg); - continue; + freez(config->confdir); + config->confdir = make_path( NULL, arg); + break; + +/* ************************************************************************* + * compression-level 0-9 + * *************************************************************************/ +#ifdef FEATURE_COMPRESSION + case hash_compression_level : + if (*arg != '\0') + { + int compression_level = atoi(arg); + if (-1 <= compression_level && compression_level <= 9) + { + config->compression_level = compression_level;; + } + else + { + log_error(LOG_LEVEL_FATAL, + "Invalid compression-level value: %s", arg); + } + } + else + { + log_error(LOG_LEVEL_FATAL, + "Invalid compression-level directive. Compression value missing"); + } + break; +#endif + +/* ************************************************************************* + * connection-sharing (0|1) + * *************************************************************************/ +#ifdef FEATURE_CONNECTION_SHARING + case hash_connection_sharing : + if ((*arg != '\0') && (0 != atoi(arg))) + { + config->feature_flags |= RUNTIME_FEATURE_CONNECTION_SHARING; + } + else + { + config->feature_flags &= ~RUNTIME_FEATURE_CONNECTION_SHARING; + } + break; +#endif -/**************************************************************************** +/* ************************************************************************* * debug n * Specifies debug level, multiple values are ORed together. - ****************************************************************************/ + * *************************************************************************/ case hash_debug : config->debug |= atoi(arg); - continue; + break; + +/* ************************************************************************* + * default-server-timeout timeout + * *************************************************************************/ +#ifdef FEATURE_CONNECTION_KEEP_ALIVE + case hash_default_server_timeout : + if (*arg != '\0') + { + int timeout = atoi(arg); + if (0 < timeout) + { + config->default_server_timeout = (unsigned int)timeout; + } + else + { + log_error(LOG_LEVEL_FATAL, + "Invalid default-server-timeout value: %s", arg); + } + } + break; +#endif -/**************************************************************************** +/* ************************************************************************* * deny-access source-ip[/significant-bits] [dest-ip[/significant-bits]] - ****************************************************************************/ -#ifdef ACL_FILES + * *************************************************************************/ +#ifdef FEATURE_ACL case hash_deny_access: - vec_count = ssplit(arg, " \t", vec, SZ(vec), 1, 1); + strlcpy(tmp, arg, sizeof(tmp)); + vec_count = ssplit(tmp, " \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_invocation = strsav( config->proxy_args_invocation, + string_append(&config->proxy_args, "
\nWARNING: Wrong number of parameters for " "deny-access directive in configuration file.

\n"); - continue; + break; } /* allocate a new node */ @@ -601,41 +603,47 @@ struct configuration_spec * load_config(void) { log_error(LOG_LEVEL_FATAL, "can't allocate memory for configuration"); /* Never get here - LOG_LEVEL_FATAL causes program exit */ - continue; + break; } 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_invocation = strsav( config->proxy_args_invocation, - "
\nWARNING: Invalid source IP for deny-access directive" - " in configuration file: \""); - config->proxy_args_invocation = strsav( config->proxy_args_invocation, + log_error(LOG_LEVEL_ERROR, "Invalid source address, port or netmask " + "for deny-access directive in configuration file: \"%s\"", vec[0]); + string_append(&config->proxy_args, + "
\nWARNING: Invalid source address, port or netmask " + "for deny-access directive in configuration file: \""); + string_append(&config->proxy_args, vec[0]); - config->proxy_args_invocation = strsav( config->proxy_args_invocation, + string_append(&config->proxy_args, "\"

\n"); freez(cur_acl); - continue; + break; } 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_invocation = strsav( config->proxy_args_invocation, - "
\nWARNING: Invalid destination IP for deny-access directive" - " in configuration file: \""); - config->proxy_args_invocation = strsav( config->proxy_args_invocation, - vec[0]); - config->proxy_args_invocation = strsav( config->proxy_args_invocation, + log_error(LOG_LEVEL_ERROR, "Invalid destination address, port or netmask " + "for deny-access directive in configuration file: \"%s\"", vec[1]); + string_append(&config->proxy_args, + "
\nWARNING: Invalid destination address, port or netmask " + "for deny-access directive in configuration file: \""); + string_append(&config->proxy_args, + vec[1]); + string_append(&config->proxy_args, "\"

\n"); freez(cur_acl); - continue; + break; } } +#ifdef HAVE_RFC2553 + else + { + cur_acl->wildcard_dst = 1; + } +#endif /* def HAVE_RFC2553 */ /* * Add it to the list. Note we reverse the list to get the @@ -643,29 +651,117 @@ struct configuration_spec * load_config(void) * 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 + * 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 */ + break; +#endif /* def FEATURE_ACL */ + +/* ************************************************************************* + * enable-edit-actions 0|1 + * *************************************************************************/ +#ifdef FEATURE_CGI_EDIT_ACTIONS + case hash_enable_edit_actions: + if ((*arg != '\0') && (0 != atoi(arg))) + { + config->feature_flags |= RUNTIME_FEATURE_CGI_EDIT_ACTIONS; + } + else + { + config->feature_flags &= ~RUNTIME_FEATURE_CGI_EDIT_ACTIONS; + } + break; +#endif /* def FEATURE_CGI_EDIT_ACTIONS */ + +/* ************************************************************************* + * enable-remote-toggle 0|1 + * *************************************************************************/ +#ifdef FEATURE_TOGGLE + case hash_enable_remote_toggle: + if ((*arg != '\0') && (0 != atoi(arg))) + { + config->feature_flags |= RUNTIME_FEATURE_CGI_TOGGLE; + } + else + { + config->feature_flags &= ~RUNTIME_FEATURE_CGI_TOGGLE; + } + break; +#endif /* def FEATURE_TOGGLE */ + +/* ************************************************************************* + * enable-remote-http-toggle 0|1 + * *************************************************************************/ + case hash_enable_remote_http_toggle: + if ((*arg != '\0') && (0 != atoi(arg))) + { + config->feature_flags |= RUNTIME_FEATURE_HTTP_TOGGLE; + } + else + { + config->feature_flags &= ~RUNTIME_FEATURE_HTTP_TOGGLE; + } + break; + +/* ************************************************************************* + * enforce-blocks 0|1 + * *************************************************************************/ + case hash_enforce_blocks: +#ifdef FEATURE_FORCE_LOAD + if ((*arg != '\0') && (0 != atoi(arg))) + { + config->feature_flags |= RUNTIME_FEATURE_ENFORCE_BLOCKS; + } + else + { + config->feature_flags &= ~RUNTIME_FEATURE_ENFORCE_BLOCKS; + } +#else + log_error(LOG_LEVEL_ERROR, "Ignoring directive 'enforce-blocks'. " + "FEATURE_FORCE_LOAD is disabled, blocks will always be enforced."); +#endif /* def FEATURE_FORCE_LOAD */ + break; + +/* ************************************************************************* + * filterfile file-name + * In confdir by default. + * *************************************************************************/ + case hash_filterfile : + i = 0; + while ((i < MAX_AF_FILES) && (NULL != config->re_filterfile[i])) + { + i++; + } + + if (i >= MAX_AF_FILES) + { + log_error(LOG_LEVEL_FATAL, "Too many 'filterfile' directives in config file - limit is %d.\n" + "(You can increase this limit by changing MAX_AF_FILES in project.h and recompiling).", + MAX_AF_FILES); + } + config->re_filterfile_short[i] = strdup(arg); + config->re_filterfile[i] = make_path(config->confdir, arg); -/**************************************************************************** + break; + +/* ************************************************************************* * forward url-pattern (.|http-proxy-host[:port]) - ****************************************************************************/ + * *************************************************************************/ case hash_forward: - vec_count = ssplit(arg, " \t", vec, SZ(vec), 1, 1); + strlcpy(tmp, arg, sizeof(tmp)); + vec_count = ssplit(tmp, " \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_invocation = strsav( config->proxy_args_invocation, + string_append(&config->proxy_args, "
\nWARNING: Wrong number of parameters for " "forward directive in configuration file."); - continue; + break; } /* allocate a new node */ @@ -674,7 +770,7 @@ struct configuration_spec * load_config(void) { log_error(LOG_LEVEL_FATAL, "can't allocate memory for configuration"); /* Never get here - LOG_LEVEL_FATAL causes program exit */ - continue; + break; } cur_fwd->type = SOCKS_NONE; @@ -684,10 +780,10 @@ struct configuration_spec * load_config(void) { log_error(LOG_LEVEL_ERROR, "Bad URL specifier for forward " "directive in configuration file."); - config->proxy_args_invocation = strsav( config->proxy_args_invocation, + string_append(&config->proxy_args, "
\nWARNING: Bad URL specifier for " "forward directive in configuration file."); - continue; + break; } /* Parse the parent HTTP proxy host:port */ @@ -695,40 +791,32 @@ struct configuration_spec * load_config(void) 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; - } + cur_fwd->forward_port = 8000; + parse_forwarder_address(p, &cur_fwd->forward_host, + &cur_fwd->forward_port); } /* Add to list. */ cur_fwd->next = config->forward; config->forward = cur_fwd; - continue; + break; -/**************************************************************************** +/* ************************************************************************* * forward-socks4 url-pattern socks-proxy[:port] (.|http-proxy[:port]) - ****************************************************************************/ + * *************************************************************************/ case hash_forward_socks4: - vec_count = ssplit(arg, " \t", vec, SZ(vec), 1, 1); + strlcpy(tmp, arg, sizeof(tmp)); + vec_count = ssplit(tmp, " \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_invocation = strsav( config->proxy_args_invocation, + string_append(&config->proxy_args, "
\nWARNING: Wrong number of parameters for " "forward-socks4 directive in configuration file."); - continue; + break; } /* allocate a new node */ @@ -737,7 +825,7 @@ struct configuration_spec * load_config(void) { log_error(LOG_LEVEL_FATAL, "can't allocate memory for configuration"); /* Never get here - LOG_LEVEL_FATAL causes program exit */ - continue; + break; } cur_fwd->type = SOCKS_4; @@ -747,28 +835,21 @@ struct configuration_spec * load_config(void) { log_error(LOG_LEVEL_ERROR, "Bad URL specifier for forward-socks4 " "directive in configuration file."); - config->proxy_args_invocation = strsav( config->proxy_args_invocation, + string_append(&config->proxy_args, "
\nWARNING: Bad URL specifier for " "forward-socks4 directive in configuration file."); - continue; + break; } /* Parse the SOCKS proxy host[:port] */ p = vec[1]; + /* XXX: This check looks like a bug. */ 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; - } + cur_fwd->gateway_port = 1080; + parse_forwarder_address(p, &cur_fwd->gateway_host, + &cur_fwd->gateway_port); } /* Parse the parent HTTP proxy host[:port] */ @@ -776,40 +857,33 @@ struct configuration_spec * load_config(void) 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; - } + cur_fwd->forward_port = 8000; + parse_forwarder_address(p, &cur_fwd->forward_host, + &cur_fwd->forward_port); } /* Add to list. */ cur_fwd->next = config->forward; config->forward = cur_fwd; - - continue; -/**************************************************************************** + break; + +/* ************************************************************************* * forward-socks4a url-pattern socks-proxy[:port] (.|http-proxy[:port]) - ****************************************************************************/ + * *************************************************************************/ case hash_forward_socks4a: - vec_count = ssplit(arg, " \t", vec, SZ(vec), 1, 1); + case hash_forward_socks5: + strlcpy(tmp, arg, sizeof(tmp)); + vec_count = ssplit(tmp, " \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_invocation = strsav( config->proxy_args_invocation, + string_append(&config->proxy_args, "
\nWARNING: Wrong number of parameters for " "forward-socks4a directive in configuration file."); - continue; + break; } /* allocate a new node */ @@ -818,114 +892,174 @@ struct configuration_spec * load_config(void) { log_error(LOG_LEVEL_FATAL, "can't allocate memory for configuration"); /* Never get here - LOG_LEVEL_FATAL causes program exit */ - continue; + break; } - cur_fwd->type = SOCKS_4A; + if (directive_hash == hash_forward_socks4a) + { + cur_fwd->type = SOCKS_4A; + } + else + { + cur_fwd->type = SOCKS_5; + } /* 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_invocation = strsav( config->proxy_args_invocation, + string_append(&config->proxy_args, "
\nWARNING: Bad URL specifier for " "forward-socks4a directive in configuration file."); - continue; + break; } /* 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; - } + cur_fwd->gateway_port = 1080; + parse_forwarder_address(p, &cur_fwd->gateway_host, + &cur_fwd->gateway_port); /* Parse the parent HTTP proxy host[:port] */ p = vec[2]; if (strcmp(p, ".") != 0) { - cur_fwd->forward_host = strdup(p); + cur_fwd->forward_port = 8000; + parse_forwarder_address(p, &cur_fwd->forward_host, + &cur_fwd->forward_port); + } - if ((p = strchr(cur_fwd->forward_host, ':'))) + /* Add to list. */ + cur_fwd->next = config->forward; + config->forward = cur_fwd; + + break; + +/* ************************************************************************* + * forwarded-connect-retries n + * *************************************************************************/ + case hash_forwarded_connect_retries : + config->forwarded_connect_retries = atoi(arg); + break; + +/* ************************************************************************* + * handle-as-empty-doc-returns-ok 0|1 + * + * Workaround for firefox hanging on blocked javascript pages. + * Block with the "+handle-as-empty-document" flag and set the + * "handle-as-empty-doc-returns-ok" run-time config flag so that + * Privoxy returns a 200/OK status instead of a 403/Forbidden status + * to the browser for blocked pages. + ***************************************************************************/ + case hash_handle_as_empty_returns_ok: + if ((*arg != '\0') && (0 != atoi(arg))) + { + config->feature_flags |= RUNTIME_FEATURE_EMPTY_DOC_RETURNS_OK; + } + else + { + config->feature_flags &= ~RUNTIME_FEATURE_EMPTY_DOC_RETURNS_OK; + } + break; + +/* ************************************************************************* + * hostname hostname-to-show-on-cgi-pages + * *************************************************************************/ + case hash_hostname : + freez(config->hostname); + config->hostname = strdup(arg); + if (NULL == config->hostname) + { + log_error(LOG_LEVEL_FATAL, "Out of memory saving hostname."); + } + break; + +/* ************************************************************************* + * keep-alive-timeout timeout + * *************************************************************************/ +#ifdef FEATURE_CONNECTION_KEEP_ALIVE + case hash_keep_alive_timeout : + if (*arg != '\0') + { + int timeout = atoi(arg); + if (0 < timeout) { - *p++ = '\0'; - cur_fwd->forward_port = atoi(p); + config->feature_flags |= RUNTIME_FEATURE_CONNECTION_KEEP_ALIVE; + config->keep_alive_timeout = (unsigned int)timeout; } - - if (cur_fwd->forward_port <= 0) + else { - cur_fwd->forward_port = 8000; + config->feature_flags &= ~RUNTIME_FEATURE_CONNECTION_KEEP_ALIVE; } } + break; +#endif - /* Add to list. */ - cur_fwd->next = config->forward; - config->forward = cur_fwd; - - continue; - -/**************************************************************************** - * jarfile jar-file-name - * In logdir by default - ****************************************************************************/ -#ifdef JAR_FILES - case hash_jarfile : - freez((char *)config->jarfile); - config->jarfile = make_path(config->logdir, arg); - continue; -#endif /* def JAR_FILES */ - -/**************************************************************************** +/* ************************************************************************* * listen-address [ip][:port] - ****************************************************************************/ + * *************************************************************************/ case hash_listen_address : - freez((char *)config->haddr); + freez(config->haddr); config->haddr = strdup(arg); - continue; + break; -/**************************************************************************** +/* ************************************************************************* * logdir directory-name - ****************************************************************************/ + * *************************************************************************/ case hash_logdir : - freez((char *)config->logdir); - config->logdir = strdup(arg); - continue; + freez(config->logdir); + config->logdir = make_path(NULL, arg); + break; -/**************************************************************************** +/* ************************************************************************* * logfile log-file-name * In logdir by default - ****************************************************************************/ + * *************************************************************************/ case hash_logfile : - freez((char *)config->logfile); - config->logfile = make_path(config->logdir, arg); - continue; + if (daemon_mode) + { + logfile = make_path(config->logdir, arg); + if (NULL == logfile) + { + log_error(LOG_LEVEL_FATAL, "Out of memory while creating logfile path"); + } + } + break; -/**************************************************************************** +/* ************************************************************************* + * max-client-connections number + * *************************************************************************/ + case hash_max_client_connections : + if (*arg != '\0') + { + int max_client_connections = atoi(arg); + if (0 <= max_client_connections) + { + config->max_client_connections = max_client_connections; + } + } + break; + +/* ************************************************************************* * permit-access source-ip[/significant-bits] [dest-ip[/significant-bits]] - ****************************************************************************/ -#ifdef ACL_FILES + * *************************************************************************/ +#ifdef FEATURE_ACL case hash_permit_access: - vec_count = ssplit(arg, " \t", vec, SZ(vec), 1, 1); + strlcpy(tmp, arg, sizeof(tmp)); + vec_count = ssplit(tmp, " \t", vec, SZ(vec), 1, 1); 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_invocation = strsav( config->proxy_args_invocation, + string_append(&config->proxy_args, "
\nWARNING: Wrong number of parameters for " "permit-access directive in configuration file.

\n"); - continue; + break; } /* allocate a new node */ @@ -935,42 +1069,47 @@ struct configuration_spec * load_config(void) { log_error(LOG_LEVEL_FATAL, "can't allocate memory for configuration"); /* Never get here - LOG_LEVEL_FATAL causes program exit */ - continue; + break; } 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_invocation = strsav( config->proxy_args_invocation, - "
\nWARNING: Invalid source IP for permit-access directive" - " in configuration file: \""); - config->proxy_args_invocation = strsav( config->proxy_args_invocation, + log_error(LOG_LEVEL_ERROR, "Invalid source address, port or netmask " + "for permit-access directive in configuration file: \"%s\"", vec[0]); + string_append(&config->proxy_args, + "
\nWARNING: Invalid source address, port or netmask for " + "permit-access directive in configuration file: \""); + string_append(&config->proxy_args, vec[0]); - config->proxy_args_invocation = strsav( config->proxy_args_invocation, + string_append(&config->proxy_args, "\"

\n"); freez(cur_acl); - continue; + break; } 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_invocation = strsav( config->proxy_args_invocation, - "
\nWARNING: Invalid destination IP for permit-access directive" - " in configuration file: \""); - config->proxy_args_invocation = strsav( config->proxy_args_invocation, - vec[0]); - config->proxy_args_invocation = strsav( config->proxy_args_invocation, + log_error(LOG_LEVEL_ERROR, "Invalid destination address, port or netmask " + "for permit-access directive in configuration file: \"%s\"", vec[1]); + string_append(&config->proxy_args, + "
\nWARNING: Invalid destination address, port or netmask for " + "permit-access directive in configuration file: \""); + string_append(&config->proxy_args, + vec[1]); + string_append(&config->proxy_args, "\"

\n"); freez(cur_acl); - continue; + break; } } +#ifdef HAVE_RFC2553 + else + { + cur_acl->wildcard_dst = 1; + } +#endif /* def HAVE_RFC2553 */ /* * Add it to the list. Note we reverse the list to get the @@ -978,192 +1117,226 @@ struct configuration_spec * load_config(void) * 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 + * 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 */ + break; +#endif /* def FEATURE_ACL */ -/**************************************************************************** - * re_filterfile file-name - * In confdir by default. - ****************************************************************************/ -#ifdef PCRS - case hash_re_filterfile : - freez((char *)config->re_filterfile); - config->re_filterfile = make_path(config->confdir, arg); - continue; -#endif /* def PCRS */ - -/**************************************************************************** +/* ************************************************************************* + * proxy-info-url url + * *************************************************************************/ + case hash_proxy_info_url : + freez(config->proxy_info_url); + config->proxy_info_url = strdup(arg); + break; + +/* ************************************************************************* * single-threaded - ****************************************************************************/ + * *************************************************************************/ case hash_single_threaded : config->multi_threaded = 0; - continue; - -/**************************************************************************** - * FIXME: Document this - ****************************************************************************/ -#ifndef SPLIT_PROXY_ARGS - case hash_suppress_blocklists : - if (arg[0] != '\0') + break; + +/* ************************************************************************* + * socket-timeout numer_of_seconds + * *************************************************************************/ + case hash_socket_timeout : + if (*arg != '\0') + { + int socket_timeout = atoi(arg); + if (0 < socket_timeout) + { + config->socket_timeout = socket_timeout; + } + else + { + log_error(LOG_LEVEL_FATAL, + "Invalid socket-timeout: '%s'", arg); + } + } + break; + +/* ************************************************************************* + * split-large-cgi-forms + * *************************************************************************/ + case hash_split_large_cgi_forms : + if ((*arg != '\0') && (0 != atoi(arg))) { - config->suppress_message = strdup(arg); + config->feature_flags |= RUNTIME_FEATURE_SPLIT_LARGE_FORMS; } else { - /* There will be NO reference in proxy-args. */ - config->suppress_message = NULL; + config->feature_flags &= ~RUNTIME_FEATURE_SPLIT_LARGE_FORMS; } + break; - config->suppress_blocklists = 1; - continue; -#endif /* ndef SPLIT_PROXY_ARGS */ +/* ************************************************************************* + * templdir directory-name + * *************************************************************************/ + case hash_templdir : + freez(config->templdir); + config->templdir = make_path(NULL, arg); + break; -/**************************************************************************** +/* ************************************************************************* * toggle (0|1) - ****************************************************************************/ -#ifdef TOGGLE + * *************************************************************************/ +#ifdef FEATURE_TOGGLE case hash_toggle : - g_bToggleIJB = atoi(arg); - continue; -#endif /* def TOGGLE */ - -/**************************************************************************** - * FIXME: Please document this! - ****************************************************************************/ -#ifdef TRUST_FILES + global_toggle_state = atoi(arg); + break; +#endif /* def FEATURE_TOGGLE */ + +/* ************************************************************************* + * trust-info-url url + * *************************************************************************/ +#ifdef FEATURE_TRUST case hash_trust_info_url : enlist(config->trust_info, arg); - continue; -#endif /* def TRUST_FILES */ + break; +#endif /* def FEATURE_TRUST */ -/**************************************************************************** +/* ************************************************************************* * trustfile filename * (In confdir by default.) - ****************************************************************************/ -#ifdef TRUST_FILES + * *************************************************************************/ +#ifdef FEATURE_TRUST case hash_trustfile : - freez((char *)config->trustfile); + freez(config->trustfile); config->trustfile = make_path(config->confdir, arg); - continue; -#endif /* def TRUST_FILES */ + break; +#endif /* def FEATURE_TRUST */ +/* ************************************************************************* + * usermanual url + * *************************************************************************/ + case hash_usermanual : + /* + * XXX: If this isn't the first config directive, the + * show-status page links to the website documentation + * for the directives that were already parsed. Lame. + */ + freez(config->usermanual); + config->usermanual = strdup(arg); + break; -/**************************************************************************** +/* ************************************************************************* * Win32 Console options: - ****************************************************************************/ + * *************************************************************************/ -/**************************************************************************** +/* ************************************************************************* * hide-console - ****************************************************************************/ + * *************************************************************************/ #ifdef _WIN_CONSOLE case hash_hide_console : hideConsole = 1; - continue; + break; #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; + break; -/**************************************************************************** +/* ************************************************************************* * close-button-minimizes (0|1) - ****************************************************************************/ + * *************************************************************************/ case hash_close_button_minimizes : g_bCloseHidesWindow = atoi(arg); - continue; + break; -/**************************************************************************** +/* ************************************************************************* * log-buffer-size (0|1) - ****************************************************************************/ + * *************************************************************************/ case hash_log_buffer_size : g_bLimitBufferSize = atoi(arg); - continue; + break; -/**************************************************************************** - * log-font-name fontnane - ****************************************************************************/ +/* ************************************************************************* + * log-font-name fontname + * *************************************************************************/ case hash_log_font_name : - strcpy( g_szFontFaceName, arg ); - continue; + if (strlcpy(g_szFontFaceName, arg, + sizeof(g_szFontFaceName)) >= sizeof(g_szFontFaceName)) + { + log_error(LOG_LEVEL_FATAL, + "log-font-name argument '%s' is longer than %u characters.", + arg, sizeof(g_szFontFaceName)-1); + } + break; -/**************************************************************************** +/* ************************************************************************* * log-font-size n - ****************************************************************************/ + * *************************************************************************/ case hash_log_font_size : g_nFontSize = atoi(arg); - continue; + break; -/**************************************************************************** +/* ************************************************************************* * log-highlight-messages (0|1) - ****************************************************************************/ + * *************************************************************************/ case hash_log_highlight_messages : g_bHighlightMessages = atoi(arg); - continue; + break; -/**************************************************************************** +/* ************************************************************************* * log-max-lines n - ****************************************************************************/ + * *************************************************************************/ case hash_log_max_lines : g_nMaxBufferLines = atoi(arg); - continue; + break; -/**************************************************************************** +/* ************************************************************************* * log-messages (0|1) - ****************************************************************************/ + * *************************************************************************/ case hash_log_messages : g_bLogMessages = atoi(arg); - continue; + break; -/**************************************************************************** +/* ************************************************************************* * show-on-task-bar (0|1) - ****************************************************************************/ + * *************************************************************************/ case hash_show_on_task_bar : g_bShowOnTaskBar = atoi(arg); - continue; + break; #endif /* defined(_WIN32) && ! defined(_WIN_CONSOLE) */ -/****************************************************************************/ -/* Warnings about unsupported features */ -/****************************************************************************/ -#ifndef ACL_FILES +/* ************************************************************************* + * Warnings about unsupported features + * *************************************************************************/ +#ifndef FEATURE_ACL case hash_deny_access: -#endif /* ndef ACL_FILES */ -#ifndef JAR_FILES - case hash_jarfile : -#endif /* ndef JAR_FILES */ -#ifndef ACL_FILES +#endif /* ndef FEATURE_ACL */ +#ifndef FEATURE_CGI_EDIT_ACTIONS + case hash_enable_edit_actions: +#endif /* ndef FEATURE_CGI_EDIT_ACTIONS */ +#ifndef FEATURE_TOGGLE + case hash_enable_remote_toggle: +#endif /* ndef FEATURE_TOGGLE */ +#ifndef FEATURE_ACL case hash_permit_access: -#endif /* ndef ACL_FILES */ -#ifndef PCRS - case hash_re_filterfile : -#endif /* ndef PCRS */ -#ifdef SPLIT_PROXY_ARGS - case hash_suppress_blocklists : -#endif /* def SPLIT_PROXY_ARGS */ -#ifndef TOGGLE +#endif /* ndef FEATURE_ACL */ +#ifndef FEATURE_TOGGLE case hash_toggle : -#endif /* ndef TOGGLE */ -#ifndef TRUST_FILES +#endif /* ndef FEATURE_TOGGLE */ +#ifndef FEATURE_TRUST case hash_trustfile : case hash_trust_info_url : -#endif /* ndef TRUST_FILES */ +#endif /* ndef FEATURE_TRUST */ #ifndef _WIN_CONSOLE case hash_hide_console : @@ -1182,61 +1355,110 @@ struct configuration_spec * load_config(void) #endif /* defined(_WIN_CONSOLE) || ! defined(_WIN32) */ /* These warnings are annoying - so hide them. -- Jon */ /* log_error(LOG_LEVEL_INFO, "Unsupported directive \"%s\" ignored.", cmd); */ - continue; + break; -/****************************************************************************/ +/* *************************************************************************/ 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 (%luul) in " - "configuration file: \"%s\"", hash_string( cmd ), buf); - config->proxy_args_invocation = strsav( config->proxy_args_invocation, "
\nWARNING: unrecognized directive : "); - config->proxy_args_invocation = strsav( config->proxy_args_invocation, buf); - config->proxy_args_invocation = strsav( config->proxy_args_invocation, "

\n"); - continue; - -/****************************************************************************/ + log_error(LOG_LEVEL_ERROR, "Ignoring unrecognized directive '%s' (%luul) in line %lu " + "in configuration file (%s).", buf, directive_hash, linenum, configfile); + string_append(&config->proxy_args, + " Warning: Ignoring unrecognized directive:"); + break; + +/* *************************************************************************/ } /* end switch( hash_string(cmd) ) */ + + /* Save the argument for the show-status page. */ + savearg(cmd, arg, config); + freez(buf); } /* end while ( read_config_line(...) ) */ fclose(configfp); - init_error_log(Argv[0], config->logfile, config->debug); + set_debug_level(config->debug); - if (config->actions_file) - { - add_loader(load_actions_file, config); - } + freez(config->logfile); -#ifdef PCRS - if (config->re_filterfile) + if (daemon_mode) { - add_loader(load_re_filterfile, config); + if (NULL != logfile) + { + config->logfile = logfile; + init_error_log(Argv[0], config->logfile); + } + else + { + disable_logging(); + } } -#endif /* def PCRS */ -#ifdef TRUST_FILES - if (config->trustfile) +#ifdef FEATURE_CONNECTION_KEEP_ALIVE + if (config->default_server_timeout > config->keep_alive_timeout) { - add_loader(load_trustfile, config); + log_error(LOG_LEVEL_ERROR, + "Reducing the default-server-timeout from %d to the keep-alive-timeout %d.", + config->default_server_timeout, config->keep_alive_timeout); + config->default_server_timeout = config->keep_alive_timeout; } -#endif +#endif /* def FEATURE_CONNECTION_KEEP_ALIVE */ -#ifdef JAR_FILES - if ( NULL != config->jarfile ) +#ifdef FEATURE_CONNECTION_SHARING + if (config->feature_flags & RUNTIME_FEATURE_CONNECTION_KEEP_ALIVE) { - if ( NULL == (config->jar = fopen(config->jarfile, "a")) ) + if (config->multi_threaded) { - log_error(LOG_LEVEL_FATAL, "can't open jarfile '%s': %E", config->jarfile); - /* Never get here - LOG_LEVEL_FATAL causes program exit */ + set_keep_alive_timeout(config->keep_alive_timeout); } - setbuf(config->jar, NULL); + else + { + /* + * While we could use keep-alive without multiple threads + * if we didn't bother with enforcing the connection timeout, + * that might make Tor users sad, even though they shouldn't + * enable the single-threaded option anyway. + * + * XXX: We could still use Proxy-Connection: keep-alive. + */ + config->feature_flags &= ~RUNTIME_FEATURE_CONNECTION_KEEP_ALIVE; + log_error(LOG_LEVEL_ERROR, + "Config option single-threaded disables connection keep-alive."); + } + } + else if ((config->feature_flags & RUNTIME_FEATURE_CONNECTION_SHARING)) + { + log_error(LOG_LEVEL_ERROR, "Config option connection-sharing " + "has no effect if keep-alive-timeout isn't set."); + config->feature_flags &= ~RUNTIME_FEATURE_CONNECTION_SHARING; + } +#endif /* def FEATURE_CONNECTION_SHARING */ + + if (NULL == config->proxy_args) + { + log_error(LOG_LEVEL_FATAL, "Out of memory loading config - insufficient memory for config->proxy_args"); + } + + if (config->actions_file[0]) + { + add_loader(load_action_files, config); + } + + if (config->re_filterfile[0]) + { + add_loader(load_re_filterfiles, config); + } + +#ifdef FEATURE_TRUST + if (config->trustfile) + { + add_loader(load_trustfile, config); } -#endif /* def JAR_FILES */ +#endif /* def FEATURE_TRUST */ if ( NULL == config->haddr ) { @@ -1245,24 +1467,32 @@ struct configuration_spec * load_config(void) if ( NULL != config->haddr ) { - if ((p = strchr(config->haddr, ':'))) + if ((*config->haddr == '[') + && (NULL != (p = strchr(config->haddr, ']'))) + && (p[1] == ':') + && (0 < (config->hport = atoi(p + 2)))) { - *p++ = '\0'; - if (*p) - { - config->hport = atoi(p); - } + *p = '\0'; + memmove((void *)config->haddr, config->haddr + 1, + (size_t)(p - config->haddr)); } - - if (config->hport <= 0) + else if (NULL != (p = strchr(config->haddr, ':')) + && (0 < (config->hport = atoi(p + 1)))) + { + *p = '\0'; + } + else { - *--p = ':'; log_error(LOG_LEVEL_FATAL, "invalid bind port spec %s", config->haddr); /* Never get here - LOG_LEVEL_FATAL causes program exit */ } if (*config->haddr == '\0') { - config->haddr = NULL; + /* + * Only the port specified. We stored it in config->hport + * and don't need its text representation anymore. + */ + freez(config->haddr); } } @@ -1282,24 +1512,18 @@ 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; -#ifdef PCRS - g_re_filterfile = config->re_filterfile; -#endif -#ifdef TRUST_FILES + g_default_actions_file = config->actions_file[1]; /* FIXME Hope this is default.action */ + g_user_actions_file = config->actions_file[2]; /* FIXME Hope this is user.action */ + g_default_filterfile = config->re_filterfile[0]; /* FIXME Hope this is default.filter */ + g_user_filterfile = config->re_filterfile[1]; /* FIXME Hope this is user.filter */ + +#ifdef FEATURE_TRUST g_trustfile = config->trustfile; -#endif - +#endif /* def FEATURE_TRUST */ + #endif /* defined(_WIN32) && !defined (_WIN_CONSOLE) */ /* FIXME: end kludge */ @@ -1350,6 +1574,87 @@ struct configuration_spec * load_config(void) } +/********************************************************************* + * + * Function : savearg + * + * Description : Called from `load_config'. It saves each non-empty + * and non-comment line from config into + * config->proxy_args. This is used to create the + * show-proxy-args page. On error, frees + * config->proxy_args and sets it to NULL + * + * Parameters : + * 1 : command = config setting that was found + * 2 : argument = the setting's argument (if any) + * 3 : config = Configuration to save into. + * + * Returns : N/A + * + *********************************************************************/ +static void savearg(char *command, char *argument, struct configuration_spec * config) +{ + char * buf; + char * s; + + assert(command); + assert(argument); + + /* + * Add config option name embedded in + * link to its section in the user-manual + */ + buf = strdup("\nusermanual, "file://", 7) || + !strncmpic(config->usermanual, "http", 4)) + { + string_append(&buf, config->usermanual); + } + else + { + string_append(&buf, "http://" CGI_SITE_2_HOST "/user-manual/"); + } + string_append(&buf, CONFIG_HELP_PREFIX); + string_join (&buf, string_toupper(command)); + string_append(&buf, "\">"); + string_append(&buf, command); + string_append(&buf, " "); + + if (NULL == buf) + { + freez(config->proxy_args); + return; + } + + if ( (NULL != argument) && ('\0' != *argument) ) + { + s = html_encode(argument); + if (NULL == s) + { + freez(buf); + freez(config->proxy_args); + return; + } + + if (strncmpic(argument, "http://", 7) == 0) + { + string_append(&buf, ""); + string_join (&buf, s); + string_append(&buf, ""); + } + else + { + string_join (&buf, s); + } + } + + string_append(&buf, "
"); + string_join(&config->proxy_args, buf); +} + + /* Local Variables: tab-width: 3