X-Git-Url: http://www.privoxy.org/gitweb/?p=privoxy.git;a=blobdiff_plain;f=loadcfg.c;h=dff7325886a8f49c8d251e24bff97da794071f01;hp=d62244cb7d3009eca47bfa83437513d61f957320;hb=abeb270803c84f18699423993ac24f19374a02ad;hpb=4ef2e11672d18bdb4751cf781f0623d7252248fe diff --git a/loadcfg.c b/loadcfg.c index d62244cb..dff73258 100644 --- a/loadcfg.c +++ b/loadcfg.c @@ -1,4 +1,4 @@ -const char loadcfg_rcs[] = "$Id: loadcfg.c,v 1.45 2002/04/24 02:11:54 oes Exp $"; +const char loadcfg_rcs[] = "$Id: loadcfg.c,v 1.58 2006/12/31 14:24:29 fabiankeil Exp $"; /********************************************************************* * * File : $Source: /cvsroot/ijbswa/current/loadcfg.c,v $ @@ -35,8 +35,89 @@ const char loadcfg_rcs[] = "$Id: loadcfg.c,v 1.45 2002/04/24 02:11:54 oes Exp $" * * Revisions : * $Log: loadcfg.c,v $ + * 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_ACTION_FILES actionsfile options + * 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 @@ -358,8 +439,8 @@ const char loadcfg_h_rcs[] = LOADCFG_H_VERSION; #define ijb_tolower(__X) tolower((int)(unsigned char)(__X)) #ifdef FEATURE_TOGGLE -/* by haroon - indicates if ijb is enabled */ -int g_bToggleIJB = 1; /* Privoxy is enabled by default. */ +/* Privoxy is enabled by default. */ +int global_toggle_state = 1; #endif /* def FEATURE_TOGGLE */ /* The filename of the configfile */ @@ -387,40 +468,44 @@ 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_filterfile 250887266ul /* "filterfile" */ -#define hash_forward 2029845ul /* "forward" */ -#define hash_forward_socks4 3963965521ul /* "forward-socks4" */ -#define hash_forward_socks4a 2639958518ul /* "forward-socks4a" */ -#define hash_jarfile 2046641ul /* "jarfile" */ -#define hash_listen_address 1255650842ul /* "listen-address" */ -#define hash_logdir 422889ul /* "logdir" */ -#define hash_logfile 2114766ul /* "logfile" */ -#define hash_permit_access 3587953268ul /* "permit-access" */ -#define hash_proxy_info_url 3903079059ul /* "proxy-info-url" */ -#define hash_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_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_split_large_cgi_forms 671658948ul /* "split-large-cgi-forms" */ +#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" */ static void savearg(char *command, char *argument, struct configuration_spec * config); @@ -441,9 +526,10 @@ void unload_configfile (void * data) { struct configuration_spec * config = (struct configuration_spec *)data; struct forward_spec *cur_fwd = config->forward; + int i; + #ifdef FEATURE_ACL struct access_control_list *cur_acl = config->acl; - int i; while (cur_acl != NULL) { @@ -480,10 +566,12 @@ void unload_configfile (void * data) freez(config->haddr); freez(config->logfile); - for (i = 0; i < MAX_ACTION_FILES; i++) + for (i = 0; i < MAX_AF_FILES; i++) { freez(config->actions_file_short[i]); freez(config->actions_file[i]); + freez(config->re_filterfile_short[i]); + freez(config->re_filterfile[i]); } freez(config->admin_address); @@ -495,8 +583,17 @@ void unload_configfile (void * data) freez(config->jarfile); #endif /* def FEATURE_COOKIE_JAR */ - freez(config->re_filterfile); +#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); } @@ -530,11 +627,9 @@ void unload_current_config_file(void) * * Description : Load the config file and all parameters. * - * Parameters : - * 1 : csp = Client state (the config member will be - * filled in by this function). + * Parameters : None * - * Returns : 0 => Ok, everything else is an error. + * Returns : The configuration_spec, or NULL on error. * *********************************************************************/ struct configuration_spec * load_config(void) @@ -562,7 +657,7 @@ struct configuration_spec * load_config(void) log_error(LOG_LEVEL_INFO, "loading configuration file '%s':", configfile); #ifdef FEATURE_TOGGLE - g_bToggleIJB = 1; + global_toggle_state = 1; #endif /* def FEATURE_TOGGLE */ fs->f = config = (struct configuration_spec *)zalloc(sizeof(*config)); @@ -589,11 +684,15 @@ 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->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->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) { @@ -645,7 +744,7 @@ struct configuration_spec * load_config(void) { if (ijb_isupper(*p)) { - *p = ijb_tolower(*p); + *p = (char)ijb_tolower(*p); } } @@ -661,16 +760,16 @@ struct configuration_spec * load_config(void) * *************************************************************************/ case hash_actions_file : i = 0; - while ((i < MAX_ACTION_FILES) && (NULL != config->actions_file[i])) + while ((i < MAX_AF_FILES) && (NULL != config->actions_file[i])) { i++; } - if (i >= MAX_ACTION_FILES) + if (i >= MAX_AF_FILES) { log_error(LOG_LEVEL_FATAL, "Too many 'actionsfile' directives in config file - limit is %d.\n" - "(You can increase this limit by changing MAX_ACTION_FILES in project.h and recompiling).", - MAX_ACTION_FILES); + "(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); p = malloc(strlen(arg) + sizeof(".action")); @@ -683,6 +782,19 @@ struct configuration_spec * load_config(void) config->actions_file[i] = make_path(config->confdir, p); free(p); 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 @@ -696,7 +808,7 @@ struct configuration_spec * load_config(void) * buffer-limit n * *************************************************************************/ case hash_buffer_limit : - config->buffer_limit = (size_t) 1024 * atoi(arg); + config->buffer_limit = (size_t)(1024 * atoi(arg)); continue; /* ************************************************************************* @@ -822,6 +934,48 @@ struct configuration_spec * load_config(void) continue; #endif /* def FEATURE_CGI_EDIT_ACTIONS */ +/* ************************************************************************* + * 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; + +/* ************************************************************************* + * 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); + 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; + /* ************************************************************************* * forward url-pattern (.|http-proxy-host[:port]) * *************************************************************************/ @@ -1044,6 +1198,13 @@ struct configuration_spec * load_config(void) continue; +/* ************************************************************************* + * forwarded-connect-retries n + * *************************************************************************/ + case hash_forwarded_connect_retries : + config->forwarded_connect_retries = atoi(arg); + continue; + /* ************************************************************************* * jarfile jar-file-name * In logdir by default @@ -1166,19 +1327,24 @@ struct configuration_spec * load_config(void) continue; /* ************************************************************************* - * re_filterfile file-name - * In confdir by default. + * single-threaded * *************************************************************************/ - case hash_filterfile : - freez(config->re_filterfile); - config->re_filterfile = make_path(config->confdir, arg); + case hash_single_threaded : + config->multi_threaded = 0; continue; /* ************************************************************************* - * single-threaded + * split-large-cgi-forms * *************************************************************************/ - case hash_single_threaded : - config->multi_threaded = 0; + 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; /* ************************************************************************* @@ -1186,7 +1352,7 @@ struct configuration_spec * load_config(void) * *************************************************************************/ #ifdef FEATURE_TOGGLE case hash_toggle : - g_bToggleIJB = atoi(arg); + global_toggle_state = atoi(arg); continue; #endif /* def FEATURE_TOGGLE */ @@ -1354,11 +1520,10 @@ struct configuration_spec * load_config(void) * error. To change back to an error, just change log level * to LOG_LEVEL_FATAL. */ - log_error(LOG_LEVEL_ERROR, "Unrecognized directive '%s' (%luul) in line %lu in " - "configuration file (%s).", buf, hash_string(cmd), linenum, configfile); - string_append(&config->proxy_args, "
\nWARNING: unrecognized directive : "); - string_append(&config->proxy_args, buf); - string_append(&config->proxy_args, "

