X-Git-Url: http://www.privoxy.org/gitweb/?a=blobdiff_plain;f=loadcfg.c;h=6282b314316e8ba46c3e795954e075ce80b38061;hb=554c1b63903821d0ce15fe1f75f6361475dc4f6f;hp=61ba3a7705a0e81caa2c499c54c74cbb36fcdfe6;hpb=878f6c6aafd874856363349ae9843708e7897832;p=privoxy.git diff --git a/loadcfg.c b/loadcfg.c index 61ba3a77..6282b314 100644 --- a/loadcfg.c +++ b/loadcfg.c @@ -1,4 +1,4 @@ -const char loadcfg_rcs[] = "$Id: loadcfg.c,v 1.86 2009/02/08 19:18:57 fabiankeil Exp $"; +const char loadcfg_rcs[] = "$Id: loadcfg.c,v 1.92 2009/03/18 20:43:19 fabiankeil Exp $"; /********************************************************************* * * File : $Source: /cvsroot/ijbswa/current/loadcfg.c,v $ @@ -8,7 +8,7 @@ const char loadcfg_rcs[] = "$Id: loadcfg.c,v 1.86 2009/02/08 19:18:57 fabiankeil * routine to load the configuration and the global * variables it writes to. * - * Copyright : Written by and Copyright (C) 2001-2008 the SourceForge + * Copyright : Written by and Copyright (C) 2001-2009 the * Privoxy team. http://www.privoxy.org/ * * Based on the Internet Junkbuster originally written @@ -35,6 +35,34 @@ const char loadcfg_rcs[] = "$Id: loadcfg.c,v 1.86 2009/02/08 19:18:57 fabiankeil * * Revisions : * $Log: loadcfg.c,v $ + * Revision 1.92 2009/03/18 20:43:19 fabiankeil + * Don't enable LOG_LEVEL_INFO by default and don't apply the user's + * debug settings until the logfile has been opened (if there is one). + * Patch submitted by Roland in #2624120. + * + * Revision 1.91 2009/03/09 17:29:08 fabiankeil + * As of r1.88, the show-status page can use a single line for + * warnings about ignored directives and the names of the ignored + * directives themselves. Reminded by Lee, finally closes #1856559. + * + * Revision 1.90 2009/03/07 17:58:02 fabiankeil + * Fix two mingw32-only buffer overflows. Note that triggering + * them requires control over the configuration file in which + * case all bets are off anyway. + * + * Revision 1.89 2009/03/01 18:46:33 fabiankeil + * - Help clang understand that we aren't + * dereferencing NULL pointers here. + * - Some style fixes in the modified region. + * + * Revision 1.88 2009/02/28 10:57:10 fabiankeil + * Gimme a break or two. Don't let the show-status page + * link to the website documentation for the user-manual + * directive itself. + * + * Revision 1.87 2009/02/15 07:56:13 fabiankeil + * Increase default socket timeout to 300 seconds. + * * Revision 1.86 2009/02/08 19:18:57 fabiankeil * Now that we have the match-all.action file, the other action * files changed their position in config->actions_file[] back @@ -758,15 +786,16 @@ struct configuration_spec * load_config(void) int keep_alive_timeout = DEFAULT_KEEP_ALIVE_TIMEOUT; #endif - if ( !check_file_changed(current_configfile, configfile, &fs)) + if (!check_file_changed(current_configfile, configfile, &fs)) { /* No need to load */ return ((struct configuration_spec *)current_configfile->f); } - if (!fs) + if (NULL == fs) { - log_error(LOG_LEVEL_FATAL, "can't check configuration file '%s': %E", - configfile); + log_error(LOG_LEVEL_FATAL, + "can't check configuration file '%s': %E", configfile); + return NULL; } if (NULL != current_configfile) @@ -775,17 +804,17 @@ struct configuration_spec * load_config(void) } #ifdef FEATURE_TOGGLE - global_toggle_state = 1; + global_toggle_state = 1; #endif /* def FEATURE_TOGGLE */ fs->f = config = (struct configuration_spec *)zalloc(sizeof(*config)); - if (config==NULL) + if (NULL == config) { freez(fs->filename); freez(fs); log_error(LOG_LEVEL_FATAL, "can't allocate memory for configuration"); - /* Never get here - LOG_LEVEL_FATAL causes program exit */ + return NULL; } /* @@ -813,10 +842,11 @@ struct configuration_spec * load_config(void) config->feature_flags &= ~RUNTIME_FEATURE_SPLIT_LARGE_FORMS; config->feature_flags &= ~RUNTIME_FEATURE_ACCEPT_INTERCEPTED_REQUESTS; - if ((configfp = fopen(configfile, "r")) == NULL) + configfp = fopen(configfile, "r"); + if (NULL == configfp) { - log_error(LOG_LEVEL_FATAL, "can't open configuration file '%s': %E", - configfile); + log_error(LOG_LEVEL_FATAL, + "can't open configuration file '%s': %E", configfile); /* Never get here - LOG_LEVEL_FATAL causes program exit */ } @@ -860,7 +890,7 @@ struct configuration_spec * load_config(void) } /* Make sure the command field is lower case */ - for (p=cmd; *p; p++) + for (p = cmd; *p; p++) { if (ijb_isupper(*p)) { @@ -868,9 +898,6 @@ struct configuration_spec * load_config(void) } } - /* Save the argument for show-proxy-args */ - savearg(cmd, arg, config); - directive_hash = hash_string(cmd); switch (directive_hash) { @@ -894,7 +921,7 @@ struct configuration_spec * load_config(void) config->actions_file_short[i] = strdup(arg); config->actions_file[i] = make_path(config->confdir, arg); - continue; + break; /* ************************************************************************* * accept-intercepted-requests * *************************************************************************/ @@ -907,7 +934,7 @@ struct configuration_spec * load_config(void) { config->feature_flags &= ~RUNTIME_FEATURE_ACCEPT_INTERCEPTED_REQUESTS; } - continue; + break; /* ************************************************************************* * admin-address email-address @@ -915,7 +942,7 @@ struct configuration_spec * load_config(void) case hash_admin_address : freez(config->admin_address); config->admin_address = strdup(arg); - continue; + break; /* ************************************************************************* * allow-cgi-request-crunching @@ -929,14 +956,14 @@ struct configuration_spec * load_config(void) { config->feature_flags &= ~RUNTIME_FEATURE_CGI_CRUNCHING; } - continue; + break; /* ************************************************************************* * buffer-limit n * *************************************************************************/ case hash_buffer_limit : config->buffer_limit = (size_t)(1024 * atoi(arg)); - continue; + break; /* ************************************************************************* * confdir directory-name @@ -944,7 +971,7 @@ struct configuration_spec * load_config(void) case hash_confdir : freez(config->confdir); config->confdir = make_path( NULL, arg); - continue; + break; /* ************************************************************************* * debug n @@ -952,14 +979,15 @@ struct configuration_spec * load_config(void) * *************************************************************************/ case hash_debug : config->debug |= atoi(arg); - continue; + break; /* ************************************************************************* * deny-access source-ip[/significant-bits] [dest-ip[/significant-bits]] * *************************************************************************/ #ifdef FEATURE_ACL case hash_deny_access: - vec_count = ssplit(arg, " \t", vec, SZ(vec), 1, 1); + strlcpy(tmp, arg, sizeof(tmp)); + vec_count = ssplit(tmp, " \t", vec, SZ(vec), 1, 1); if ((vec_count != 1) && (vec_count != 2)) { @@ -968,7 +996,7 @@ struct configuration_spec * load_config(void) string_append(&config->proxy_args, "
\nWARNING: Wrong number of parameters for " "deny-access directive in configuration file.

