-/* vim:ts=3: */
-const char loadcfg_rcs[] = "$Id: loadcfg.c,v 1.16 2001/06/09 10:55:28 jongfoster Exp $";
+const char loadcfg_rcs[] = "$Id: loadcfg.c,v 1.26 2001/11/05 21:41:43 steudten 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.
*
* IJBSWA team. http://ijbswa.sourceforge.net
*
* 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.26 2001/11/05 21:41:43 steudten
+ * Add changes to be a real daemon just for unix os.
+ * (change cwd to /, detach from controlling tty, set
+ * process group and session leader to the own process.
+ * Add DBG() Macro.
+ * Add some fatal-error log message for failed malloc().
+ * Add '-d' if compiled with 'configure --with-debug' to
+ * enable debug output.
+ *
+ * Revision 1.25 2001/10/25 03:40:48 david__schmidt
+ * Change in porting tactics: OS/2's EMX porting layer doesn't allow multiple
+ * threads to call select() simultaneously. So, it's time to do a real, live,
+ * native OS/2 port. See defines for __EMX__ (the porting layer) vs. __OS2__
+ * (native). Both versions will work, but using __OS2__ offers multi-threading.
+ *
+ * Revision 1.24 2001/10/23 21:40:30 jongfoster
+ * Added support for enable-edit-actions and enable-remote-toggle config
+ * file options.
+ *
+ * Revision 1.23 2001/10/07 15:36:00 oes
+ * Introduced new config option "buffer-limit"
+ *
+ * Revision 1.22 2001/09/22 16:36:59 jongfoster
+ * Removing unused parameter fs from read_config_line()
+ *
+ * Revision 1.21 2001/09/16 17:10:43 jongfoster
+ * Moving function savearg() here, since it was the only thing left in
+ * showargs.c.
+ *
+ * Revision 1.20 2001/07/30 22:08:36 jongfoster
+ * Tidying up #defines:
+ * - All feature #defines are now of the form FEATURE_xxx
+ * - Permanently turned off WIN_GUI_EDIT
+ * - Permanently turned on WEBDAV and SPLIT_PROXY_ARGS
+ *
+ * Revision 1.19 2001/07/15 17:45:16 jongfoster
+ * Removing some unused #includes
+ *
+ * Revision 1.18 2001/07/13 14:01:14 oes
+ * - Removed all #ifdef PCRS
+ * - Removed vim-settings
+ *
+ * Revision 1.17 2001/06/29 13:31:03 oes
+ * - Improved comments
+ * - Fixed (actionsfile) and sorted hashes
+ * - Introduced admin_address and proxy-info-url
+ * as config parameters
+ * - Renamed config->proxy_args_invocation (which didn't have
+ * the invocation but the options!) to config->proxy_args
+ * - Various adaptions
+ * - Removed logentry from cancelled commit
+ *
* Revision 1.16 2001/06/09 10:55:28 jongfoster
* Changing BUFSIZ ==> BUFFER_SIZE
*
#ifdef _WIN32
-# include <sys/timeb.h>
# include <windows.h>
-# include <io.h>
-# include <process.h>
-# ifdef TOGGLE
-# include <time.h>
-# endif /* def TOGGLE */
# include "win32.h"
# ifndef _WIN_CONSOLE
#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 "jcc.h"
#include "filters.h"
#include "loaders.h"
-#include "showargs.h"
-#include "parsers.h"
-#include "killpopup.h"
#include "miscutil.h"
#include "errlog.h"
-#include "jbsockets.h"
-#include "gateway.h"
#include "ssplit.h"
+#include "encode.h"
const char loadcfg_h_rcs[] = LOADCFG_H_VERSION;
#define ijb_isupper(__X) isupper((int)(unsigned char)(__X))
#define ijb_tolower(__X) tolower((int)(unsigned char)(__X))
-#ifdef TOGGLE
+#ifdef FEATURE_TOGGLE
/* by haroon - indicates if ijb is enabled */
int g_bToggleIJB = 1; /* JunkBusters is enabled by default. */
-#endif
+#endif /* def FEATURE_TOGGLE */
/* The filename of the configfile */
const char *configfile = NULL;
#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_forward 2029845ul /* "forward" */
#define hash_forward_socks4 3963965521ul /* "forward-socks4" */
#define hash_forward_socks4a 2639958518ul /* "forward-socks4a" */
#define hash_show_on_task_bar 215410365ul /* "show-on-task-bar" */
+static void savearg(char *c, char *o, struct configuration_spec * config);
+
/*********************************************************************
*
{
struct configuration_spec * config = (struct configuration_spec *)data;
struct forward_spec *cur_fwd = config->forward;
-#ifdef ACL_FILES
+#ifdef FEATURE_ACL
struct access_control_list *cur_acl = config->acl;
while (cur_acl != NULL)
cur_acl = next_acl;
}
config->acl = NULL;
-#endif /* def ACL_FILES */
+#endif /* def FEATURE_ACL */
while (cur_fwd != NULL)
{
cur_fwd = next_fwd;
}
config->forward = NULL;
-
-#ifdef JAR_FILES
+
+#ifdef FEATURE_COOKIE_JAR
if ( NULL != config->jar )
{
fclose( config->jar );
config->jar = NULL;
}
-#endif /* def JAR_FILES */
-
- freez((char *)config->confdir);
- freez((char *)config->logdir);
+#endif /* def FEATURE_COOKIE_JAR */
- freez((char *)config->haddr);
- freez((char *)config->logfile);
+ freez(config->confdir);
+ freez(config->logdir);
- freez((char *)config->actions_file);
- freez((char *)config->admin_address);
- freez((char *)config->proxy_info_url);
- freez((char *)config->proxy_args);
+ freez(config->haddr);
+ freez(config->logfile);
-#ifdef JAR_FILES
- freez((char *)config->jarfile);
-#endif /* def JAR_FILES */
+ freez(config->actions_file);
+ freez(config->admin_address);
+ freez(config->proxy_info_url);
+ freez(config->proxy_args);
-#ifndef SPLIT_PROXY_ARGS
- freez((char *)config->suppress_message);
-#endif /* ndef SPLIT_PROXY_ARGS */
+#ifdef FEATURE_COOKIE_JAR
+ freez(config->jarfile);
+#endif /* def FEATURE_COOKIE_JAR */
-#ifdef PCRS
- freez((char *)config->re_filterfile);
-#endif /* def PCRS */
+ freez(config->re_filterfile);
}
* Description : Load the config file and all parameters.
*
* Parameters :
- * 1 : csp = Client state (the config member will be
+ * 1 : csp = Client state (the config member will be
* filled in by this function).
*
* Returns : 0 => Ok, everything else is an error.
struct configuration_spec * config = NULL;
struct client_state * fake_csp;
struct file_list *fs;
+ unsigned long linenum = 0;
+ DBG(1, ("load_config() entered..\n") );
if (!check_file_changed(current_configfile, configfile, &fs))
{
/* No need to load */
configfile);
}
+ /*
log_error(LOG_LEVEL_INFO, "loading configuration file '%s':", configfile);
+ */
-#ifdef TOGGLE
+#ifdef FEATURE_TOGGLE
g_bToggleIJB = 1;
-#endif
+#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".
config->multi_threaded = 1;
config->hport = HADDR_PORT;
+ config->buffer_limit = 4096 * 1024;
if ((configfp = fopen(configfile, "r")) == NULL)
{
/* Never get here - LOG_LEVEL_FATAL causes program exit */
}
- while (read_config_line(buf, sizeof(buf), configfp, fs) != NULL)
+ while (read_config_line(buf, sizeof(buf), configfp, &linenum) != NULL)
{
char cmd[BUFFER_SIZE];
char arg[BUFFER_SIZE];
char tmp[BUFFER_SIZE];
-#ifdef ACL_FILES
+#ifdef FEATURE_ACL
struct access_control_list *cur_acl;
-#endif /* def ACL_FILES */
+#endif /* def FEATURE_ACL */
struct forward_spec *cur_fwd;
int vec_count;
char *vec[3];
* In confdir by default
****************************************************************************/
case hash_actions_file :
- freez((char *)config->actions_file);
+ freez(config->actions_file);
config->actions_file = make_path(config->confdir, arg);
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;
/****************************************************************************
* 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
/****************************************************************************
* deny-access source-ip[/significant-bits] [dest-ip[/significant-bits]]
****************************************************************************/
-#ifdef ACL_FILES
+#ifdef FEATURE_ACL
case hash_deny_access:
vec_count = ssplit(arg, " \t", vec, SZ(vec), 1, 1);
* 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;
config->acl = cur_acl;
continue;
-#endif /* def ACL_FILES */
+#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 */
/****************************************************************************
* forward url-pattern (.|http-proxy-host[:port])
/* Add to list. */
cur_fwd->next = config->forward;
config->forward = cur_fwd;
-
+
continue;
/****************************************************************************
/* Add to list. */
cur_fwd->next = config->forward;
config->forward = cur_fwd;
-
+
continue;
/****************************************************************************
* jarfile jar-file-name
* In logdir by default
****************************************************************************/
-#ifdef JAR_FILES
+#ifdef FEATURE_COOKIE_JAR
case hash_jarfile :
- freez((char *)config->jarfile);
+ freez(config->jarfile);
config->jarfile = make_path(config->logdir, arg);
continue;
-#endif /* def JAR_FILES */
+#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);
+ freez(config->logfile);
config->logfile = make_path(config->logdir, arg);
continue;
/****************************************************************************
* permit-access source-ip[/significant-bits] [dest-ip[/significant-bits]]
****************************************************************************/
-#ifdef ACL_FILES
+#ifdef FEATURE_ACL
case hash_permit_access:
vec_count = ssplit(arg, " \t", vec, SZ(vec), 1, 1);
* 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;
config->acl = cur_acl;
continue;
-#endif /* def ACL_FILES */
+#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.
****************************************************************************/
-#ifdef PCRS
case hash_re_filterfile :
- freez((char *)config->re_filterfile);
+ freez(config->re_filterfile);
config->re_filterfile = make_path(config->confdir, arg);
continue;
-#endif /* def PCRS */
/****************************************************************************
* single-threaded
config->multi_threaded = 0;
continue;
-/****************************************************************************
- * FIXME: Document this FIXME2: Shouldn't we throw this out? --oes
- ****************************************************************************/
-#ifndef SPLIT_PROXY_ARGS
- case hash_suppress_blocklists :
- if (arg[0] != '\0')
- {
- config->suppress_message = strdup(arg);
- }
- else
- {
- /* There will be NO reference in proxy-args. */
- config->suppress_message = NULL;
- }
-
- config->suppress_blocklists = 1;
- continue;
-#endif /* ndef SPLIT_PROXY_ARGS */
-
/****************************************************************************
* toggle (0|1)
****************************************************************************/
-#ifdef TOGGLE
+#ifdef FEATURE_TOGGLE
case hash_toggle :
g_bToggleIJB = atoi(arg);
continue;
-#endif /* def TOGGLE */
+#endif /* def FEATURE_TOGGLE */
/****************************************************************************
* trust-info-url url
****************************************************************************/
-#ifdef TRUST_FILES
+#ifdef FEATURE_TRUST
case hash_trust_info_url :
enlist(config->trust_info, arg);
continue;
-#endif /* def TRUST_FILES */
+#endif /* def FEATURE_TRUST */
/****************************************************************************
* trustfile filename
* (In confdir by default.)
****************************************************************************/
-#ifdef TRUST_FILES
+#ifdef FEATURE_TRUST
case hash_trustfile :
- freez((char *)config->trustfile);
+ freez(config->trustfile);
config->trustfile = make_path(config->confdir, arg);
continue;
-#endif /* def TRUST_FILES */
+#endif /* def FEATURE_TRUST */
/****************************************************************************
/****************************************************************************/
/* Warnings about unsupported features */
/****************************************************************************/
-#ifndef ACL_FILES
+#ifndef FEATURE_ACL
case hash_deny_access:
-#endif /* ndef ACL_FILES */
-#ifndef JAR_FILES
+#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 JAR_FILES */
-#ifndef ACL_FILES
+#endif /* ndef FEATURE_COOKIE_JAR */
+#ifndef FEATURE_ACL
case hash_permit_access:
-#endif /* ndef ACL_FILES */
-#ifndef PCRS
- case hash_re_filterfile :
-#endif /* ndef PCRS */
-#ifdef SPLIT_PROXY_ARGS
- case hash_suppress_blocklists :
-#endif /* def SPLIT_PROXY_ARGS */
-#ifndef TOGGLE
+#endif /* ndef FEATURE_ACL */
+#ifndef FEATURE_TOGGLE
case hash_toggle :
-#endif /* ndef TOGGLE */
-#ifndef TRUST_FILES
+#endif /* ndef FEATURE_TOGGLE */
+#ifndef FEATURE_TRUST
case hash_trustfile :
case hash_trust_info_url :
-#endif /* ndef TRUST_FILES */
+#endif /* ndef FEATURE_TRUST */
#ifndef _WIN_CONSOLE
case hash_hide_console :
* error. To change back to an error, just change log level
* to LOG_LEVEL_FATAL.
*/
- log_error(LOG_LEVEL_ERROR, "Unrecognized directive (%luul) in "
+ log_error(LOG_LEVEL_ERROR, "Unrecognized directive '%s' in line %lu in "
+ "configuration file (%s).", buf, linenum, configfile);
+ /* 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");
add_loader(load_actions_file, config);
}
-#ifdef PCRS
if (config->re_filterfile)
{
add_loader(load_re_filterfile, config);
}
-#endif /* def PCRS */
-#ifdef TRUST_FILES
+#ifdef FEATURE_TRUST
if (config->trustfile)
{
add_loader(load_trustfile, config);
}
-#endif
+#endif /* def FEATURE_TRUST */
-#ifdef JAR_FILES
+#ifdef FEATURE_COOKIE_JAR
if ( NULL != config->jarfile )
{
if ( NULL == (config->jar = fopen(config->jarfile, "a")) )
}
setbuf(config->jar, NULL);
}
-#endif /* def JAR_FILES */
+#endif /* def FEATURE_COOKIE_JAR */
if ( NULL == config->haddr )
{
}
freez(fake_csp);
-#ifndef SPLIT_PROXY_ARGS
- if (!suppress_blocklists)
- {
- fs->proxy_args = strsav(fs->proxy_args, "</pre>");
- }
-#endif /* ndef SPLIT_PROXY_ARGS */
-
/* FIXME: this is a kludge for win32 */
#if defined(_WIN32) && !defined (_WIN_CONSOLE)
g_actions_file = config->actions_file;
-#ifdef PCRS
g_re_filterfile = config->re_filterfile;
-#endif
-#ifdef TRUST_FILES
+
+#ifdef FEATURE_TRUST
g_trustfile = config->trustfile;
-#endif
-
+#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.
+ *
+ * Parameters :
+ * 1 : c = config setting that was found
+ * 2 : o = the setting's argument (if any)
+ *
+ * Returns : N/A
+ *
+ *********************************************************************/
+static void savearg(char *c, char *o, struct configuration_spec * config)
+{
+ char buf[BUFFER_SIZE];
+
+ *buf = '\0';
+
+ if ( ( NULL != c ) && ( '\0' != *c ) )
+ {
+ if ((c = html_encode(c)))
+ {
+ sprintf(buf, "<a href=\"" REDIRECT_URL "option#%s\">%s</a> ", c, c);
+ }
+ freez(c);
+ }
+ if ( ( NULL != o ) && ( '\0' != *o ) )
+ {
+ 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);
+ }
+
+ strcat(buf, "<br>\n");
+
+ config->proxy_args = strsav(config->proxy_args, buf);
+
+}
+
+
/*
Local Variables:
tab-width: 3
projects / privoxy.git / blobdiff