X-Git-Url: http://www.privoxy.org/gitweb/?p=privoxy.git;a=blobdiff_plain;f=loadcfg.c;h=d1d95aea7b50a9c25651beac8886a319d63849f2;hp=185241beba066b2404a99bc9f70ca1fa440b492b;hb=58b518549b4cad7b89e2e87def5169d83ceb2d45;hpb=87a69fc505def6be1c8a4d24ae225c3623b5e861 diff --git a/loadcfg.c b/loadcfg.c index 185241be..d1d95aea 100644 --- a/loadcfg.c +++ b/loadcfg.c @@ -1,21 +1,21 @@ -const char loadcfg_rcs[] = "$Id: loadcfg.c,v 1.2 2001/05/17 23:01:01 oes Exp $"; +const char loadcfg_rcs[] = "$Id: loadcfg.c,v 1.85 2009/01/22 12:06:26 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-2008 the SourceForge + * 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 @@ -35,6 +35,443 @@ const char loadcfg_rcs[] = "$Id: loadcfg.c,v 1.2 2001/05/17 23:01:01 oes Exp $"; * * Revisions : * $Log: loadcfg.c,v $ + * Revision 1.85 2009/01/22 12:06:26 fabiankeil + * Don't keep connections alive when running single-threaded. + * + * Revision 1.84 2009/01/14 16:14:36 fabiankeil + * Due to the standard.action file removal, the other action + * files changed their position in config->actions_file[]. + * Update mingw32 kludge accordingly. + * + * Revision 1.83 2008/12/20 14:53:55 fabiankeil + * Add config option socket-timeout to control the time + * Privoxy waits for data to arrive on a socket. Useful + * in case of stale ssh tunnels or when fuzz-testing. + * + * Revision 1.82 2008/11/16 12:43:49 fabiankeil + * Turn keep-alive support into a runtime feature + * that is disabled by setting keep-alive-timeout + * to a negative value. + * + * Revision 1.81 2008/11/13 09:08:42 fabiankeil + * Add new config option: keep-alive-timeout. + * + * Revision 1.80 2008/08/31 15:59:03 fabiankeil + * There's no reason to let remote toggling support depend + * on FEATURE_CGI_EDIT_ACTIONS, so make sure it doesn't. + * + * Revision 1.79 2008/08/30 12:03:07 fabiankeil + * Remove FEATURE_COOKIE_JAR. + * + * Revision 1.78 2008/08/02 08:23:22 fabiankeil + * If the enforce-blocks directive is used with FEATURE_FORCE_LOAD + * disabled, log a message that blocks will always be enforced + * instead of complaining about an unrecognized directive. + * Reported by Pietro Leone. + * + * Revision 1.77 2008/05/26 16:13:22 fabiankeil + * Reuse directive_hash and don't hash the same directive twice. + * + * Revision 1.76 2008/05/10 09:03:16 fabiankeil + * - Merge three string_append() calls. + * - Remove useless assertion. + * + * Revision 1.75 2008/03/30 14:52:05 fabiankeil + * Rename load_actions_file() and load_re_filterfile() + * as they load multiple files "now". + * + * Revision 1.74 2008/03/26 18:07:07 fabiankeil + * Add hostname directive. Closes PR#1918189. + * + * Revision 1.73 2008/02/16 16:54:51 fabiankeil + * Fix typo. + * + * Revision 1.72 2008/02/03 13:46:15 fabiankeil + * Add SOCKS5 support. Patch #1862863 by Eric M. Hopper with minor changes. + * + * Revision 1.71 2007/12/23 15:24:56 fabiankeil + * Reword "unrecognized directive" warning, use better + * mark up and add a
. Fixes parts of #1856559. + * + * Revision 1.70 2007/12/15 14:24:05 fabiankeil + * Plug memory leak if listen-address only specifies the port. + * + * Revision 1.69 2007/10/27 13:02:27 fabiankeil + * Relocate daemon-mode-related log messages to make sure + * they aren't shown again in case of configuration reloads. + * + * Revision 1.68 2007/10/19 16:32:34 fabiankeil + * Plug memory leak introduced with my last commit. + * + * Revision 1.67 2007/10/14 14:12:41 fabiankeil + * When in daemon mode, close stderr after the configuration file has been + * parsed the first time. If logfile isn't set, stop logging. Fixes BR#897436. + * + * Revision 1.66 2007/08/05 14:02:09 fabiankeil + * #1763173 from Stefan Huehner: declare unload_configfile() static. + * + * Revision 1.65 2007/07/21 11:51:36 fabiankeil + * As Hal noticed, checking dispatch_cgi() as the last cruncher + * looks like a bug if CGI requests are blocked unintentionally, + * so don't do it unless the user enabled the new config option + * "allow-cgi-request-crunching". + * + * Revision 1.64 2007/05/21 10:44:08 fabiankeil + * - Use strlcpy() instead of strcpy(). + * - Stop treating actions files special. Expect a complete file name + * (with or without path) like it's done for the rest of the files. + * Closes FR#588084. + * - Remove an unnecessary temporary memory allocation. + * - Don't log anything to the console when running as + * daemon and no errors occurred. + * + * Revision 1.63 2007/04/09 18:11:36 fabiankeil + * Don't mistake VC++'s _snprintf() for a snprintf() replacement. + * + * Revision 1.62 2007/03/17 15:20:05 fabiankeil + * New config option: enforce-blocks. + * + * Revision 1.61 2007/03/16 16:47:35 fabiankeil + * - Mention other reasons why acl directive loading might have failed. + * - Don't log the acl source if the acl destination is to blame. + * + * Revision 1.60 2007/01/27 13:09:16 fabiankeil + * Add new config option "templdir" to + * change the templates directory. + * + * Revision 1.59 2006/12/31 17:56:38 fabiankeil + * Added config option accept-intercepted-requests + * and disabled it by default. + * + * Revision 1.58 2006/12/31 14:24:29 fabiankeil + * Fix gcc43 compiler warnings. + * + * Revision 1.57 2006/12/21 12:57:48 fabiankeil + * Add config option "split-large-forms" + * to work around the browser bug reported + * in BR #1570678. + * + * Revision 1.56 2006/12/17 17:04:51 fabiankeil + * Move the
in the generated HTML for the config + * options from the beginning of the string to its end. + * Keeps the white space in balance. + * + * 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 * @@ -55,16 +492,14 @@ const char loadcfg_rcs[] = "$Id: loadcfg.c,v 1.2 2001/05/17 23:01:01 oes Exp $"; #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 @@ -73,24 +508,27 @@ const char loadcfg_rcs[] = "$Id: loadcfg.c,v 1.2 2001/05/17 23:01:01 oes Exp $"; #else /* ifndef _WIN32 */ +#ifndef __OS2__ # include -# include # include +#endif +# include # include # include #endif #include "loadcfg.h" +#include "list.h" #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 "ssplit.h" +#include "encode.h" +#include "urlmatch.h" +#include "cgi.h" #include "gateway.h" const char loadcfg_h_rcs[] = LOADCFG_H_VERSION; @@ -106,716 +544,1437 @@ const char loadcfg_h_rcs[] = LOADCFG_H_VERSION; #define ijb_isupper(__X) isupper((int)(unsigned char)(__X)) #define ijb_tolower(__X) tolower((int)(unsigned char)(__X)) -static const char VANILLA_WAFER[] = - "NOTICE=TO_WHOM_IT_MAY_CONCERN_" - "Do_not_send_me_any_copyrighted_information_other_than_the_" - "document_that_I_am_requesting_or_any_of_its_necessary_components._" - "In_particular_do_not_send_me_any_cookies_that_" - "are_subject_to_a_claim_of_copyright_by_anybody._" - "Take_notice_that_I_refuse_to_be_bound_by_any_license_condition_" - "(copyright_or_otherwise)_applying_to_any_cookie._"; - -#ifdef TOGGLE -/* by haroon - indicates if ijb is enabled */ -int g_bToggleIJB = 1; /* JunkBusters is enabled by default. */ -#endif - -int debug = 0; -int multi_threaded = 1; - -#if defined(DETECT_MSIE_IMAGES) || defined(USE_IMAGE_LIST) -int tinygif = 0; -const char *tinygifurl = NULL; -#endif /* defined(DETECT_MSIE_IMAGES) || defined(USE_IMAGE_LIST) */ - -const char *logfile = NULL; +#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; -const char *blockfile = NULL; -const char *permissions_file = NULL; -const char *forwardfile = NULL; - -#ifdef ACL_FILES -const char *aclfile = NULL; -#endif /* def ACL_FILES */ - -#ifdef USE_IMAGE_LIST -const char *imagefile = NULL; -#endif /* def USE_IMAGE_LIST */ - -/* - * Permissions to use for URLs not in the permissions list. - */ -int default_permissions = PERMIT_RE_FILTER; - -#ifdef PCRS -const char *re_filterfile = NULL; -#endif /* def PCRS */ - -#ifdef TRUST_FILES -const char *trustfile = NULL; -#endif /* def TRUST_FILES */ - -#ifdef JAR_FILES -const char *jarfile = NULL; -FILE *jar = NULL; -#endif /* def JAR_FILES */ - -const char *referrer = NULL; -const char *uagent = NULL; -const char *from = NULL; - -#ifndef SPLIT_PROXY_ARGS -const char *suppress_message = NULL; -#endif /* ndef SPLIT_PROXY_ARGS */ - -int suppress_vanilla_wafer = 0; -int add_forwarded = 0; - -struct list wafer_list[1]; -struct list xtra_list[1]; - -#ifdef TRUST_FILES -struct list trust_info[1]; -struct url_spec *trust_list[64]; -#endif /* def TRUST_FILES */ - -/* - * Port and IP to bind to. - * Defaults to HADDR_DEFAULT:HADDR_PORT == 127.0.0.1:8000 - */ -const char *haddr = NULL; -int hport = 0; - -#ifndef SPLIT_PROXY_ARGS -int suppress_blocklists = 0; /* suppress listing sblock and simage */ -#endif /* ndef SPLIT_PROXY_ARGS */ - -struct proxy_args proxy_args[1]; - -int configret = 0; -int config_changed = 0; - - /* - * The load_config function is now going to call `init_proxy_args', - * so it will need argc and argv. Since load_config will also be - * a signal handler, 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; +static struct file_list *current_configfile = NULL; + /* * This takes the "cryptic" hash of each keyword and aliases them to * something a little more readable. This also makes changing the * hash values easier if they should change or the hash algorthm changes. * Use the included "hash" program to find out what the hash will be - * for any string supplied on the command line. (Or just put it in the + * for any string supplied on the command line. (Or just put it in the * config file and read the number from the error message in the log). + * + * Please keep this list sorted alphabetically (but with the Windows + * console and GUI specific options last). */ -#define hash_trustfile 56494766ul -#define hash_trust_info_url 449869467ul -#define hash_debug 78263ul -#define hash_tinygif 2227702ul -#define hash_add_forwarded_header 3191044770ul -#define hash_single_threaded 4250084780ul -#define hash_suppress_vanilla_wafer 3121233547ul -#define hash_wafer 89669ul -#define hash_add_header 237434619ul -#define hash_permissions_file 3825730796lu /* "permissionsfile" */ -#define hash_logfile 2114766ul -#define hash_blockfile 48845391ul -#define hash_imagefile 51447891ul -#define hash_jarfile 2046641ul -#define hash_listen_address 1255650842ul -#define hash_forwardfile 1268669141ul -#define hash_aclfile 1908516ul -#define hash_re_filterfile 3877522444ul -#define hash_user_agent 283326691ul -#define hash_referrer 10883969ul -#define hash_referer 2176719ul -#define hash_from 16264ul -#define hash_hide_console 2048809870ul -#define hash_include_stats 2174146548ul -#define hash_suppress_blocklists 1948693308ul -#define hash_toggle 447966ul - -#define hash_activity_animation 1817904738ul -#define hash_log_messages 2291744899ul -#define hash_log_highlight_messages 4032101240ul -#define hash_log_buffer_size 2918070425ul -#define hash_log_max_lines 2868344173ul -#define hash_log_font_name 2866730124ul -#define hash_log_font_size 2866731014ul -#define hash_show_on_task_bar 215410365ul -#define hash_close_button_minimizes 3651284693ul - +#define hash_actions_file 1196306641ul /* "actionsfile" */ +#define hash_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_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_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_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_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); /********************************************************************* * - * Function : load_config + * Function : unload_configfile * - * Description : Load the config file and all parameters. + * Description : Free the config structure and all components. * * Parameters : - * 1 : signum : this can be the signal SIGHUP or 0 (if from main). - * In any case, we just ignore this and reload the config file. + * 1 : data: struct configuration_spec to unload * - * Returns : configret : 0 => Ok, everything else is an error. - * Note: we use configret since a signal handler cannot - * return a value, and this function does double duty. - * Ie. Is is called from main and from signal( SIGHUP ); + * Returns : N/A * *********************************************************************/ -void load_config( int signum ) +static void unload_configfile (void * data) { - char buf[BUFSIZ]; - char *p, *q; - FILE *configfp = NULL; - - configret = 0; /* FIXME: This is obsolete, always 0. */ - config_changed = 1; + struct configuration_spec * config = (struct configuration_spec *)data; + struct forward_spec *cur_fwd = config->forward; + int i; - log_error(LOG_LEVEL_INFO, "loading configuration file '%s':", configfile); +#ifdef FEATURE_ACL + struct access_control_list *cur_acl = config->acl; - init_proxy_args(Argc, Argv); + while (cur_acl != NULL) + { + struct access_control_list * next_acl = cur_acl->next; + free(cur_acl); + cur_acl = next_acl; + } + config->acl = NULL; +#endif /* def FEATURE_ACL */ + while (cur_fwd != NULL) + { + struct forward_spec * next_fwd = cur_fwd->next; + free_url_spec(cur_fwd->url); - /* (Waste of memory [not quite a "leak"] here. The - * last blockfile/permissions file/... etc will not be - * unloaded until we load a new one. If the - * block/... feature has been disabled in - * the new config file, then we're wasting some - * memory we could otherwise reclaim. - */ + freez(cur_fwd->gateway_host); + freez(cur_fwd->forward_host); + free(cur_fwd); + cur_fwd = next_fwd; + } + config->forward = NULL; - /* Disable all loaders. */ - remove_all_loaders(); + freez(config->confdir); + freez(config->logdir); + freez(config->templdir); + freez(config->hostname); - /* - * Reset to as close to startup state as we can. - * But leave changing the logfile until after we're done loading. - */ + freez(config->haddr); + freez(config->logfile); -#ifdef JAR_FILES - if ( NULL != jar ) + for (i = 0; i < MAX_AF_FILES; i++) { - fclose( jar ); - jar = NULL; + freez(config->actions_file_short[i]); + freez(config->actions_file[i]); + freez(config->re_filterfile_short[i]); + freez(config->re_filterfile[i]); } -#endif /* def JAR_FILES */ - - debug = 0; - multi_threaded = 1; - - default_permissions = PERMIT_RE_FILTER; -#if defined(DETECT_MSIE_IMAGES) || defined(USE_IMAGE_LIST) - tinygif = 0; - freez((char *)tinygifurl); -#endif /* defined(DETECT_MSIE_IMAGES) || defined(USE_IMAGE_LIST) */ + freez(config->admin_address); + freez(config->proxy_info_url); + freez(config->proxy_args); + freez(config->usermanual); - suppress_vanilla_wafer = 0; - add_forwarded = 0; - hport = HADDR_PORT; +#ifdef FEATURE_TRUST + freez(config->trustfile); + list_remove_all(config->trust_info); +#endif /* def FEATURE_TRUST */ -#ifdef _WIN_CONSOLE - hideConsole = 0; -#endif /*def _WIN_CONSOLE*/ + for (i = 0; i < MAX_AF_FILES; i++) + { + freez(config->re_filterfile[i]); + } -#ifdef TOGGLE - g_bToggleIJB = 1; -#endif + freez(config); +} -#ifdef STATISTICS - urls_read = 0; - urls_rejected = 0; -#endif /* def STATISTICS */ -#ifndef SPLIT_PROXY_ARGS - suppress_blocklists = 0; -#endif /* ndef SPLIT_PROXY_ARGS */ +#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 - freez((char *)from); - freez((char *)haddr); - freez((char *)uagent); - freez((char *)referrer); - freez((char *)logfile); +/********************************************************************* + * + * 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. + * + *********************************************************************/ +struct configuration_spec * load_config(void) +{ + char buf[BUFFER_SIZE]; + 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; +#ifdef FEATURE_CONNECTION_KEEP_ALIVE + int keep_alive_timeout = DEFAULT_KEEP_ALIVE_TIMEOUT; +#endif - freez((char *)blockfile); - freez((char *)permissions_file); - freez((char *)forwardfile); + if ( !check_file_changed(current_configfile, configfile, &fs)) + { + /* No need to load */ + return ((struct configuration_spec *)current_configfile->f); + } + if (!fs) + { + log_error(LOG_LEVEL_FATAL, "can't check configuration file '%s': %E", + configfile); + } -#ifdef ACL_FILES - freez((char *)aclfile); -#endif /* def ACL_FILES */ + if (NULL != current_configfile) + { + log_error(LOG_LEVEL_INFO, "Reloading configuration file '%s'", configfile); + } -#ifdef USE_IMAGE_LIST - freez((char *)imagefile); -#endif /* def USE_IMAGE_LIST */ +#ifdef FEATURE_TOGGLE + global_toggle_state = 1; +#endif /* def FEATURE_TOGGLE */ -#ifdef JAR_FILES - freez((char *)jarfile); -#endif /* def JAR_FILES */ + fs->f = config = (struct configuration_spec *)zalloc(sizeof(*config)); -#ifndef SPLIT_PROXY_ARGS - freez((char *)suppress_message); -#endif /* ndef SPLIT_PROXY_ARGS */ + if (config==NULL) + { + 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 */ + } -#ifdef TRUST_FILES - freez((char *)trustfile); -#endif /* def TRUST_FILES */ + /* + * This is backwards from how it's usually done. + * 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 + * 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; -#ifdef PCRS - freez((char *)re_filterfile); -#endif /* def PCRS */ + /* + * 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->socket_timeout = 180; + config->feature_flags &= ~RUNTIME_FEATURE_CGI_TOGGLE; + config->feature_flags &= ~RUNTIME_FEATURE_SPLIT_LARGE_FORMS; + config->feature_flags &= ~RUNTIME_FEATURE_ACCEPT_INTERCEPTED_REQUESTS; + + if ((configfp = fopen(configfile, "r")) == NULL) + { + log_error(LOG_LEVEL_FATAL, "can't open configuration file '%s': %E", + configfile); + /* Never get here - LOG_LEVEL_FATAL causes program exit */ + } - if (NULL != configfile) + while (read_config_line(buf, sizeof(buf), configfp, &linenum) != NULL) { - if ((configfp = fopen(configfile, "r")) == NULL) + char cmd[BUFFER_SIZE]; + char arg[BUFFER_SIZE]; + char tmp[BUFFER_SIZE]; +#ifdef FEATURE_ACL + struct access_control_list *cur_acl; +#endif /* def FEATURE_ACL */ + struct forward_spec *cur_fwd; + int vec_count; + char *vec[3]; + unsigned long directive_hash; + + strlcpy(tmp, buf, sizeof(tmp)); + + /* Copy command (i.e. up to space or tab) into cmd */ + p = buf; + q = cmd; + while (*p && (*p != ' ') && (*p != '\t')) { - log_error(LOG_LEVEL_FATAL, "can't open configuration file '%s': %E", - configfile); - /* Never get here - LOG_LEVEL_FATAL causes program exit */ + *q++ = *p++; } - } + *q = '\0'; - if (NULL != configfp) - { - memset (buf, 'j', sizeof(buf)); - while (read_config_line(buf, sizeof(buf), configfp, NULL) != NULL) + /* Skip over the whitespace in buf */ + while (*p && ((*p == ' ') || (*p == '\t'))) { - char cmd[BUFSIZ]; - char arg[BUFSIZ]; - char tmp[BUFSIZ]; + p++; + } - strcpy(tmp, buf); + /* Copy the argument into arg */ + strlcpy(arg, p, sizeof(arg)); - /* Copy command (i.e. up to space or tab) into cmd */ - p = buf; - q = cmd; - while (*p && (*p != ' ') && (*p != '\t')) - { - *q++ = *p++; - } - *q = '\0'; + /* Should never happen, but check this anyway */ + if (*cmd == '\0') + { + continue; + } - /* Skip over the whitespace in buf */ - while (*p && ((*p == ' ') || (*p == '\t'))) + /* Make sure the command field is lower case */ + for (p=cmd; *p; p++) + { + if (ijb_isupper(*p)) { - p++; + *p = (char)ijb_tolower(*p); } + } - /* Copy the argument into arg */ - strcpy(arg, p); + /* Save the argument for show-proxy-args */ + savearg(cmd, arg, config); - /* Should never happen, but check this anyway */ - if (*cmd == '\0') - { - continue; - } + directive_hash = hash_string(cmd); + switch (directive_hash) + { +/* ************************************************************************* + * actionsfile actions-file-name + * In confdir by default + * *************************************************************************/ + case hash_actions_file : + i = 0; + while ((i < MAX_AF_FILES) && (NULL != config->actions_file[i])) + { + i++; + } - /* Make sure the command field is lower case */ - for (p=cmd; *p; p++) - { - if (ijb_isupper(*p)) + if (i >= MAX_AF_FILES) { - *p = ijb_tolower(*p); + 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); - /* Save the argument for show-proxy-args */ - savearg(cmd, arg); + continue; +/* ************************************************************************* + * 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; + } + continue; +/* ************************************************************************* + * admin-address email-address + * *************************************************************************/ + case hash_admin_address : + freez(config->admin_address); + config->admin_address = strdup(arg); + continue; - switch( hash_string( cmd ) ) - { -#ifdef TRUST_FILES - case hash_trustfile : - freez((char *)trustfile); - trustfile = strdup(arg); - continue; +/* ************************************************************************* + * 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; + } + continue; - case hash_trust_info_url : - enlist(trust_info, arg); - continue; -#endif /* def TRUST_FILES */ +/* ************************************************************************* + * buffer-limit n + * *************************************************************************/ + case hash_buffer_limit : + config->buffer_limit = (size_t)(1024 * atoi(arg)); + continue; - case hash_debug : - debug |= atoi(arg); - continue; +/* ************************************************************************* + * confdir directory-name + * *************************************************************************/ + case hash_confdir : + freez(config->confdir); + config->confdir = make_path( NULL, arg); + continue; -#if defined(DETECT_MSIE_IMAGES) || defined(USE_IMAGE_LIST) - case hash_tinygif : - freez((char *)tinygifurl); - tinygif = atoi(arg); - if(3 == tinygif) - { - p = arg; - while((*p >= '0') && (*p <= '9')) - { - p++; - } - while((*p == ' ') || (*p == '\t')) - { - p++; - } - if (*p) - { - q = malloc(strlen(p) + 5); - if (q) - { - strcpy(q, p); - strcat(q, "\r\n\r\n"); - tinygifurl = q; - } - } - } - if ((tinygif != 1) && - (tinygif != 2) && - ((tinygif != 3) || (tinygifurl==NULL)) ) - { - log_error(LOG_LEVEL_ERROR, "tinygif setting invalid."); - } - continue; -#endif /* defined(DETECT_MSIE_IMAGES) || defined(USE_IMAGE_LIST) */ +/* ************************************************************************* + * debug n + * Specifies debug level, multiple values are ORed together. + * *************************************************************************/ + case hash_debug : + config->debug |= atoi(arg); + continue; - case hash_add_forwarded_header : - add_forwarded = 1; - continue; +/* ************************************************************************* + * deny-access source-ip[/significant-bits] [dest-ip[/significant-bits]] + * *************************************************************************/ +#ifdef FEATURE_ACL + case hash_deny_access: + vec_count = ssplit(arg, " \t", vec, SZ(vec), 1, 1); - case hash_single_threaded : - multi_threaded = 0; + if ((vec_count != 1) && (vec_count != 2)) + { + log_error(LOG_LEVEL_ERROR, "Wrong number of parameters for " + "deny-access directive in configuration file."); + string_append(&config->proxy_args, + "
\nWARNING: Wrong number of parameters for " + "deny-access directive in configuration file.