\n"); + log_error(LOG_LEVEL_ERROR, "Ignoring unrecognized directive '%s' (%luul) in line %lu " + "in configuration file (%s).", buf, hash_string(cmd), linenum, configfile); + string_append(&config->proxy_args, + " WARNING: unrecognized directive, ignored"); continue; /* *************************************************************************/ @@ -1450,8 +1615,9 @@ struct configuration_spec * load_config(void) /* FIXME: this is a kludge for win32 */ #if defined(_WIN32) && !defined (_WIN_CONSOLE) - g_actions_file = config->actions_file[0]; /* FIXME only works for first action file */ - g_re_filterfile = config->re_filterfile; + 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 */ #ifdef FEATURE_TRUST g_trustfile = config->trustfile; @@ -1520,6 +1686,7 @@ struct configuration_spec * load_config(void) * 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 * @@ -1533,8 +1700,27 @@ static void savearg(char *command, char *argument, struct configuration_spec * c assert(*command); assert(argument); - buf = strdup(""); - string_join(&buf, add_help_link(command, config)); + /* + * Add config option name embedded in + * link to it's section in the user-manual + */ + buf = strdup("\nusermanual, "file://", 7) || + !strncmpic(config->usermanual, "http", 4)) + { + string_append(&buf, config->usermanual); + } + else + { + string_append(&buf, "http://"); + string_append(&buf, CGI_SITE_2_HOST); + string_append(&buf, "/user-manual/"); + } + string_append(&buf, CONFIG_HELP_PREFIX); + string_join (&buf, string_toupper(command)); + string_append(&buf, "\">"); + string_append(&buf, command); + string_append(&buf, " "); if (NULL == buf) { @@ -1566,8 +1752,7 @@ static void savearg(char *command, char *argument, struct configuration_spec * c } } - string_append(&buf, "
\n"); - + string_append(&buf, "
"); string_join(&config->proxy_args, buf); }