X-Git-Url: http://www.privoxy.org/gitweb/?p=privoxy.git;a=blobdiff_plain;f=loadcfg.c;h=ac8684835ef744db68f986390ecd90fae628a45d;hp=57c0e0f88437bed22362af2b203583b0f08c04b9;hb=a63e355db41838804a61f8c39fe9227d4978d9a0;hpb=2d3dd2f6cca48a8370fffd4a82589bd9356a6f0f diff --git a/loadcfg.c b/loadcfg.c index 57c0e0f8..ac868483 100644 --- a/loadcfg.c +++ b/loadcfg.c @@ -1,4 +1,4 @@ -const char loadcfg_rcs[] = "$Id: loadcfg.c,v 1.55 2006/11/28 15:31:52 fabiankeil Exp $"; +const char loadcfg_rcs[] = "$Id: loadcfg.c,v 1.116 2011/07/08 13:29:39 fabiankeil Exp $"; /********************************************************************* * * File : $Source: /cvsroot/ijbswa/current/loadcfg.c,v $ @@ -8,7 +8,7 @@ const char loadcfg_rcs[] = "$Id: loadcfg.c,v 1.55 2006/11/28 15:31:52 fabiankeil * routine to load the configuration and the global * variables it writes to. * - * Copyright : Written by and Copyright (C) 2001 the SourceForge + * Copyright : Written by and Copyright (C) 2001-2009 the * Privoxy team. http://www.privoxy.org/ * * Based on the Internet Junkbuster originally written @@ -33,333 +33,8 @@ const char loadcfg_rcs[] = "$Id: loadcfg.c,v 1.55 2006/11/28 15:31:52 fabiankeil * 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.55 2006/11/28 15:31:52 fabiankeil - * Fix memory leak in case of config file reloads. - * - * Revision 1.54 2006/10/21 16:04:22 fabiankeil - * Modified kludge for win32 to make ming32 menu - * "Options/Edit Filters" (sort of) work again. - * Same limitations as for the action files apply. - * Fixes BR 1567373. - * - * Revision 1.53 2006/09/06 18:45:03 fabiankeil - * Incorporate modified version of Roland Rosenfeld's patch to - * optionally access the user-manual via Privoxy. Closes patch 679075. - * - * Formatting changed to Privoxy style, added call to - * cgi_error_no_template if the requested file doesn't - * exist and modified check whether or not Privoxy itself - * should serve the manual. Should work cross-platform now. - * - * Revision 1.52 2006/09/06 10:43:32 fabiankeil - * Added config option enable-remote-http-toggle - * to specify if Privoxy should recognize special - * headers (currently only X-Filter) to change its - * behaviour. Disabled by default. - * - * Revision 1.51 2006/09/06 09:23:37 fabiankeil - * Make number of retries in case of forwarded-connect problems - * a config file option (forwarded-connect-retries) and use 0 as - * default. - * - * Revision 1.50 2006/07/18 14:48:46 david__schmidt - * Reorganizing the repository: swapping out what was HEAD (the old 3.1 branch) - * with what was really the latest development (the v_3_0_branch branch) - * - * Revision 1.48.2.7 2006/02/02 17:29:16 david__schmidt - * Don't forget to malloc space for the null terminator... - * - * Revision 1.48.2.6 2006/01/29 23:10:56 david__schmidt - * Multiple filter file support - * - * Revision 1.48.2.5 2003/05/08 15:17:25 oes - * Closed two memory leaks; hopefully the last remaining ones - * (in the main execution paths, anyway). - * - * Revision 1.48.2.4 2003/04/11 12:06:14 oes - * Addressed bug #719435 - * - Extraneous filterfile directives now logged as errors - * - This and unrecnonised directives now really obvious on status page - * - * Revision 1.48.2.3 2003/03/11 11:53:59 oes - * Cosmetic: Renamed cryptic variable - * - * Revision 1.48.2.2 2002/11/12 16:28:20 oes - * Move unrelated variable declaration out of #ifdef FEATURE_ACL; fixes bug #636655 - * - * Revision 1.48.2.1 2002/08/21 17:58:05 oes - * Temp kludge to let user and default action file be edited through win32 GUI (FR 592080) - * - * Revision 1.48 2002/05/14 21:30:38 oes - * savearg now uses own linking code instead of (now special-cased) add_help_link - * - * Revision 1.47 2002/05/12 21:36:29 jongfoster - * Correcting function comments - * - * Revision 1.46 2002/04/26 12:55:14 oes - * - New option "user-manual", defaults to our site - * via project.h #define - * - savearg now embeds option names in help links - * - * Revision 1.45 2002/04/24 02:11:54 oes - * Jon's multiple AF patch: Allow up to MAX_AF_FILES actionsfile options - * - * Revision 1.44 2002/04/08 20:37:13 swa - * fixed JB spelling - * - * Revision 1.43 2002/04/08 20:36:50 swa - * fixed JB spelling - * - * Revision 1.42 2002/04/05 15:50:15 oes - * fix for invalid HTML proxy_args - * - * Revision 1.41 2002/03/31 17:19:00 jongfoster - * Win32 only: Enabling STRICT to fix a VC++ compile warning. - * - * Revision 1.40 2002/03/26 22:29:55 swa - * we have a new homepage! - * - * Revision 1.39 2002/03/24 13:25:43 swa - * name change related issues - * - * Revision 1.38 2002/03/24 13:05:48 jongfoster - * Renaming re_filterfile to filterfile - * - * Revision 1.37 2002/03/16 23:54:06 jongfoster - * Adding graceful termination feature, to help look for memory leaks. - * If you enable this (which, by design, has to be done by hand - * editing config.h) and then go to http://i.j.b/die, then the program - * will exit cleanly after the *next* request. It should free all the - * memory that was used. - * - * Revision 1.36 2002/03/13 00:27:05 jongfoster - * Killing warnings - * - * Revision 1.35 2002/03/07 03:52:44 oes - * Set logging to tty for --no-daemon mode - * - * Revision 1.34 2002/03/06 23:14:35 jongfoster - * Trivial cosmetic changes to make function comments easier to find. - * - * Revision 1.33 2002/03/05 04:52:42 oes - * Deleted non-errlog debugging code - * - * Revision 1.32 2002/03/04 18:24:53 oes - * Re-enabled output of unknown config directive hash - * - * Revision 1.31 2002/03/03 15:07:20 oes - * Re-enabled automatic config reloading - * - * Revision 1.30 2002/01/22 23:31:43 jongfoster - * Replacing strsav() with string_append() - * - * Revision 1.29 2002/01/17 21:02:30 jongfoster - * Moving all our URL and URL pattern parsing code to urlmatch.c. - * - * Renaming free_url to free_url_spec, since it frees a struct url_spec. - * - * Revision 1.28 2001/12/30 14:07:32 steudten - * - Add signal handling (unix) - * - Add SIGHUP handler (unix) - * - Add creation of pidfile (unix) - * - Add action 'top' in rc file (RH) - * - Add entry 'SIGNALS' to manpage - * - Add exit message to logfile (unix) - * - * Revision 1.27 2001/11/07 00:02:13 steudten - * Add line number in error output for lineparsing for - * actionsfile and configfile. - * Special handling for CLF added. - * - * Revision 1.26 2001/11/05 21:41:43 steudten - * Add changes to be a real daemon just for unix os. - * (change cwd to /, detach from controlling tty, set - * process group and session leader to the own process. - * Add DBG() Macro. - * Add some fatal-error log message for failed malloc(). - * Add '-d' if compiled with 'configure --with-debug' to - * enable debug output. - * - * Revision 1.25 2001/10/25 03:40:48 david__schmidt - * Change in porting tactics: OS/2's EMX porting layer doesn't allow multiple - * threads to call select() simultaneously. So, it's time to do a real, live, - * native OS/2 port. See defines for __EMX__ (the porting layer) vs. __OS2__ - * (native). Both versions will work, but using __OS2__ offers multi-threading. - * - * Revision 1.24 2001/10/23 21:40:30 jongfoster - * Added support for enable-edit-actions and enable-remote-toggle config - * file options. - * - * Revision 1.23 2001/10/07 15:36:00 oes - * Introduced new config option "buffer-limit" - * - * Revision 1.22 2001/09/22 16:36:59 jongfoster - * Removing unused parameter fs from read_config_line() - * - * Revision 1.21 2001/09/16 17:10:43 jongfoster - * Moving function savearg() here, since it was the only thing left in - * showargs.c. - * - * Revision 1.20 2001/07/30 22:08:36 jongfoster - * Tidying up #defines: - * - All feature #defines are now of the form FEATURE_xxx - * - Permanently turned off WIN_GUI_EDIT - * - Permanently turned on WEBDAV and SPLIT_PROXY_ARGS - * - * Revision 1.19 2001/07/15 17:45:16 jongfoster - * Removing some unused #includes - * - * Revision 1.18 2001/07/13 14:01:14 oes - * - Removed all #ifdef PCRS - * - Removed vim-settings - * - * Revision 1.17 2001/06/29 13:31:03 oes - * - Improved comments - * - Fixed (actionsfile) and sorted hashes - * - Introduced admin_address and proxy-info-url - * as config parameters - * - Renamed config->proxy_args_invocation (which didn't have - * the invocation but the options!) to config->proxy_args - * - Various adaptions - * - Removed logentry from cancelled commit - * - * Revision 1.16 2001/06/09 10:55:28 jongfoster - * Changing BUFSIZ ==> BUFFER_SIZE - * - * Revision 1.15 2001/06/07 23:13:40 jongfoster - * Merging ACL and forward files into config file. - * Cosmetic: Sorting config file options alphabetically. - * Cosmetic: Adding brief syntax comments to config file options. - * - * Revision 1.14 2001/06/07 14:46:25 joergs - * Missing make_path() added for re_filterfile. - * - * Revision 1.13 2001/06/05 22:33:54 jongfoster - * - * Fixed minor memory leak. - * Also now uses make_path to prepend the pathnames. - * - * Revision 1.12 2001/06/05 20:04:09 jongfoster - * Now uses _snprintf() in place of snprintf() under Win32. - * - * Revision 1.11 2001/06/04 18:31:58 swa - * files are now prefixed with either `confdir' or `logdir'. - * `make redhat-dist' replaces both entries confdir and logdir - * with redhat values - * - * Revision 1.10 2001/06/03 19:11:54 oes - * introduced confdir option - * - * Revision 1.9 2001/06/01 20:06:24 jongfoster - * Removed support for "tinygif" option - moved to actions file. - * - * Revision 1.8 2001/05/31 21:27:13 jongfoster - * Removed many options from the config file and into the - * "actions" file: add_forwarded, suppress_vanilla_wafer, - * wafer, add_header, user_agent, referer, from - * Also globally replaced "permission" with "action". - * - * Revision 1.7 2001/05/29 09:50:24 jongfoster - * Unified blocklist/imagelist/permissionslist. - * File format is still under discussion, but the internal changes - * are (mostly) done. - * - * Also modified interceptor behaviour: - * - We now intercept all URLs beginning with one of the following - * prefixes (and *only* these prefixes): - * * http://i.j.b/ - * * http://ijbswa.sf.net/config/ - * * http://ijbswa.sourceforge.net/config/ - * - New interceptors "home page" - go to http://i.j.b/ to see it. - * - Internal changes so that intercepted and fast redirect pages - * are not replaced with an image. - * - Interceptors now have the option to send a binary page direct - * to the client. (i.e. ijb-send-banner uses this) - * - Implemented show-url-info interceptor. (Which is why I needed - * the above interceptors changes - a typical URL is - * "http://i.j.b/show-url-info?url=www.somesite.com/banner.gif". - * The previous mechanism would not have intercepted that, and - * if it had been intercepted then it then it would have replaced - * it with an image.) - * - * Revision 1.6 2001/05/26 00:28:36 jongfoster - * Automatic reloading of config file. - * Removed obsolete SIGHUP support (Unix) and Reload menu option (Win32). - * Most of the global variables have been moved to a new - * struct configuration_spec, accessed through csp->config->globalname - * Most of the globals remaining are used by the Win32 GUI. - * - * Revision 1.5 2001/05/25 22:34:30 jongfoster - * Hard tabs->Spaces - * - * 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" @@ -385,9 +60,6 @@ const char loadcfg_rcs[] = "$Id: loadcfg.c,v 1.55 2006/11/28 15:31:52 fabiankeil # include "w32log.h" # endif /* ndef _WIN_CONSOLE */ -/* VC++ has "_snprintf", not "snprintf" */ -#define snprintf _snprintf - #else /* ifndef _WIN32 */ #ifndef __OS2__ @@ -411,6 +83,7 @@ const char loadcfg_rcs[] = "$Id: loadcfg.c,v 1.55 2006/11/28 15:31:52 fabiankeil #include "encode.h" #include "urlmatch.h" #include "cgi.h" +#include "gateway.h" const char loadcfg_h_rcs[] = LOADCFG_H_VERSION; @@ -438,7 +111,7 @@ const char *configfile = NULL; * 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; @@ -455,42 +128,56 @@ static struct file_list *current_configfile = NULL; * console and GUI specific options last). */ -#define hash_actions_file 1196306641ul /* "actionsfile" */ -#define hash_admin_address 4112573064ul /* "admin-address" */ -#define hash_buffer_limit 1881726070ul /* "buffer-limit */ -#define hash_confdir 1978389ul /* "confdir" */ -#define hash_debug 78263ul /* "debug" */ -#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_filterfile 250887266ul /* "filterfile" */ -#define hash_forward 2029845ul /* "forward" */ -#define hash_forward_socks4 3963965521ul /* "forward-socks4" */ -#define hash_forward_socks4a 2639958518ul /* "forward-socks4a" */ -#define hash_forwarded_connect_retries 101465292ul /* "forwarded-connect-retries" */ -#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_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_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" */ +#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_compression 3943696946ul /* "enable-compression" */ +#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); @@ -507,7 +194,7 @@ static void savearg(char *command, char *argument, struct configuration_spec * c * 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; @@ -537,16 +224,10 @@ void unload_configfile (void * data) } config->forward = NULL; -#ifdef FEATURE_COOKIE_JAR - if ( NULL != config->jar ) - { - fclose( config->jar ); - config->jar = NULL; - } -#endif /* def FEATURE_COOKIE_JAR */ - freez(config->confdir); freez(config->logdir); + freez(config->templdir); + freez(config->hostname); freez(config->haddr); freez(config->logfile); @@ -564,20 +245,11 @@ void unload_configfile (void * data) freez(config->proxy_args); freez(config->usermanual); -#ifdef FEATURE_COOKIE_JAR - freez(config->jarfile); -#endif /* def FEATURE_COOKIE_JAR */ - #ifdef FEATURE_TRUST freez(config->trustfile); list_remove_all(config->trust_info); #endif /* def FEATURE_TRUST */ - for (i = 0; i < MAX_AF_FILES; i++) - { - freez(config->re_filterfile[i]); - } - freez(config); } @@ -606,12 +278,60 @@ void unload_current_config_file(void) #endif +/********************************************************************* + * + * Function : parse_toggle_value + * + * Description : Parse the value of a directive that can only be + * enabled or disabled. Terminates with a fatal error + * if the value is NULL or something other than 0 or 1. + * + * Parameters : + * 1 : name: The name of the directive. Used for log messages. + * 2 : value: The value to parse + * + * + * Returns : The numerical toggle state + * + *********************************************************************/ +static int parse_toggle_state(const char *name, const char *value) +{ + int toggle_state; + assert(name != NULL); + assert(value != NULL); + + if ((value == NULL) || (*value == '\0')) + { + log_error(LOG_LEVEL_FATAL, "Directive %s used without argument", name); + } + + toggle_state = atoi(value); + + /* + * Also check the length as atoi() doesn't mind + * garbage after a valid integer, but we do. + */ + if (((toggle_state != 0) && (toggle_state != 1)) || (strlen(value) != 1)) + { + log_error(LOG_LEVEL_FATAL, + "Directive %s used with invalid argument '%s'. Use either '0' or '1'.", + name, value); + } + + return toggle_state; + +} + + /********************************************************************* * * Function : load_config * * Description : Load the config file and all parameters. * + * XXX: more than thousand lines long + * and thus in serious need of refactoring. + * * Parameters : None * * Returns : The configuration_spec, or NULL on error. @@ -619,7 +339,7 @@ void unload_current_config_file(void) *********************************************************************/ struct configuration_spec * load_config(void) { - char buf[BUFFER_SIZE]; + char *buf = NULL; char *p, *q; FILE *configfp = NULL; struct configuration_spec * config = NULL; @@ -627,32 +347,37 @@ struct configuration_spec * load_config(void) struct file_list *fs; unsigned long linenum = 0; int i; + char *logfile = NULL; - if ( !check_file_changed(current_configfile, configfile, &fs)) + 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 FEATURE_TOGGLE - global_toggle_state = 1; + 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; } /* @@ -670,21 +395,39 @@ struct configuration_spec * load_config(void) * Set to defaults */ config->multi_threaded = 1; - config->hport = HADDR_PORT; 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 + config->feature_flags &= ~RUNTIME_FEATURE_COMPRESSION; + /* + * XXX: Run some benchmarks to see if there are better default values. + */ + config->compression_level = 1; +#endif - 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, &linenum) != NULL) + while (read_config_line(configfp, &linenum, &buf) != NULL) { char cmd[BUFFER_SIZE]; char arg[BUFFER_SIZE]; @@ -695,8 +438,9 @@ struct configuration_spec * load_config(void) 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; @@ -714,28 +458,29 @@ 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) { /* ************************************************************************* * actionsfile actions-file-name @@ -755,16 +500,22 @@ struct configuration_spec * load_config(void) MAX_AF_FILES); } config->actions_file_short[i] = strdup(arg); - p = malloc(strlen(arg) + sizeof(".action")); - if (p == NULL) + config->actions_file[i] = make_path(config->confdir, arg); + + break; +/* ************************************************************************* + * accept-intercepted-requests + * *************************************************************************/ + case hash_accept_intercepted_requests: + if (parse_toggle_state(cmd, arg) == 1) + { + config->feature_flags |= RUNTIME_FEATURE_ACCEPT_INTERCEPTED_REQUESTS; + } + else { - log_error(LOG_LEVEL_FATAL, "Out of memory"); + config->feature_flags &= ~RUNTIME_FEATURE_ACCEPT_INTERCEPTED_REQUESTS; } - strcpy(p, arg); - strcat(p, ".action"); - config->actions_file[i] = make_path(config->confdir, p); - free(p); - continue; + break; /* ************************************************************************* * admin-address email-address @@ -772,14 +523,28 @@ struct configuration_spec * load_config(void) case hash_admin_address : freez(config->admin_address); config->admin_address = strdup(arg); - continue; + break; + +/* ************************************************************************* + * allow-cgi-request-crunching + * *************************************************************************/ + case hash_allow_cgi_request_crunching: + if (parse_toggle_state(cmd, arg) == 1) + { + 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); - continue; + config->buffer_limit = (size_t)(1024 * atoi(arg)); + break; /* ************************************************************************* * confdir directory-name @@ -787,7 +552,49 @@ struct configuration_spec * load_config(void) case hash_confdir : freez(config->confdir); config->confdir = make_path( NULL, arg); - continue; + 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 (parse_toggle_state(cmd, arg) == 1) + { + config->feature_flags |= RUNTIME_FEATURE_CONNECTION_SHARING; + } + else + { + config->feature_flags &= ~RUNTIME_FEATURE_CONNECTION_SHARING; + } + break; +#endif /* ************************************************************************* * debug n @@ -795,14 +602,36 @@ struct configuration_spec * load_config(void) * *************************************************************************/ 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 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)) { @@ -811,7 +640,7 @@ struct configuration_spec * load_config(void) string_append(&config->proxy_args, "
\nWARNING: Wrong number of parameters for " "deny-access directive in configuration file.