\n"); continue; + } - case hash_suppress_vanilla_wafer : - suppress_vanilla_wafer = 1; - continue; + /* allocate a new node */ + cur_acl = (struct access_control_list *) zalloc(sizeof(*cur_acl)); - case hash_wafer : - enlist(wafer_list, arg); + if (cur_acl == NULL) + { + log_error(LOG_LEVEL_FATAL, "can't allocate memory for configuration"); + /* Never get here - LOG_LEVEL_FATAL causes program exit */ continue; + } + cur_acl->action = ACL_DENY; - case hash_add_header : - enlist(xtra_list, arg); + if (acl_addr(vec[0], cur_acl->src) < 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 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; + } + if (vec_count == 2) + { + if (acl_addr(vec[1], cur_acl->dst) < 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 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; + } + } - case hash_permissions_file : - freez((char *)permissions_file); - permissions_file = strdup(arg); - continue; + /* + * Add it to the list. Note we reverse the list to get the + * behaviour the user expects. With both the ACL and + * actions file, the last match wins. However, the internal + * implementations are different: The actions file is stored + * in the same order as the file, and scanned completely. + * With the ACL, we reverse the order as we load it, then + * when we scan it we stop as soon as we get a match. + */ + cur_acl->next = config->acl; + config->acl = cur_acl; - case hash_logfile : - freez((char *)logfile); - logfile = strdup(arg); - continue; + continue; +#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; + } + continue; +#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; + } + continue; +#endif /* def FEATURE_TOGGLE */ - case hash_blockfile : - freez((char *)blockfile); - blockfile = strdup(arg); - continue; +/* ************************************************************************* + * 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; + } + continue; -#ifdef USE_IMAGE_LIST - case hash_imagefile : - freez((char *)imagefile); - imagefile = strdup(arg); - continue; -#endif /* def USE_IMAGE_LIST */ +/* ************************************************************************* + * 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 */ + continue; + +/* ************************************************************************* + * 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); -#ifdef JAR_FILES - case hash_jarfile : - freez((char *)jarfile); - jarfile = strdup(arg); + continue; + +/* ************************************************************************* + * forward url-pattern (.|http-proxy-host[:port]) + * *************************************************************************/ + case hash_forward: + vec_count = ssplit(arg, " \t", vec, SZ(vec), 1, 1); + + if (vec_count != 2) + { + log_error(LOG_LEVEL_ERROR, "Wrong number of parameters for forward " + "directive in configuration file."); + string_append(&config->proxy_args, + "
\nWARNING: Wrong number of parameters for " + "forward directive in configuration file."); continue; -#endif /* def JAR_FILES */ + } - case hash_listen_address : - freez((char *)haddr); - haddr = strdup(arg); + /* allocate a new node */ + cur_fwd = zalloc(sizeof(*cur_fwd)); + if (cur_fwd == NULL) + { + log_error(LOG_LEVEL_FATAL, "can't allocate memory for configuration"); + /* Never get here - LOG_LEVEL_FATAL causes program exit */ continue; + } - case hash_forwardfile : - freez((char *)forwardfile); - forwardfile = strdup(arg); + cur_fwd->type = SOCKS_NONE; + + /* Save the URL pattern */ + if (create_url_spec(cur_fwd->url, vec[0])) + { + log_error(LOG_LEVEL_ERROR, "Bad URL specifier for forward " + "directive in configuration file."); + string_append(&config->proxy_args, + "
\nWARNING: Bad URL specifier for " + "forward directive in configuration file."); continue; + } + + /* Parse the parent HTTP proxy host:port */ + p = vec[1]; + + if (strcmp(p, ".") != 0) + { + cur_fwd->forward_host = strdup(p); + + if (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; + } + } -#ifdef ACL_FILES - case hash_aclfile : - freez((char *)aclfile); - aclfile = strdup(arg); + /* Add to list. */ + cur_fwd->next = config->forward; + config->forward = cur_fwd; + + continue; + +/* ************************************************************************* + * forward-socks4 url-pattern socks-proxy[:port] (.|http-proxy[:port]) + * *************************************************************************/ + case hash_forward_socks4: + vec_count = ssplit(arg, " \t", vec, SZ(vec), 1, 1); + + if (vec_count != 3) + { + log_error(LOG_LEVEL_ERROR, "Wrong number of parameters for " + "forward-socks4 directive in configuration file."); + string_append(&config->proxy_args, + "
\nWARNING: Wrong number of parameters for " + "forward-socks4 directive in configuration file."); continue; -#endif /* def ACL_FILES */ + } -#ifdef PCRS - case hash_re_filterfile : - freez((char *)re_filterfile); - re_filterfile = strdup(arg); + /* allocate a new node */ + cur_fwd = zalloc(sizeof(*cur_fwd)); + if (cur_fwd == NULL) + { + log_error(LOG_LEVEL_FATAL, "can't allocate memory for configuration"); + /* Never get here - LOG_LEVEL_FATAL causes program exit */ continue; -#endif /* def PCRS */ + } + + cur_fwd->type = SOCKS_4; - case hash_user_agent : - freez((char *)uagent); - uagent = strdup(arg); + /* Save the URL pattern */ + if (create_url_spec(cur_fwd->url, vec[0])) + { + log_error(LOG_LEVEL_ERROR, "Bad URL specifier for forward-socks4 " + "directive in configuration file."); + string_append(&config->proxy_args, + "
\nWARNING: Bad URL specifier for " + "forward-socks4 directive in configuration file."); continue; + } + + /* Parse the SOCKS proxy host[:port] */ + p = vec[1]; + + if (strcmp(p, ".") != 0) + { + cur_fwd->gateway_host = strdup(p); + + if (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; + } + } + + /* 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; + } + } + + /* Add to list. */ + cur_fwd->next = config->forward; + config->forward = cur_fwd; + + continue; + +/* ************************************************************************* + * forward-socks4a url-pattern socks-proxy[:port] (.|http-proxy[:port]) + * *************************************************************************/ + case hash_forward_socks4a: + case hash_forward_socks5: + vec_count = ssplit(arg, " \t", vec, SZ(vec), 1, 1); - /* - * Offer choice of correct spelling according to dictionary, - * or the misspelling used in the HTTP spec. - */ - case hash_referrer : - case hash_referer : - freez((char *)referrer); - referrer = strdup(arg); + if (vec_count != 3) + { + log_error(LOG_LEVEL_ERROR, "Wrong number of parameters for " + "forward-socks4a directive in configuration file."); + string_append(&config->proxy_args, + "
\nWARNING: Wrong number of parameters for " + "forward-socks4a directive in configuration file."); continue; + } - case hash_from : - freez((char *)from); - from = strdup(arg); + /* allocate a new node */ + cur_fwd = zalloc(sizeof(*cur_fwd)); + if (cur_fwd == NULL) + { + log_error(LOG_LEVEL_FATAL, "can't allocate memory for configuration"); + /* Never get here - LOG_LEVEL_FATAL causes program exit */ continue; + } -#ifdef _WIN_CONSOLE - case hash_hide_console : - hideConsole = 1; + 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."); + string_append(&config->proxy_args, + "
\nWARNING: Bad URL specifier for " + "forward-socks4a directive in configuration file."); continue; -#endif /*def _WIN_CONSOLE*/ + } + + /* 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; + } + + /* 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; + } + } + + /* Add to list. */ + cur_fwd->next = config->forward; + config->forward = cur_fwd; + + continue; -#ifndef SPLIT_PROXY_ARGS - case hash_suppress_blocklists : - if (arg[0] != '\0') +/* ************************************************************************* + * forwarded-connect-retries n + * *************************************************************************/ + case hash_forwarded_connect_retries : + config->forwarded_connect_retries = atoi(arg); + continue; + +/* ************************************************************************* + * 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."); + } + continue; + +/* ************************************************************************* + * keep-alive-timeout timeout + * *************************************************************************/ +#ifdef FEATURE_CONNECTION_KEEP_ALIVE + case hash_keep_alive_timeout : + if (*arg != '\0') + { + int timeout = atoi(arg); + if (0 <= timeout) { - suppress_message = strdup(arg); + config->feature_flags |= RUNTIME_FEATURE_CONNECTION_KEEP_ALIVE; + keep_alive_timeout = timeout; } else { - /* There will be NO reference in proxy-args. */ - suppress_message = NULL; + config->feature_flags &= ~RUNTIME_FEATURE_CONNECTION_KEEP_ALIVE; } + } + continue; +#endif - suppress_blocklists = 1; - continue; -#endif /* ndef SPLIT_PROXY_ARGS */ +/* ************************************************************************* + * listen-address [ip][:port] + * *************************************************************************/ + case hash_listen_address : + freez(config->haddr); + config->haddr = strdup(arg); + continue; -#ifdef TOGGLE - case hash_toggle : - g_bToggleIJB = atoi(arg); - continue; -#endif /* def TOGGLE */ +/* ************************************************************************* + * logdir directory-name + * *************************************************************************/ + case hash_logdir : + freez(config->logdir); + config->logdir = make_path(NULL, arg); + continue; -#if defined(_WIN32) && ! defined(_WIN_CONSOLE) - case hash_activity_animation : - g_bShowActivityAnimation = atoi(arg); - continue; +/* ************************************************************************* + * logfile log-file-name + * In logdir by default + * *************************************************************************/ + case hash_logfile : + if (!no_daemon) + { + logfile = make_path(config->logdir, arg); + if (NULL == logfile) + { + log_error(LOG_LEVEL_FATAL, "Out of memory while creating logfile path"); + } + } + continue; - case hash_log_messages : - g_bLogMessages = atoi(arg); - continue; +/* ************************************************************************* + * 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); - case hash_log_highlight_messages : - g_bHighlightMessages = atoi(arg); - continue; + if ((vec_count != 1) && (vec_count != 2)) + { + log_error(LOG_LEVEL_ERROR, "Wrong number of parameters for " + "permit-access directive in configuration file."); + string_append(&config->proxy_args, + "
\nWARNING: Wrong number of parameters for " + "permit-access directive in configuration file.

