-const char loadcfg_rcs[] = "$Id: loadcfg.c,v 1.22 2001/09/22 16:36:59 jongfoster Exp $";
+const char loadcfg_rcs[] = "$Id: loadcfg.c,v 1.52 2006/09/06 10:43:32 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
+ * 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
*
* Revisions :
* $Log: loadcfg.c,v $
+ * 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()
*
#include <fcntl.h>
#include <errno.h>
#include <ctype.h>
+#include <assert.h>
#ifdef _WIN32
+# ifndef STRICT
+# define STRICT
+# endif
# include <windows.h>
# include "win32.h"
#else /* ifndef _WIN32 */
+#ifndef __OS2__
# include <unistd.h>
-# include <sys/time.h>
# include <sys/wait.h>
+#endif
+# include <sys/time.h>
# include <sys/stat.h>
# include <signal.h>
#include "errlog.h"
#include "ssplit.h"
#include "encode.h"
+#include "urlmatch.h"
+#include "cgi.h"
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; /* JunkBusters is enabled by default. */
+/* Privoxy is enabled by default. */
+int global_toggle_state = 1;
#endif /* def FEATURE_TOGGLE */
/* The filename of the configfile */
#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_re_filterfile 3877522444ul /* "re_filterfile" */
#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_show_on_task_bar 215410365ul /* "show-on-task-bar" */
-static void savearg(char *c, char *o, struct configuration_spec * config);
-
+static void savearg(char *command, char *argument, struct configuration_spec * config);
/*********************************************************************
*
{
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;
while (cur_fwd != NULL)
{
struct forward_spec * next_fwd = cur_fwd->next;
- free_url(cur_fwd->url);
+ free_url_spec(cur_fwd->url);
freez(cur_fwd->gateway_host);
freez(cur_fwd->forward_host);
cur_fwd = next_fwd;
}
config->forward = NULL;
-
+
#ifdef FEATURE_COOKIE_JAR
if ( NULL != config->jar )
{
}
#endif /* def FEATURE_COOKIE_JAR */
- freez((char *)config->confdir);
- freez((char *)config->logdir);
+ freez(config->confdir);
+ freez(config->logdir);
+
+ freez(config->haddr);
+ freez(config->logfile);
- freez((char *)config->haddr);
- freez((char *)config->logfile);
+ for (i = 0; i < MAX_AF_FILES; i++)
+ {
+ freez(config->actions_file_short[i]);
+ freez(config->actions_file[i]);
+ }
- freez((char *)config->actions_file);
- freez((char *)config->admin_address);
- freez((char *)config->proxy_info_url);
- freez((char *)config->proxy_args);
+ freez(config->admin_address);
+ freez(config->proxy_info_url);
+ freez(config->proxy_args);
+ freez(config->usermanual);
#ifdef FEATURE_COOKIE_JAR
- freez((char *)config->jarfile);
+ freez(config->jarfile);
#endif /* def FEATURE_COOKIE_JAR */
- freez((char *)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);
+}
+
+#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
/*********************************************************************
*
* 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)
struct configuration_spec * config = NULL;
struct client_state * fake_csp;
struct file_list *fs;
+ unsigned long linenum = 0;
+ int i;
- 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);
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));
/*
* This is backwards from how it's usually done.
- * Following the usual pattern, "fs" would be stored in a member
+ * 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
+ * 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".
/*
* Set to defaults
*/
-
- config->multi_threaded = 1;
- config->hport = HADDR_PORT;
- config->buffer_limit = 4096 * 1024;
+ 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;
if ((configfp = fopen(configfile, "r")) == NULL)
{
/* Never get here - LOG_LEVEL_FATAL causes program exit */
}
- while (read_config_line(buf, sizeof(buf), configfp) != NULL)
+ while (read_config_line(buf, sizeof(buf), configfp, &linenum) != NULL)
{
char cmd[BUFFER_SIZE];
char arg[BUFFER_SIZE];
switch( hash_string( cmd ) )
{
-/****************************************************************************
+/* *************************************************************************
* actionsfile actions-file-name
* In confdir by default
- ****************************************************************************/
+ * *************************************************************************/
case hash_actions_file :
- freez((char *)config->actions_file);
- config->actions_file = make_path(config->confdir, arg);
+ i = 0;
+ while ((i < MAX_AF_FILES) && (NULL != config->actions_file[i]))
+ {
+ i++;
+ }
+
+ 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_AF_FILES in project.h and recompiling).",
+ 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);
continue;
-/****************************************************************************
+/* *************************************************************************
* admin-address email-address
- ****************************************************************************/
+ * *************************************************************************/
case hash_admin_address :
- freez((char *)config->admin_address);
+ freez(config->admin_address);
config->admin_address = strdup(arg);
- continue;
+ continue;
-/****************************************************************************
+/* *************************************************************************
* buffer-limit n
- ****************************************************************************/
+ * *************************************************************************/
case hash_buffer_limit :
config->buffer_limit = (size_t) 1024 * atoi(arg);
- continue;
+ continue;
-/****************************************************************************
+/* *************************************************************************
* confdir directory-name
- ****************************************************************************/
+ * *************************************************************************/
case hash_confdir :
- freez((char *)config->confdir);
- config->confdir = strdup(arg);
- continue;
+ freez(config->confdir);
+ config->confdir = make_path( NULL, arg);
+ continue;
-/****************************************************************************
+/* *************************************************************************
* debug n
* Specifies debug level, multiple values are ORed together.
- ****************************************************************************/
+ * *************************************************************************/
case hash_debug :
config->debug |= atoi(arg);
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);
{
log_error(LOG_LEVEL_ERROR, "Wrong number of parameters for "
"deny-access directive in configuration file.");
- config->proxy_args = strsav( config->proxy_args,
+ string_append(&config->proxy_args,
"<br>\nWARNING: Wrong number of parameters for "
"deny-access directive in configuration file.<br><br>\n");
continue;
{
log_error(LOG_LEVEL_ERROR, "Invalid source IP for deny-access "
"directive in configuration file: \"%s\"", vec[0]);
- config->proxy_args = strsav( config->proxy_args,
+ string_append(&config->proxy_args,
"<br>\nWARNING: Invalid source IP for deny-access directive"
" in configuration file: \"");
- config->proxy_args = strsav( config->proxy_args,
+ string_append(&config->proxy_args,
vec[0]);
- config->proxy_args = strsav( config->proxy_args,
+ string_append(&config->proxy_args,
"\"<br><br>\n");
freez(cur_acl);
continue;
{
log_error(LOG_LEVEL_ERROR, "Invalid destination IP for deny-access "
"directive in configuration file: \"%s\"", vec[0]);
- config->proxy_args = strsav( config->proxy_args,
+ string_append(&config->proxy_args,
"<br>\nWARNING: Invalid destination IP for deny-access directive"
" in configuration file: \"");
- config->proxy_args = strsav( config->proxy_args,
+ string_append(&config->proxy_args,
vec[0]);
- config->proxy_args = strsav( config->proxy_args,
+ string_append(&config->proxy_args,
"\"<br><br>\n");
freez(cur_acl);
continue;
* 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
+ * 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;
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_CGI_EDIT_ACTIONS
+ 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_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])
- ****************************************************************************/
+ * *************************************************************************/
case hash_forward:
vec_count = ssplit(arg, " \t", vec, SZ(vec), 1, 1);
{
log_error(LOG_LEVEL_ERROR, "Wrong number of parameters for forward "
"directive in configuration file.");
- config->proxy_args = strsav( config->proxy_args,
+ string_append(&config->proxy_args,
"<br>\nWARNING: Wrong number of parameters for "
"forward directive in configuration file.");
continue;
{
log_error(LOG_LEVEL_ERROR, "Bad URL specifier for forward "
"directive in configuration file.");
- config->proxy_args = strsav( config->proxy_args,
+ string_append(&config->proxy_args,
"<br>\nWARNING: Bad URL specifier for "
"forward directive in configuration file.");
continue;
{
cur_fwd->forward_host = strdup(p);
- if ((p = strchr(cur_fwd->forward_host, ':')))
+ if (NULL != (p = strchr(cur_fwd->forward_host, ':')))
{
*p++ = '\0';
cur_fwd->forward_port = atoi(p);
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);
{
log_error(LOG_LEVEL_ERROR, "Wrong number of parameters for "
"forward-socks4 directive in configuration file.");
- config->proxy_args = strsav( config->proxy_args,
+ string_append(&config->proxy_args,
"<br>\nWARNING: Wrong number of parameters for "
"forward-socks4 directive in configuration file.");
continue;
{
log_error(LOG_LEVEL_ERROR, "Bad URL specifier for forward-socks4 "
"directive in configuration file.");
- config->proxy_args = strsav( config->proxy_args,
+ string_append(&config->proxy_args,
"<br>\nWARNING: Bad URL specifier for "
"forward-socks4 directive in configuration file.");
continue;
{
cur_fwd->gateway_host = strdup(p);
- if ((p = strchr(cur_fwd->gateway_host, ':')))
+ if (NULL != (p = strchr(cur_fwd->gateway_host, ':')))
{
*p++ = '\0';
cur_fwd->gateway_port = atoi(p);
{
cur_fwd->forward_host = strdup(p);
- if ((p = strchr(cur_fwd->forward_host, ':')))
+ if (NULL != (p = strchr(cur_fwd->forward_host, ':')))
{
*p++ = '\0';
cur_fwd->forward_port = atoi(p);
/* 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:
vec_count = ssplit(arg, " \t", vec, SZ(vec), 1, 1);
{
log_error(LOG_LEVEL_ERROR, "Wrong number of parameters for "
"forward-socks4a directive in configuration file.");
- config->proxy_args = strsav( config->proxy_args,
+ string_append(&config->proxy_args,
"<br>\nWARNING: Wrong number of parameters for "
"forward-socks4a directive in configuration file.");
continue;
{
log_error(LOG_LEVEL_ERROR, "Bad URL specifier for forward-socks4a "
"directive in configuration file.");
- config->proxy_args = strsav( config->proxy_args,
+ string_append(&config->proxy_args,
"<br>\nWARNING: Bad URL specifier for "
"forward-socks4a directive in configuration file.");
continue;
cur_fwd->gateway_host = strdup(p);
- if ((p = strchr(cur_fwd->gateway_host, ':')))
+ if (NULL != (p = strchr(cur_fwd->gateway_host, ':')))
{
*p++ = '\0';
cur_fwd->gateway_port = atoi(p);
{
cur_fwd->forward_host = strdup(p);
- if ((p = strchr(cur_fwd->forward_host, ':')))
+ if (NULL != (p = strchr(cur_fwd->forward_host, ':')))
{
*p++ = '\0';
cur_fwd->forward_port = atoi(p);
/* Add to list. */
cur_fwd->next = config->forward;
config->forward = cur_fwd;
-
+
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
- ****************************************************************************/
+ * *************************************************************************/
#ifdef FEATURE_COOKIE_JAR
case hash_jarfile :
- freez((char *)config->jarfile);
+ freez(config->jarfile);
config->jarfile = make_path(config->logdir, arg);
continue;
#endif /* def FEATURE_COOKIE_JAR */
-/****************************************************************************
+/* *************************************************************************
* listen-address [ip][:port]
- ****************************************************************************/
+ * *************************************************************************/
case hash_listen_address :
- freez((char *)config->haddr);
+ freez(config->haddr);
config->haddr = strdup(arg);
continue;
-/****************************************************************************
+/* *************************************************************************
* logdir directory-name
- ****************************************************************************/
+ * *************************************************************************/
case hash_logdir :
- freez((char *)config->logdir);
- config->logdir = strdup(arg);
- continue;
+ freez(config->logdir);
+ config->logdir = make_path(NULL, arg);
+ continue;
-/****************************************************************************
+/* *************************************************************************
* logfile log-file-name
* In logdir by default
- ****************************************************************************/
+ * *************************************************************************/
case hash_logfile :
- freez((char *)config->logfile);
- config->logfile = make_path(config->logdir, arg);
+ freez(config->logfile);
+ config->logfile = no_daemon ? NULL : make_path(config->logdir, 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);
{
log_error(LOG_LEVEL_ERROR, "Wrong number of parameters for "
"permit-access directive in configuration file.");
- config->proxy_args = strsav( config->proxy_args,
+ string_append(&config->proxy_args,
"<br>\nWARNING: Wrong number of parameters for "
"permit-access directive in configuration file.<br><br>\n");
{
log_error(LOG_LEVEL_ERROR, "Invalid source IP for permit-access "
"directive in configuration file: \"%s\"", vec[0]);
- config->proxy_args = strsav( config->proxy_args,
+ string_append(&config->proxy_args,
"<br>\nWARNING: Invalid source IP for permit-access directive"
" in configuration file: \"");
- config->proxy_args = strsav( config->proxy_args,
+ string_append(&config->proxy_args,
vec[0]);
- config->proxy_args = strsav( config->proxy_args,
+ string_append(&config->proxy_args,
"\"<br><br>\n");
freez(cur_acl);
continue;
log_error(LOG_LEVEL_ERROR, "Invalid destination IP for "
"permit-access directive in configuration file: \"%s\"",
vec[0]);
- config->proxy_args = strsav( config->proxy_args,
+ string_append(&config->proxy_args,
"<br>\nWARNING: Invalid destination IP for permit-access directive"
" in configuration file: \"");
- config->proxy_args = strsav( config->proxy_args,
+ string_append(&config->proxy_args,
vec[0]);
- config->proxy_args = strsav( config->proxy_args,
+ string_append(&config->proxy_args,
"\"<br><br>\n");
freez(cur_acl);
continue;
* 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
+ * 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;
continue;
#endif /* def FEATURE_ACL */
-/****************************************************************************
+/* *************************************************************************
* proxy-info-url url
- ****************************************************************************/
+ * *************************************************************************/
case hash_proxy_info_url :
- freez((char *)config->proxy_info_url);
+ freez(config->proxy_info_url);
config->proxy_info_url = strdup(arg);
continue;
-/****************************************************************************
- * re_filterfile file-name
- * In confdir by default.
- ****************************************************************************/
- case hash_re_filterfile :
- freez((char *)config->re_filterfile);
- config->re_filterfile = make_path(config->confdir, arg);
- continue;
-
-/****************************************************************************
+/* *************************************************************************
* single-threaded
- ****************************************************************************/
+ * *************************************************************************/
case hash_single_threaded :
config->multi_threaded = 0;
continue;
-/****************************************************************************
+/* *************************************************************************
* toggle (0|1)
- ****************************************************************************/
+ * *************************************************************************/
#ifdef FEATURE_TOGGLE
case hash_toggle :
- g_bToggleIJB = atoi(arg);
+ 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((char *)config->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;
#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;
#endif /* defined(_WIN32) && ! defined(_WIN_CONSOLE) */
-/****************************************************************************/
-/* Warnings about unsupported features */
-/****************************************************************************/
+/* *************************************************************************
+ * 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:
+ case hash_enable_remote_toggle:
+#endif /* def FEATURE_CGI_EDIT_ACTIONS */
#ifndef FEATURE_COOKIE_JAR
case hash_jarfile :
#endif /* ndef FEATURE_COOKIE_JAR */
/* 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 (%luul) in "
- "configuration file: \"%s\"", hash_string( cmd ), buf);
- config->proxy_args = strsav( config->proxy_args, "<br>\nWARNING: unrecognized directive : ");
- config->proxy_args = strsav( config->proxy_args, buf);
- config->proxy_args = strsav( config->proxy_args, "<br><br>\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,
+ " <b><font color=\"red\">WARNING: unrecognized directive, ignored</font></b>");
continue;
-/****************************************************************************/
+/* *************************************************************************/
} /* end switch( hash_string(cmd) ) */
} /* end while ( read_config_line(...) ) */
fclose(configfp);
+ 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)
+ if (config->actions_file[0])
{
add_loader(load_actions_file, config);
}
if ( NULL != config->haddr )
{
- if ((p = strchr(config->haddr, ':')))
+ if (NULL != (p = strchr(config->haddr, ':')))
{
*p++ = '\0';
if (*p)
/* FIXME: this is a kludge for win32 */
#if defined(_WIN32) && !defined (_WIN_CONSOLE)
- g_actions_file = config->actions_file;
+ 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;
#ifdef FEATURE_TRUST
g_trustfile = config->trustfile;
#endif /* def FEATURE_TRUST */
-
+
#endif /* defined(_WIN32) && !defined (_WIN_CONSOLE) */
/* FIXME: end kludge */
* Function : savearg
*
* Description : Called from `load_config'. It saves each non-empty
- * and non-comment line from config into a list. This
- * list is used to create the show-proxy-args page.
+ * 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 : c = config setting that was found
- * 2 : o = the setting's argument (if any)
+ * 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 *c, char *o, struct configuration_spec * config)
+static void savearg(char *command, char *argument, struct configuration_spec * config)
{
- char buf[BUFFER_SIZE];
+ char * buf;
+ char * s;
- *buf = '\0';
+ assert(command);
+ assert(*command);
+ assert(argument);
- if ( ( NULL != c ) && ( '\0' != *c ) )
+ /*
+ * Add config option name embedded in
+ * link to it's section in the user-manual
+ */
+ buf = strdup("\n<br><a href=\"");
+ if (!strncmpic(config->usermanual, "file://", 7) ||
+ !strncmpic(config->usermanual, "http", 4))
{
- if ((c = html_encode(c)))
- {
- sprintf(buf, "<a href=\"" REDIRECT_URL "option#%s\">%s</a> ", c, c);
- }
- freez(c);
+ string_append(&buf, config->usermanual);
}
- if ( ( NULL != o ) && ( '\0' != *o ) )
+ else
{
- if ((o = html_encode(o)))
- {
- if (strncmpic(o, "http://", 7) == 0)
- {
- strcat(buf, "<a href=\"");
- strcat(buf, o);
- strcat(buf, "\">");
- strcat(buf, o);
- strcat(buf, "</a>");
- }
- else
- {
- strcat(buf, o);
- }
- }
- freez(o);
+ 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, "</a> ");
- strcat(buf, "<br>\n");
+ if (NULL == buf)
+ {
+ freez(config->proxy_args);
+ return;
+ }
- config->proxy_args = strsav(config->proxy_args, buf);
+ 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, "<a href=\"");
+ string_append(&buf, s);
+ string_append(&buf, "\">");
+ string_join (&buf, s);
+ string_append(&buf, "</a>");
+ }
+ else
+ {
+ string_join (&buf, s);
+ }
+ }
+ string_join(&config->proxy_args, buf);
}
projects / privoxy.git / blobdiff