\n"); - continue; + break; } /* allocate a new node */ @@ -821,41 +650,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]); + 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 IP for deny-access directive" - " in configuration file: \""); + "
\nWARNING: Invalid source address, port or netmask " + "for deny-access directive in configuration file: \""); string_append(&config->proxy_args, vec[0]); 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]); + 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 IP for deny-access directive" - " in configuration file: \""); + "
\nWARNING: Invalid destination address, port or netmask " + "for deny-access directive in configuration file: \""); string_append(&config->proxy_args, - vec[0]); + 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 @@ -869,7 +704,7 @@ struct configuration_spec * load_config(void) cur_acl->next = config->acl; config->acl = cur_acl; - continue; + break; #endif /* def FEATURE_ACL */ /* ************************************************************************* @@ -877,7 +712,7 @@ struct configuration_spec * load_config(void) * *************************************************************************/ #ifdef FEATURE_CGI_EDIT_ACTIONS case hash_enable_edit_actions: - if ((*arg != '\0') && (0 != atoi(arg))) + if (parse_toggle_state(cmd, arg) == 1) { config->feature_flags |= RUNTIME_FEATURE_CGI_EDIT_ACTIONS; } @@ -885,15 +720,32 @@ struct configuration_spec * load_config(void) { config->feature_flags &= ~RUNTIME_FEATURE_CGI_EDIT_ACTIONS; } - continue; + break; #endif /* def FEATURE_CGI_EDIT_ACTIONS */ +/* ************************************************************************* + * enable-compression 0|1 + * *************************************************************************/ +#ifdef FEATURE_COMPRESSION + case hash_enable_compression: + if (parse_toggle_state(cmd, arg) == 1) + { + config->feature_flags |= RUNTIME_FEATURE_COMPRESSION; + } + else + { + config->feature_flags &= ~RUNTIME_FEATURE_COMPRESSION; + } + break; +#endif /* def FEATURE_COMPRESSION */ + + /* ************************************************************************* * enable-remote-toggle 0|1 * *************************************************************************/ -#ifdef FEATURE_CGI_EDIT_ACTIONS +#ifdef FEATURE_TOGGLE case hash_enable_remote_toggle: - if ((*arg != '\0') && (0 != atoi(arg))) + if (parse_toggle_state(cmd, arg) == 1) { config->feature_flags |= RUNTIME_FEATURE_CGI_TOGGLE; } @@ -901,14 +753,14 @@ struct configuration_spec * load_config(void) { config->feature_flags &= ~RUNTIME_FEATURE_CGI_TOGGLE; } - continue; -#endif /* def FEATURE_CGI_EDIT_ACTIONS */ + break; +#endif /* def FEATURE_TOGGLE */ /* ************************************************************************* * enable-remote-http-toggle 0|1 * *************************************************************************/ case hash_enable_remote_http_toggle: - if ((*arg != '\0') && (0 != atoi(arg))) + if (parse_toggle_state(cmd, arg) == 1) { config->feature_flags |= RUNTIME_FEATURE_HTTP_TOGGLE; } @@ -916,7 +768,26 @@ struct configuration_spec * load_config(void) { config->feature_flags &= ~RUNTIME_FEATURE_HTTP_TOGGLE; } - continue; + break; + +/* ************************************************************************* + * enforce-blocks 0|1 + * *************************************************************************/ + case hash_enforce_blocks: +#ifdef FEATURE_FORCE_LOAD + if (parse_toggle_state(cmd, arg) == 1) + { + 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 @@ -936,21 +807,16 @@ struct configuration_spec * load_config(void) MAX_AF_FILES); } config->re_filterfile_short[i] = strdup(arg); - p = malloc(strlen(arg) + 1); - if (p == NULL) - { - log_error(LOG_LEVEL_FATAL, "Out of memory"); - } - strcpy(p, arg); - config->re_filterfile[i] = make_path(config->confdir, p); - free(p); - continue; + 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) { @@ -959,7 +825,7 @@ struct configuration_spec * load_config(void) string_append(&config->proxy_args, "
\nWARNING: Wrong number of parameters for " "forward directive in configuration file."); - continue; + break; } /* allocate a new node */ @@ -968,7 +834,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; @@ -981,7 +847,7 @@ struct configuration_spec * load_config(void) string_append(&config->proxy_args, "
\nWARNING: Bad URL specifier for " "forward directive in configuration file."); - continue; + break; } /* Parse the parent HTTP proxy host:port */ @@ -989,31 +855,23 @@ struct configuration_spec * load_config(void) if (strcmp(p, ".") != 0) { - cur_fwd->forward_host = strdup(p); - - if (NULL != (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) { @@ -1022,7 +880,7 @@ struct configuration_spec * load_config(void) string_append(&config->proxy_args, "
\nWARNING: Wrong number of parameters for " "forward-socks4 directive in configuration file."); - continue; + break; } /* allocate a new node */ @@ -1031,7 +889,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; @@ -1044,25 +902,18 @@ struct configuration_spec * load_config(void) 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 (NULL != (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] */ @@ -1070,31 +921,24 @@ struct configuration_spec * load_config(void) if (strcmp(p, ".") != 0) { - cur_fwd->forward_host = strdup(p); - - if (NULL != (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) { @@ -1103,7 +947,7 @@ struct configuration_spec * load_config(void) string_append(&config->proxy_args, "
\nWARNING: Wrong number of parameters for " "forward-socks4a directive in configuration file."); - continue; + break; } /* allocate a new node */ @@ -1112,10 +956,17 @@ 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])) @@ -1125,66 +976,91 @@ struct configuration_spec * load_config(void) 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 (NULL != (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); - - if (NULL != (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; /* ************************************************************************* * forwarded-connect-retries n * *************************************************************************/ case hash_forwarded_connect_retries : config->forwarded_connect_retries = atoi(arg); - continue; + break; /* ************************************************************************* - * jarfile jar-file-name - * In logdir by default + * 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 (parse_toggle_state(cmd, arg) == 1) + { + 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_COOKIE_JAR - case hash_jarfile : - freez(config->jarfile); - config->jarfile = make_path(config->logdir, arg); - continue; -#endif /* def FEATURE_COOKIE_JAR */ +#ifdef FEATURE_CONNECTION_KEEP_ALIVE + case hash_keep_alive_timeout : + if (*arg != '\0') + { + int timeout = atoi(arg); + if (0 < timeout) + { + config->feature_flags |= RUNTIME_FEATURE_CONNECTION_KEEP_ALIVE; + config->keep_alive_timeout = (unsigned int)timeout; + } + else + { + config->feature_flags &= ~RUNTIME_FEATURE_CONNECTION_KEEP_ALIVE; + } + } + break; +#endif /* ************************************************************************* * listen-address [ip][:port] @@ -1192,7 +1068,7 @@ struct configuration_spec * load_config(void) case hash_listen_address : freez(config->haddr); config->haddr = strdup(arg); - continue; + break; /* ************************************************************************* * logdir directory-name @@ -1200,23 +1076,44 @@ struct configuration_spec * load_config(void) case hash_logdir : freez(config->logdir); config->logdir = make_path(NULL, arg); - continue; + break; /* ************************************************************************* * logfile log-file-name * In logdir by default * *************************************************************************/ case hash_logfile : - freez(config->logfile); - config->logfile = no_daemon ? NULL : 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 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)) { @@ -1226,7 +1123,7 @@ struct configuration_spec * load_config(void) "
\nWARNING: Wrong number of parameters for " "permit-access directive in configuration file.