\n"); - continue; + break; } /* allocate a new node */ @@ -978,7 +1006,7 @@ struct configuration_spec * load_config(void) { log_error(LOG_LEVEL_FATAL, "can't allocate memory for configuration"); /* Never get here - LOG_LEVEL_FATAL causes program exit */ - continue; + break; } cur_acl->action = ACL_DENY; @@ -994,7 +1022,7 @@ struct configuration_spec * load_config(void) string_append(&config->proxy_args, "\"

\n"); freez(cur_acl); - continue; + break; } if (vec_count == 2) { @@ -1010,7 +1038,7 @@ struct configuration_spec * load_config(void) string_append(&config->proxy_args, "\"

\n"); freez(cur_acl); - continue; + break; } } @@ -1026,7 +1054,7 @@ struct configuration_spec * load_config(void) cur_acl->next = config->acl; config->acl = cur_acl; - continue; + break; #endif /* def FEATURE_ACL */ /* ************************************************************************* @@ -1042,7 +1070,7 @@ struct configuration_spec * load_config(void) { config->feature_flags &= ~RUNTIME_FEATURE_CGI_EDIT_ACTIONS; } - continue; + break; #endif /* def FEATURE_CGI_EDIT_ACTIONS */ /* ************************************************************************* @@ -1058,7 +1086,7 @@ struct configuration_spec * load_config(void) { config->feature_flags &= ~RUNTIME_FEATURE_CGI_TOGGLE; } - continue; + break; #endif /* def FEATURE_TOGGLE */ /* ************************************************************************* @@ -1073,7 +1101,7 @@ struct configuration_spec * load_config(void) { config->feature_flags &= ~RUNTIME_FEATURE_HTTP_TOGGLE; } - continue; + break; /* ************************************************************************* * enforce-blocks 0|1 @@ -1092,7 +1120,7 @@ struct configuration_spec * load_config(void) 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; + break; /* ************************************************************************* * filterfile file-name @@ -1114,13 +1142,14 @@ struct configuration_spec * load_config(void) config->re_filterfile_short[i] = strdup(arg); config->re_filterfile[i] = make_path(config->confdir, arg); - continue; + break; /* ************************************************************************* * forward url-pattern (.|http-proxy-host[:port]) * *************************************************************************/ case hash_forward: - vec_count = ssplit(arg, " \t", vec, SZ(vec), 1, 1); + strlcpy(tmp, arg, sizeof(tmp)); + vec_count = ssplit(tmp, " \t", vec, SZ(vec), 1, 1); if (vec_count != 2) { @@ -1129,7 +1158,7 @@ struct configuration_spec * load_config(void) string_append(&config->proxy_args, "
\nWARNING: Wrong number of parameters for " "forward directive in configuration file."); - continue; + break; } /* allocate a new node */ @@ -1138,7 +1167,7 @@ struct configuration_spec * load_config(void) { log_error(LOG_LEVEL_FATAL, "can't allocate memory for configuration"); /* Never get here - LOG_LEVEL_FATAL causes program exit */ - continue; + break; } cur_fwd->type = SOCKS_NONE; @@ -1151,7 +1180,7 @@ struct configuration_spec * load_config(void) string_append(&config->proxy_args, "
\nWARNING: Bad URL specifier for " "forward directive in configuration file."); - continue; + break; } /* Parse the parent HTTP proxy host:port */ @@ -1177,13 +1206,14 @@ struct configuration_spec * load_config(void) cur_fwd->next = config->forward; config->forward = cur_fwd; - continue; + break; /* ************************************************************************* * forward-socks4 url-pattern socks-proxy[:port] (.|http-proxy[:port]) * *************************************************************************/ case hash_forward_socks4: - vec_count = ssplit(arg, " \t", vec, SZ(vec), 1, 1); + strlcpy(tmp, arg, sizeof(tmp)); + vec_count = ssplit(tmp, " \t", vec, SZ(vec), 1, 1); if (vec_count != 3) { @@ -1192,7 +1222,7 @@ struct configuration_spec * load_config(void) string_append(&config->proxy_args, "
\nWARNING: Wrong number of parameters for " "forward-socks4 directive in configuration file."); - continue; + break; } /* allocate a new node */ @@ -1201,7 +1231,7 @@ struct configuration_spec * load_config(void) { log_error(LOG_LEVEL_FATAL, "can't allocate memory for configuration"); /* Never get here - LOG_LEVEL_FATAL causes program exit */ - continue; + break; } cur_fwd->type = SOCKS_4; @@ -1214,7 +1244,7 @@ struct configuration_spec * load_config(void) string_append(&config->proxy_args, "
\nWARNING: Bad URL specifier for " "forward-socks4 directive in configuration file."); - continue; + break; } /* Parse the SOCKS proxy host[:port] */ @@ -1258,14 +1288,15 @@ struct configuration_spec * load_config(void) cur_fwd->next = config->forward; config->forward = cur_fwd; - continue; + break; /* ************************************************************************* * forward-socks4a url-pattern socks-proxy[:port] (.|http-proxy[:port]) * *************************************************************************/ case hash_forward_socks4a: case hash_forward_socks5: - vec_count = ssplit(arg, " \t", vec, SZ(vec), 1, 1); + strlcpy(tmp, arg, sizeof(tmp)); + vec_count = ssplit(tmp, " \t", vec, SZ(vec), 1, 1); if (vec_count != 3) { @@ -1274,7 +1305,7 @@ struct configuration_spec * load_config(void) string_append(&config->proxy_args, "
\nWARNING: Wrong number of parameters for " "forward-socks4a directive in configuration file."); - continue; + break; } /* allocate a new node */ @@ -1283,7 +1314,7 @@ struct configuration_spec * load_config(void) { log_error(LOG_LEVEL_FATAL, "can't allocate memory for configuration"); /* Never get here - LOG_LEVEL_FATAL causes program exit */ - continue; + break; } if (directive_hash == hash_forward_socks4a) @@ -1303,7 +1334,7 @@ struct configuration_spec * load_config(void) string_append(&config->proxy_args, "
\nWARNING: Bad URL specifier for " "forward-socks4a directive in configuration file."); - continue; + break; } /* Parse the SOCKS proxy host[:port] */ @@ -1344,14 +1375,14 @@ struct configuration_spec * load_config(void) cur_fwd->next = config->forward; config->forward = cur_fwd; - continue; + break; /* ************************************************************************* * forwarded-connect-retries n * *************************************************************************/ case hash_forwarded_connect_retries : config->forwarded_connect_retries = atoi(arg); - continue; + break; /* ************************************************************************* * hostname hostname-to-show-on-cgi-pages @@ -1363,7 +1394,7 @@ struct configuration_spec * load_config(void) { log_error(LOG_LEVEL_FATAL, "Out of memory saving hostname."); } - continue; + break; /* ************************************************************************* * keep-alive-timeout timeout @@ -1383,7 +1414,7 @@ struct configuration_spec * load_config(void) config->feature_flags &= ~RUNTIME_FEATURE_CONNECTION_KEEP_ALIVE; } } - continue; + break; #endif /* ************************************************************************* @@ -1392,7 +1423,7 @@ struct configuration_spec * load_config(void) case hash_listen_address : freez(config->haddr); config->haddr = strdup(arg); - continue; + break; /* ************************************************************************* * logdir directory-name @@ -1400,7 +1431,7 @@ struct configuration_spec * load_config(void) case hash_logdir : freez(config->logdir); config->logdir = make_path(NULL, arg); - continue; + break; /* ************************************************************************* * logfile log-file-name @@ -1415,14 +1446,15 @@ struct configuration_spec * load_config(void) log_error(LOG_LEVEL_FATAL, "Out of memory while creating logfile path"); } } - continue; + break; /* ************************************************************************* * permit-access source-ip[/significant-bits] [dest-ip[/significant-bits]] * *************************************************************************/ #ifdef FEATURE_ACL case hash_permit_access: - vec_count = ssplit(arg, " \t", vec, SZ(vec), 1, 1); + strlcpy(tmp, arg, sizeof(tmp)); + vec_count = ssplit(tmp, " \t", vec, SZ(vec), 1, 1); if ((vec_count != 1) && (vec_count != 2)) { @@ -1432,7 +1464,7 @@ struct configuration_spec * load_config(void) "
\nWARNING: Wrong number of parameters for " "permit-access directive in configuration file.