\n"); - case hash_log_buffer_size : - g_bLimitBufferSize = atoi(arg); continue; + } - case hash_log_max_lines : - g_nMaxBufferLines = atoi(arg); - continue; + /* allocate a new node */ + cur_acl = (struct access_control_list *) zalloc(sizeof(*cur_acl)); - case hash_log_font_name : - strcpy( g_szFontFaceName, arg ); + if (cur_acl == NULL) + { + log_error(LOG_LEVEL_FATAL, "can't allocate memory for configuration"); + /* Never get here - LOG_LEVEL_FATAL causes program exit */ continue; + } + cur_acl->action = ACL_PERMIT; - case hash_log_font_size : - g_nFontSize = atoi(arg); + if (acl_addr(vec[0], cur_acl->src) < 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 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; + } + if (vec_count == 2) + { + if (acl_addr(vec[1], cur_acl->dst) < 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 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; + } + } - case hash_show_on_task_bar : - g_bShowOnTaskBar = atoi(arg); - continue; + /* + * Add it to the list. Note we reverse the list to get the + * behaviour the user expects. With both the ACL and + * actions file, the last match wins. However, the internal + * implementations are different: The actions file is stored + * in the same order as the file, and scanned completely. + * With the ACL, we reverse the order as we load it, then + * when we scan it we stop as soon as we get a match. + */ + cur_acl->next = config->acl; + config->acl = cur_acl; + + continue; +#endif /* def FEATURE_ACL */ + +/* ************************************************************************* + * proxy-info-url url + * *************************************************************************/ + case hash_proxy_info_url : + freez(config->proxy_info_url); + config->proxy_info_url = strdup(arg); + continue; + +/* ************************************************************************* + * single-threaded + * *************************************************************************/ + case hash_single_threaded : + config->multi_threaded = 0; + continue; + +/* ************************************************************************* + * 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); + } + } + continue; + +/* ************************************************************************* + * split-large-cgi-forms + * *************************************************************************/ + case hash_split_large_cgi_forms : + if ((*arg != '\0') && (0 != atoi(arg))) + { + config->feature_flags |= RUNTIME_FEATURE_SPLIT_LARGE_FORMS; + } + else + { + config->feature_flags &= ~RUNTIME_FEATURE_SPLIT_LARGE_FORMS; + } + continue; + +/* ************************************************************************* + * templdir directory-name + * *************************************************************************/ + case hash_templdir : + freez(config->templdir); + config->templdir = make_path(NULL, arg); + continue; + +/* ************************************************************************* + * toggle (0|1) + * *************************************************************************/ +#ifdef FEATURE_TOGGLE + case hash_toggle : + global_toggle_state = atoi(arg); + continue; +#endif /* def FEATURE_TOGGLE */ + +/* ************************************************************************* + * trust-info-url url + * *************************************************************************/ +#ifdef FEATURE_TRUST + case hash_trust_info_url : + enlist(config->trust_info, arg); + continue; +#endif /* def FEATURE_TRUST */ + +/* ************************************************************************* + * trustfile filename + * (In confdir by default.) + * *************************************************************************/ +#ifdef FEATURE_TRUST + case hash_trustfile : + freez(config->trustfile); + config->trustfile = make_path(config->confdir, arg); + continue; +#endif /* def FEATURE_TRUST */ + +/* ************************************************************************* + * usermanual url + * *************************************************************************/ + case hash_usermanual : + freez(config->usermanual); + config->usermanual = strdup(arg); + continue; + +/* ************************************************************************* + * Win32 Console options: + * *************************************************************************/ + +/* ************************************************************************* + * hide-console + * *************************************************************************/ +#ifdef _WIN_CONSOLE + case hash_hide_console : + hideConsole = 1; + continue; +#endif /*def _WIN_CONSOLE*/ + + +/* ************************************************************************* + * Win32 GUI options: + * *************************************************************************/ + +#if defined(_WIN32) && ! defined(_WIN_CONSOLE) +/* ************************************************************************* + * activity-animation (0|1) + * *************************************************************************/ + case hash_activity_animation : + g_bShowActivityAnimation = atoi(arg); + continue; + +/* ************************************************************************* + * close-button-minimizes (0|1) + * *************************************************************************/ + case hash_close_button_minimizes : + g_bCloseHidesWindow = atoi(arg); + continue; + +/* ************************************************************************* + * log-buffer-size (0|1) + * *************************************************************************/ + case hash_log_buffer_size : + g_bLimitBufferSize = atoi(arg); + continue; + +/* ************************************************************************* + * log-font-name fontnane + * *************************************************************************/ + case hash_log_font_name : + strcpy( g_szFontFaceName, arg ); + continue; + +/* ************************************************************************* + * log-font-size n + * *************************************************************************/ + case hash_log_font_size : + g_nFontSize = atoi(arg); + continue; + +/* ************************************************************************* + * log-highlight-messages (0|1) + * *************************************************************************/ + case hash_log_highlight_messages : + g_bHighlightMessages = atoi(arg); + continue; + +/* ************************************************************************* + * log-max-lines n + * *************************************************************************/ + case hash_log_max_lines : + g_nMaxBufferLines = atoi(arg); + continue; + +/* ************************************************************************* + * log-messages (0|1) + * *************************************************************************/ + case hash_log_messages : + g_bLogMessages = atoi(arg); + continue; + +/* ************************************************************************* + * show-on-task-bar (0|1) + * *************************************************************************/ + case hash_show_on_task_bar : + g_bShowOnTaskBar = atoi(arg); + continue; - case hash_close_button_minimizes : - g_bCloseHidesWindow = atoi(arg); - continue; #endif /* defined(_WIN32) && ! defined(_WIN_CONSOLE) */ - /* Warnings about unsupported features */ - -#ifndef TRUST_FILES - case hash_trustfile : - case hash_trust_info_url : -#endif /* ndef TRUST_FILES */ -#ifndef USE_IMAGE_LIST - case hash_imagefile : -#endif /* ndef USE_IMAGE_LIST */ -#ifndef PCRS - case hash_re_filterfile : -#endif /* ndef PCRS */ -#ifndef TOGGLE - case hash_toggle : -#endif /* ndef TOGGLE */ -#if defined(_WIN_CONSOLE) || ! defined(_WIN32) - case hash_activity_animation : - case hash_log_messages : - case hash_log_highlight_messages : - case hash_log_buffer_size : - case hash_log_max_lines : - case hash_log_font_name : - case hash_log_font_size : - case hash_show_on_task_bar : - case hash_close_button_minimizes : -#endif /* defined(_WIN_CONSOLE) || ! defined(_WIN32) */ + +/* ************************************************************************* + * Warnings about unsupported features + * *************************************************************************/ +#ifndef FEATURE_ACL + case hash_deny_access: +#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 FEATURE_ACL */ +#ifndef FEATURE_TOGGLE + case hash_toggle : +#endif /* ndef FEATURE_TOGGLE */ +#ifndef FEATURE_TRUST + case hash_trustfile : + case hash_trust_info_url : +#endif /* ndef FEATURE_TRUST */ + #ifndef _WIN_CONSOLE - case hash_hide_console : + case hash_hide_console : #endif /* ndef _WIN_CONSOLE */ -#if !defined(DETECT_MSIE_IMAGES) && !defined(USE_IMAGE_LIST) - case hash_tinygif : -#endif /* !defined(DETECT_MSIE_IMAGES) && !defined(USE_IMAGE_LIST) */ -#ifndef JAR_FILES - case hash_jarfile : -#endif /* ndef JAR_FILES */ -#ifndef ACL_FILES - case hash_aclfile : -#endif /* ndef ACL_FILES */ - -#ifdef SPLIT_PROXY_ARGS - case hash_suppress_blocklists : -#endif /* def SPLIT_PROXY_ARGS */ - log_error(LOG_LEVEL_INFO, "Unsupported directive \"%s\" ignored.", cmd); - continue; - default : - /* - * I decided that I liked this better as a warning than an - * error. To change back to an error, just change log level - * to LOG_LEVEL_FATAL. - */ - log_error(LOG_LEVEL_ERROR, "Unrecognized directive (%lulu) in " - "configuration file: \"%s\"", hash_string( cmd ), buf); - p = malloc( BUFSIZ ); - if (p != NULL) - { - sprintf( p, "
\nWARNING: unrecognized directive : %s

