X-Git-Url: http://www.privoxy.org/gitweb/?p=privoxy.git;a=blobdiff_plain;f=loadcfg.c;h=311a43145b4ec40e1c381410de2a6bc757da8075;hp=7593f0fe113913c8bfe7db06b19a337b20265cf9;hb=f4107f65b676b63a199fe4230e58695757f9f199;hpb=66d5f733f047a1a177bfd1867ad53a933dd3ee7f
diff --git a/loadcfg.c b/loadcfg.c
index 7593f0fe..311a4314 100644
--- a/loadcfg.c
+++ b/loadcfg.c
@@ -1,4 +1,4 @@
-const char loadcfg_rcs[] = "$Id: loadcfg.c,v 1.61 2007/03/16 16:47:35 fabiankeil Exp $";
+const char loadcfg_rcs[] = "$Id: loadcfg.c,v 1.73 2008/02/16 16:54:51 fabiankeil Exp $";
/*********************************************************************
*
* File : $Source: /cvsroot/ijbswa/current/loadcfg.c,v $
@@ -8,7 +8,7 @@ const char loadcfg_rcs[] = "$Id: loadcfg.c,v 1.61 2007/03/16 16:47:35 fabiankeil
* routine to load the configuration and the global
* variables it writes to.
*
- * Copyright : Written by and Copyright (C) 2001-2007 the SourceForge
+ * Copyright : Written by and Copyright (C) 2001-2008 the SourceForge
* Privoxy team. http://www.privoxy.org/
*
* Based on the Internet Junkbuster originally written
@@ -35,6 +35,54 @@ const char loadcfg_rcs[] = "$Id: loadcfg.c,v 1.61 2007/03/16 16:47:35 fabiankeil
*
* Revisions :
* $Log: loadcfg.c,v $
+ * 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.
@@ -410,9 +458,6 @@ const char loadcfg_rcs[] = "$Id: loadcfg.c,v 1.61 2007/03/16 16:47:35 fabiankeil
# include "w32log.h"
# endif /* ndef _WIN_CONSOLE */
-/* VC++ has "_snprintf", not "snprintf" */
-#define snprintf _snprintf
-
#else /* ifndef _WIN32 */
#ifndef __OS2__
@@ -483,6 +528,7 @@ static struct file_list *current_configfile = NULL;
#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" */
@@ -495,7 +541,9 @@ static struct file_list *current_configfile = NULL;
#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_jarfile 2046641ul /* "jarfile" */
#define hash_listen_address 1255650842ul /* "listen-address" */
#define hash_logdir 422889ul /* "logdir" */
@@ -536,7 +584,7 @@ static void savearg(char *command, char *argument, struct configuration_spec * c
* Returns : N/A
*
*********************************************************************/
-void unload_configfile (void * data)
+static void unload_configfile (void * data)
{
struct configuration_spec * config = (struct configuration_spec *)data;
struct forward_spec *cur_fwd = config->forward;
@@ -577,6 +625,7 @@ void unload_configfile (void * data)
freez(config->confdir);
freez(config->logdir);
freez(config->templdir);
+ freez(config->hostname);
freez(config->haddr);
freez(config->logfile);
@@ -642,6 +691,9 @@ void unload_current_config_file(void)
*
* 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.
@@ -657,6 +709,7 @@ struct configuration_spec * load_config(void)
struct file_list *fs;
unsigned long linenum = 0;
int i;
+ char *logfile = NULL;
if ( !check_file_changed(current_configfile, configfile, &fs))
{
@@ -669,7 +722,10 @@ struct configuration_spec * load_config(void)
configfile);
}
- log_error(LOG_LEVEL_INFO, "loading configuration file '%s':", configfile);
+ if (NULL != current_configfile)
+ {
+ log_error(LOG_LEVEL_INFO, "Reloading configuration file '%s'", configfile);
+ }
#ifdef FEATURE_TOGGLE
global_toggle_state = 1;
@@ -727,8 +783,9 @@ struct configuration_spec * load_config(void)
struct forward_spec *cur_fwd;
int vec_count;
char *vec[3];
+ unsigned long directive_hash;
- strcpy(tmp, buf);
+ strlcpy(tmp, buf, sizeof(tmp));
/* Copy command (i.e. up to space or tab) into cmd */
p = buf;
@@ -746,7 +803,7 @@ struct configuration_spec * load_config(void)
}
/* Copy the argument into arg */
- strcpy(arg, p);
+ strlcpy(arg, p, sizeof(arg));
/* Should never happen, but check this anyway */
if (*cmd == '\0')
@@ -766,8 +823,8 @@ struct configuration_spec * load_config(void)
/* Save the argument for show-proxy-args */
savearg(cmd, arg, config);
-
- switch( hash_string( cmd ) )
+ directive_hash = hash_string(cmd);
+ switch (directive_hash)
{
/* *************************************************************************
* actionsfile actions-file-name
@@ -787,15 +844,8 @@ struct configuration_spec * load_config(void)
MAX_AF_FILES);
}
config->actions_file_short[i] = strdup(arg);
- p = malloc(strlen(arg) + sizeof(".action"));
- if (p == NULL)
- {
- log_error(LOG_LEVEL_FATAL, "Out of memory");
- }
- strcpy(p, arg);
- strcat(p, ".action");
- config->actions_file[i] = make_path(config->confdir, p);
- free(p);
+ config->actions_file[i] = make_path(config->confdir, arg);
+
continue;
/* *************************************************************************
* accept-intercepted-requests
@@ -819,6 +869,20 @@ struct configuration_spec * load_config(void)
config->admin_address = 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;
+
/* *************************************************************************
* buffer-limit n
* *************************************************************************/
@@ -997,14 +1061,8 @@ struct configuration_spec * load_config(void)
MAX_AF_FILES);
}
config->re_filterfile_short[i] = strdup(arg);
- p = malloc(strlen(arg) + 1);
- if (p == NULL)
- {
- log_error(LOG_LEVEL_FATAL, "Out of memory");
- }
- strcpy(p, arg);
- config->re_filterfile[i] = make_path(config->confdir, p);
- free(p);
+ config->re_filterfile[i] = make_path(config->confdir, arg);
+
continue;
/* *************************************************************************
@@ -1155,6 +1213,7 @@ struct configuration_spec * load_config(void)
* 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);
if (vec_count != 3)
@@ -1176,7 +1235,14 @@ struct configuration_spec * load_config(void)
continue;
}
- cur_fwd->type = SOCKS_4A;
+ if (directive_hash == hash_forward_socks4a)
+ {
+ cur_fwd->type = SOCKS_4A;
+ }
+ else
+ {
+ cur_fwd->type = SOCKS_5;
+ }
/* Save the URL pattern */
if (create_url_spec(cur_fwd->url, vec[0]))
@@ -1236,6 +1302,18 @@ struct configuration_spec * load_config(void)
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;
+
/* *************************************************************************
* jarfile jar-file-name
* In logdir by default
@@ -1268,8 +1346,14 @@ struct configuration_spec * load_config(void)
* In logdir by default
* *************************************************************************/
case hash_logfile :
- freez(config->logfile);
- config->logfile = no_daemon ? NULL : make_path(config->logdir, arg);
+ 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;
/* *************************************************************************
@@ -1561,7 +1645,7 @@ struct configuration_spec * load_config(void)
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");
+ " Warning: ignored unrecognized directive above.
");
continue;
/* *************************************************************************/
@@ -1570,13 +1654,28 @@ struct configuration_spec * load_config(void)
fclose(configfp);
+ set_debug_level(config->debug);
+
+ freez(config->logfile);
+
+ if (!no_daemon)
+ {
+ if (NULL != logfile)
+ {
+ config->logfile = logfile;
+ init_error_log(Argv[0], config->logfile);
+ }
+ else
+ {
+ disable_logging();
+ }
+ }
+
if (NULL == config->proxy_args)
{
log_error(LOG_LEVEL_FATAL, "Out of memory loading config - insufficient memory for config->proxy_args");
}
- init_error_log(Argv[0], config->logfile, config->debug);
-
if (config->actions_file[0])
{
add_loader(load_actions_file, config);
@@ -1630,7 +1729,11 @@ struct configuration_spec * load_config(void)
}
if (*config->haddr == '\0')
{
- config->haddr = NULL;
+ /*
+ * Only the port specified. We stored it in config->hport
+ * and don't need its text representation anymore.
+ */
+ freez(config->haddr);
}
}
@@ -1740,7 +1843,7 @@ static void savearg(char *command, char *argument, struct configuration_spec * c
/*
* Add config option name embedded in
- * link to it's section in the user-manual
+ * link to its section in the user-manual
*/
buf = strdup("\nusermanual, "file://", 7) ||