\n"); - continue; + break; } /* allocate a new node */ @@ -1442,7 +1474,7 @@ struct configuration_spec * load_config(void) { log_error(LOG_LEVEL_FATAL, "can't allocate memory for configuration"); /* Never get here - LOG_LEVEL_FATAL causes program exit */ - continue; + break; } cur_acl->action = ACL_PERMIT; @@ -1458,7 +1490,7 @@ struct configuration_spec * load_config(void) string_append(&config->proxy_args, "\"

\n"); freez(cur_acl); - continue; + break; } if (vec_count == 2) { @@ -1474,7 +1506,7 @@ struct configuration_spec * load_config(void) string_append(&config->proxy_args, "\"

\n"); freez(cur_acl); - continue; + break; } } @@ -1490,7 +1522,7 @@ struct configuration_spec * load_config(void) cur_acl->next = config->acl; config->acl = cur_acl; - continue; + break; #endif /* def FEATURE_ACL */ /* ************************************************************************* @@ -1499,14 +1531,14 @@ struct configuration_spec * load_config(void) case hash_proxy_info_url : freez(config->proxy_info_url); config->proxy_info_url = strdup(arg); - continue; + break; /* ************************************************************************* * single-threaded * *************************************************************************/ case hash_single_threaded : config->multi_threaded = 0; - continue; + break; /* ************************************************************************* * socket-timeout numer_of_seconds @@ -1525,7 +1557,7 @@ struct configuration_spec * load_config(void) "Invalid socket-timeout: '%s'", arg); } } - continue; + break; /* ************************************************************************* * split-large-cgi-forms @@ -1539,7 +1571,7 @@ struct configuration_spec * load_config(void) { config->feature_flags &= ~RUNTIME_FEATURE_SPLIT_LARGE_FORMS; } - continue; + break; /* ************************************************************************* * templdir directory-name @@ -1547,7 +1579,7 @@ struct configuration_spec * load_config(void) case hash_templdir : freez(config->templdir); config->templdir = make_path(NULL, arg); - continue; + break; /* ************************************************************************* * toggle (0|1) @@ -1555,7 +1587,7 @@ struct configuration_spec * load_config(void) #ifdef FEATURE_TOGGLE case hash_toggle : global_toggle_state = atoi(arg); - continue; + break; #endif /* def FEATURE_TOGGLE */ /* ************************************************************************* @@ -1564,7 +1596,7 @@ struct configuration_spec * load_config(void) #ifdef FEATURE_TRUST case hash_trust_info_url : enlist(config->trust_info, arg); - continue; + break; #endif /* def FEATURE_TRUST */ /* ************************************************************************* @@ -1575,16 +1607,21 @@ struct configuration_spec * load_config(void) case hash_trustfile : freez(config->trustfile); config->trustfile = make_path(config->confdir, arg); - continue; + break; #endif /* def FEATURE_TRUST */ /* ************************************************************************* * usermanual url * *************************************************************************/ case hash_usermanual : + /* + * XXX: If this isn't the first config directive, the + * show-status page links to the website documentation + * for the directives that were already parsed. Lame. + */ freez(config->usermanual); config->usermanual = strdup(arg); - continue; + break; /* ************************************************************************* * Win32 Console options: @@ -1596,7 +1633,7 @@ struct configuration_spec * load_config(void) #ifdef _WIN_CONSOLE case hash_hide_console : hideConsole = 1; - continue; + break; #endif /*def _WIN_CONSOLE*/ @@ -1610,63 +1647,69 @@ struct configuration_spec * load_config(void) * *************************************************************************/ case hash_activity_animation : g_bShowActivityAnimation = atoi(arg); - continue; + break; /* ************************************************************************* * close-button-minimizes (0|1) * *************************************************************************/ case hash_close_button_minimizes : g_bCloseHidesWindow = atoi(arg); - continue; + break; /* ************************************************************************* * log-buffer-size (0|1) * *************************************************************************/ case hash_log_buffer_size : g_bLimitBufferSize = atoi(arg); - continue; + break; /* ************************************************************************* - * log-font-name fontnane + * log-font-name fontname * *************************************************************************/ case hash_log_font_name : - strcpy( g_szFontFaceName, arg ); - continue; + if (strlcpy(g_szFontFaceName, arg, + sizeof(g_szFontFaceName)) >= sizeof(g_szFontFaceName)) + { + log_error(LOG_LEVEL_FATAL, + "log-font-name argument '%s' is longer than %u characters.", + arg, sizeof(g_szFontFaceName)-1); + } + break; /* ************************************************************************* * log-font-size n * *************************************************************************/ case hash_log_font_size : g_nFontSize = atoi(arg); - continue; + break; /* ************************************************************************* * log-highlight-messages (0|1) * *************************************************************************/ case hash_log_highlight_messages : g_bHighlightMessages = atoi(arg); - continue; + break; /* ************************************************************************* * log-max-lines n * *************************************************************************/ case hash_log_max_lines : g_nMaxBufferLines = atoi(arg); - continue; + break; /* ************************************************************************* * log-messages (0|1) * *************************************************************************/ case hash_log_messages : g_bLogMessages = atoi(arg); - continue; + break; /* ************************************************************************* * show-on-task-bar (0|1) * *************************************************************************/ case hash_show_on_task_bar : g_bShowOnTaskBar = atoi(arg); - continue; + break; #endif /* defined(_WIN32) && ! defined(_WIN_CONSOLE) */ @@ -1711,7 +1754,7 @@ struct configuration_spec * load_config(void) #endif /* defined(_WIN_CONSOLE) || ! defined(_WIN32) */ /* These warnings are annoying - so hide them. -- Jon */ /* log_error(LOG_LEVEL_INFO, "Unsupported directive \"%s\" ignored.", cmd); */ - continue; + break; /* *************************************************************************/ default : @@ -1724,11 +1767,15 @@ struct configuration_spec * load_config(void) 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; + " Warning: Ignoring unrecognized directive:"); + break; /* *************************************************************************/ } /* end switch( hash_string(cmd) ) */ + + /* Save the argument for the show-status page. */ + savearg(cmd, arg, config); + } /* end while ( read_config_line(...) ) */ fclose(configfp);