\n", buf ); - proxy_args->invocation = strsav( proxy_args->invocation, p ); - freez( p ); - } - continue; - } - } - fclose(configfp); - } +#if defined(_WIN_CONSOLE) || ! defined(_WIN32) + case hash_activity_animation : + case hash_close_button_minimizes : + case hash_log_buffer_size : + case hash_log_font_name : + case hash_log_font_size : + case hash_log_highlight_messages : + case hash_log_max_lines : + case hash_log_messages : + case hash_show_on_task_bar : +#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; + +/* *************************************************************************/ + 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, "Ignoring unrecognized directive '%s' (%luul) in line %lu " + "in configuration file (%s).", buf, directive_hash, linenum, configfile); + string_append(&config->proxy_args, + " Warning: ignored unrecognized directive above.
"); + continue; - init_error_log(Argv[0], logfile, debug); +/* *************************************************************************/ + } /* end switch( hash_string(cmd) ) */ + } /* end while ( read_config_line(...) ) */ - if (permissions_file) + fclose(configfp); + + set_debug_level(config->debug); + + freez(config->logfile); + + if (!no_daemon) { - add_loader(load_permissions_file); + if (NULL != logfile) + { + config->logfile = logfile; + init_error_log(Argv[0], config->logfile); + } + else + { + disable_logging(); + } } - if (blockfile) +#ifdef FEATURE_CONNECTION_KEEP_ALIVE + if (config->feature_flags & RUNTIME_FEATURE_CONNECTION_KEEP_ALIVE) { - add_loader(load_blockfile); + if (config->multi_threaded) + { + set_keep_alive_timeout(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. + */ + config->feature_flags &= ~RUNTIME_FEATURE_CONNECTION_KEEP_ALIVE; + log_error(LOG_LEVEL_ERROR, + "Config option single-threaded disables connection keep-alive."); + } } +#endif -#ifdef USE_IMAGE_LIST - if (imagefile) + if (NULL == config->proxy_args) { - add_loader(load_imagefile); + log_error(LOG_LEVEL_FATAL, "Out of memory loading config - insufficient memory for config->proxy_args"); } -#endif /* def USE_IMAGE_LIST */ -#ifdef TRUST_FILES - if (trustfile) + if (config->actions_file[0]) { - add_loader(load_trustfile); + add_loader(load_action_files, config); } -#endif /* def TRUST_FILES */ - if (forwardfile) + if (config->re_filterfile[0]) { - add_loader(load_forwardfile); + add_loader(load_re_filterfiles, config); } -#ifdef ACL_FILES - if (aclfile) +#ifdef FEATURE_TRUST + if (config->trustfile) { - add_loader(load_aclfile); + add_loader(load_trustfile, config); } -#endif /* def ACL_FILES */ +#endif /* def FEATURE_TRUST */ -#ifdef PCRS - if (re_filterfile) + if ( NULL == config->haddr ) { - add_loader(load_re_filterfile); + config->haddr = strdup( HADDR_DEFAULT ); } -#endif /* def PCRS */ -#ifdef JAR_FILES - if ( NULL != jarfile ) + if ( NULL != config->haddr ) { - if ( NULL == (jar = fopen(jarfile, "a")) ) + if (NULL != (p = strchr(config->haddr, ':'))) { - log_error(LOG_LEVEL_FATAL, "can't open jarfile '%s': %E", jarfile); + *p++ = '\0'; + if (*p) + { + config->hport = atoi(p); + } + } + + if (config->hport <= 0) + { + *--p = ':'; + log_error(LOG_LEVEL_FATAL, "invalid bind port spec %s", config->haddr); /* Never get here - LOG_LEVEL_FATAL causes program exit */ } - setbuf(jar, NULL); + if (*config->haddr == '\0') + { + /* + * Only the port specified. We stored it in config->hport + * and don't need its text representation anymore. + */ + freez(config->haddr); + } } -#endif /* def JAR_FILES */ - if ( NULL == haddr ) + /* + * Want to run all the loaders once now. + * + * Need to set up a fake csp, so they can get to the config. + */ + fake_csp = (struct client_state *) zalloc (sizeof(*fake_csp)); + fake_csp->config = config; + + if (run_loader(fake_csp)) { - haddr = strdup( HADDR_DEFAULT ); + freez(fake_csp); + log_error(LOG_LEVEL_FATAL, "A loader failed while loading config file. Exiting."); + /* Never get here - LOG_LEVEL_FATAL causes program exit */ } + freez(fake_csp); + +/* 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 */ - if ( NULL != haddr ) +#ifdef FEATURE_TRUST + g_trustfile = config->trustfile; +#endif /* def FEATURE_TRUST */ + + +#endif /* defined(_WIN32) && !defined (_WIN_CONSOLE) */ +/* FIXME: end kludge */ + + + config->need_bind = 1; + + if (current_configfile) { - if ((p = strchr(haddr, ':'))) + struct configuration_spec * oldcfg = (struct configuration_spec *) + current_configfile->f; + /* + * Check if config->haddr,hport == oldcfg->haddr,hport + * + * The following could be written more compactly as a single, + * (unreadably long) if statement. + */ + config->need_bind = 0; + if (config->hport != oldcfg->hport) { - *p++ = '\0'; - if (*p) + config->need_bind = 1; + } + else if (config->haddr == NULL) + { + if (oldcfg->haddr != NULL) { - hport = atoi(p); + config->need_bind = 1; } } - - if (hport <= 0) + else if (oldcfg->haddr == NULL) { - *--p = ':'; - log_error(LOG_LEVEL_FATAL, "invalid bind port spec %s", haddr); - /* Never get here - LOG_LEVEL_FATAL causes program exit */ + config->need_bind = 1; } - if (*haddr == '\0') + else if (0 != strcmp(config->haddr, oldcfg->haddr)) { - haddr = NULL; + config->need_bind = 1; } - } - if (run_loader(NULL)) - { - log_error(LOG_LEVEL_FATAL, "A loader failed while loading config file. Exiting."); - /* Never get here - LOG_LEVEL_FATAL causes program exit */ + current_configfile->unloader = unload_configfile; } -#ifdef JAR_FILES + fs->next = files->next; + files->next = fs; + + current_configfile = fs; + + return (config); +} + + +/********************************************************************* + * + * 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); + /* - * If we're logging cookies in a cookie jar, and the user has not - * supplied any wafers, and the user has not told us to suppress the - * vanilla wafer, then send the vanilla wafer. + * Add config option name embedded in + * link to its section in the user-manual */ - if ((jarfile != NULL) - && (wafer_list->next == NULL) - && (suppress_vanilla_wafer == 0)) + buf = strdup("\nusermanual, "file://", 7) || + !strncmpic(config->usermanual, "http", 4)) + { + string_append(&buf, config->usermanual); + } + else { - enlist(wafer_list, VANILLA_WAFER); + string_append(&buf, "http://" CGI_SITE_2_HOST "/user-manual/"); } -#endif /* def JAR_FILES */ + string_append(&buf, CONFIG_HELP_PREFIX); + string_join (&buf, string_toupper(command)); + string_append(&buf, "\">"); + string_append(&buf, command); + string_append(&buf, " "); - end_proxy_args(); + 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); }