\n"); - continue; + break; } /* allocate a new node */ @@ -1236,42 +1133,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]); + 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 IP for permit-access directive" - " in configuration file: \""); + "
\nWARNING: Invalid source address, port or netmask for " + "permit-access directive in configuration file: \""); string_append(&config->proxy_args, vec[0]); 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]); + 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 IP for permit-access directive" - " in configuration file: \""); + "
\nWARNING: Invalid destination address, port or netmask for " + "permit-access directive in configuration file: \""); string_append(&config->proxy_args, - vec[0]); + 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 @@ -1285,7 +1187,7 @@ struct configuration_spec * load_config(void) cur_acl->next = config->acl; config->acl = cur_acl; - continue; + break; #endif /* def FEATURE_ACL */ /* ************************************************************************* @@ -1294,14 +1196,55 @@ struct configuration_spec * load_config(void) case hash_proxy_info_url : freez(config->proxy_info_url); config->proxy_info_url = strdup(arg); - continue; + break; /* ************************************************************************* * single-threaded * *************************************************************************/ case hash_single_threaded : config->multi_threaded = 0; - continue; + 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 (parse_toggle_state(cmd, arg) == 1) + { + config->feature_flags |= RUNTIME_FEATURE_SPLIT_LARGE_FORMS; + } + else + { + config->feature_flags &= ~RUNTIME_FEATURE_SPLIT_LARGE_FORMS; + } + break; + +/* ************************************************************************* + * templdir directory-name + * *************************************************************************/ + case hash_templdir : + freez(config->templdir); + config->templdir = make_path(NULL, arg); + break; /* ************************************************************************* * toggle (0|1) @@ -1309,7 +1252,7 @@ struct configuration_spec * load_config(void) #ifdef FEATURE_TOGGLE case hash_toggle : global_toggle_state = atoi(arg); - continue; + break; #endif /* def FEATURE_TOGGLE */ /* ************************************************************************* @@ -1318,7 +1261,7 @@ struct configuration_spec * load_config(void) #ifdef FEATURE_TRUST case hash_trust_info_url : enlist(config->trust_info, arg); - continue; + break; #endif /* def FEATURE_TRUST */ /* ************************************************************************* @@ -1329,16 +1272,21 @@ struct configuration_spec * load_config(void) case hash_trustfile : freez(config->trustfile); config->trustfile = make_path(config->confdir, arg); - continue; + 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); - continue; + break; /* ************************************************************************* * Win32 Console options: @@ -1350,7 +1298,7 @@ struct configuration_spec * load_config(void) #ifdef _WIN_CONSOLE case hash_hide_console : hideConsole = 1; - continue; + break; #endif /*def _WIN_CONSOLE*/ @@ -1364,63 +1312,69 @@ struct configuration_spec * load_config(void) * *************************************************************************/ 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) */ @@ -1433,11 +1387,10 @@ struct configuration_spec * load_config(void) #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 /* def FEATURE_CGI_EDIT_ACTIONS */ -#ifndef FEATURE_COOKIE_JAR - case hash_jarfile : -#endif /* ndef FEATURE_COOKIE_JAR */ +#endif /* ndef FEATURE_TOGGLE */ #ifndef FEATURE_ACL case hash_permit_access: #endif /* ndef FEATURE_ACL */ @@ -1466,7 +1419,7 @@ 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 : @@ -1477,32 +1430,91 @@ struct configuration_spec * load_config(void) * to LOG_LEVEL_FATAL. */ log_error(LOG_LEVEL_ERROR, "Ignoring unrecognized directive '%s' (%luul) in line %lu " - "in configuration file (%s).", buf, hash_string(cmd), linenum, configfile); + "in configuration file (%s).", buf, directive_hash, linenum, configfile); string_append(&config->proxy_args, - " WARNING: unrecognized directive, ignored"); - continue; + " 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); + set_debug_level(config->debug); + + freez(config->logfile); + + if (daemon_mode) + { + if (NULL != logfile) + { + config->logfile = logfile; + init_error_log(Argv[0], config->logfile); + } + else + { + disable_logging(); + } + } + +#ifdef FEATURE_CONNECTION_KEEP_ALIVE + if (config->default_server_timeout > config->keep_alive_timeout) + { + 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 /* def FEATURE_CONNECTION_KEEP_ALIVE */ + +#ifdef FEATURE_CONNECTION_SHARING + if (config->feature_flags & RUNTIME_FEATURE_CONNECTION_KEEP_ALIVE) + { + if (config->multi_threaded) + { + set_keep_alive_timeout(config->keep_alive_timeout); + } + 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"); } - init_error_log(Argv[0], config->logfile, config->debug); - if (config->actions_file[0]) { - add_loader(load_actions_file, config); + add_loader(load_action_files, config); } - if (config->re_filterfile) + if (config->re_filterfile[0]) { - add_loader(load_re_filterfile, config); + add_loader(load_re_filterfiles, config); } #ifdef FEATURE_TRUST @@ -1512,18 +1524,6 @@ struct configuration_spec * load_config(void) } #endif /* def FEATURE_TRUST */ -#ifdef FEATURE_COOKIE_JAR - if ( NULL != config->jarfile ) - { - if ( NULL == (config->jar = fopen(config->jarfile, "a")) ) - { - log_error(LOG_LEVEL_FATAL, "can't open jarfile '%s': %E", config->jarfile); - /* Never get here - LOG_LEVEL_FATAL causes program exit */ - } - setbuf(config->jar, NULL); - } -#endif /* def FEATURE_COOKIE_JAR */ - if ( NULL == config->haddr ) { config->haddr = strdup( HADDR_DEFAULT ); @@ -1531,24 +1531,32 @@ struct configuration_spec * load_config(void) if ( NULL != config->haddr ) { - if (NULL != (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); } } @@ -1571,9 +1579,10 @@ struct configuration_spec * load_config(void) /* FIXME: this is a kludge for win32 */ #if defined(_WIN32) && !defined (_WIN_CONSOLE) - 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_re_filterfile = config->re_filterfile[0]; /* FIXME Hope this is default.filter */ + 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; @@ -1653,12 +1662,11 @@ static void savearg(char *command, char *argument, struct configuration_spec * c char * s; assert(command); - assert(*command); assert(argument); /* * Add config option name embedded in - * link to it's section in the user-manual + * link to its section in the user-manual */ buf = strdup("\nusermanual, "file://", 7) || @@ -1668,9 +1676,7 @@ static void savearg(char *command, char *argument, struct configuration_spec * c } else { - string_append(&buf, "http://"); - string_append(&buf, CGI_SITE_2_HOST); - string_append(&buf, "/user-manual/"); + string_append(&buf, "http://" CGI_SITE_2_HOST "/user-manual/"); } string_append(&buf, CONFIG_HELP_PREFIX); string_join (&buf, string_toupper(command));