X-Git-Url: http://www.privoxy.org/gitweb/?p=privoxy.git;a=blobdiff_plain;f=project.h;h=f9c2ad87f2731c932badb722c735c2c9df207f15;hp=4941582667eca05743aacea90af803c259499cd0;hb=9783b8f9f84f1c44312bae5a63343bc3f9e2f98f;hpb=1df3ac22a584579c66453e938809929e8e20e160
diff --git a/project.h b/project.h
index 49415826..f9c2ad87 100644
--- a/project.h
+++ b/project.h
@@ -1,6 +1,6 @@
#ifndef _PROJECT_H
#define _PROJECT_H
-#define PROJECT_H_VERSION "$Id: project.h,v 1.1.1.1 2001/05/15 13:59:03 oes Exp $"
+#define PROJECT_H_VERSION "$Id: project.h,v 1.5 2001/05/26 00:28:36 jongfoster Exp $"
/*********************************************************************
*
* File : $Source: /cvsroot/ijbswa/current/project.h,v $
@@ -36,6 +36,73 @@
*
* Revisions :
* $Log: project.h,v $
+ * Revision 1.5 2001/05/26 00:28:36 jongfoster
+ * Automatic reloading of config file.
+ * Removed obsolete SIGHUP support (Unix) and Reload menu option (Win32).
+ * Most of the global variables have been moved to a new
+ * struct configuration_spec, accessed through csp->config->globalname
+ * Most of the globals remaining are used by the Win32 GUI.
+ *
+ * Revision 1.4 2001/05/22 18:46:04 oes
+ *
+ * - Enabled filtering banners by size rather than URL
+ * by adding patterns that replace all standard banner
+ * sizes with the "Junkbuster" gif to the re_filterfile
+ *
+ * - Enabled filtering WebBugs by providing a pattern
+ * which kills all 1x1 images
+ *
+ * - Added support for PCRE_UNGREEDY behaviour to pcrs,
+ * which is selected by the (nonstandard and therefore
+ * capital) letter 'U' in the option string.
+ * It causes the quantifiers to be ungreedy by default.
+ * Appending a ? turns back to greedy (!).
+ *
+ * - Added a new interceptor ijb-send-banner, which
+ * sends back the "Junkbuster" gif. Without imagelist or
+ * MSIE detection support, or if tinygif = 1, or the
+ * URL isn't recognized as an imageurl, a lame HTML
+ * explanation is sent instead.
+ *
+ * - Added new feature, which permits blocking remote
+ * script redirects and firing back a local redirect
+ * to the browser.
+ * The feature is conditionally compiled, i.e. it
+ * can be disabled with --disable-fast-redirects,
+ * plus it must be activated by a "fast-redirects"
+ * line in the config file, has its own log level
+ * and of course wants to be displayed by show-proxy-args
+ * Note: Boy, all the #ifdefs in 1001 locations and
+ * all the fumbling with configure.in and acconfig.h
+ * were *way* more work than the feature itself :-(
+ *
+ * - Because a generic redirect template was needed for
+ * this, tinygif = 3 now uses the same.
+ *
+ * - Moved GIFs, and other static HTTP response templates
+ * to project.h
+ *
+ * - Some minor fixes
+ *
+ * - Removed some >400 CRs again (Jon, you really worked
+ * a lot! ;-)
+ *
+ * Revision 1.3 2001/05/20 01:21:20 jongfoster
+ * Version 2.9.4 checkin.
+ * - Merged popupfile and cookiefile, and added control over PCRS
+ * filtering, in new "permissionsfile".
+ * - Implemented LOG_LEVEL_FATAL, so that if there is a configuration
+ * file error you now get a message box (in the Win32 GUI) rather
+ * than the program exiting with no explanation.
+ * - Made killpopup use the PCRS MIME-type checking and HTTP-header
+ * skipping.
+ * - Removed tabs from "config"
+ * - Moved duplicated url parsing code in "loaders.c" to a new funcition.
+ * - Bumped up version number.
+ *
+ * Revision 1.2 2001/05/17 23:01:01 oes
+ * - Cleaned CRLF's from the sources and related files
+ *
* Revision 1.1.1.1 2001/05/15 13:59:03 oes
* Initial import of version 2.9.3 source tree
*
@@ -102,6 +169,9 @@ extern "C" {
/* Need this for struct gateway */
struct client_state;
+/* Need this for struct client_state */
+struct configuration_spec;
+
struct http_request
{
@@ -115,7 +185,6 @@ struct http_request
int ssl;
};
-
struct gateway
{
/* generic attributes */
@@ -185,8 +254,10 @@ struct list
struct client_state
{
- int send_user_cookie;
- int accept_server_cookie;
+ struct configuration_spec * config;
+
+ int permissions;
+
int cfd;
int sfd;
@@ -202,13 +273,8 @@ struct client_state
#endif /* def FORCE_LOAD */
#ifdef TOGGLE
- /*
- * by haroon - most of credit to srt19170
- * We add an "on/off" toggle here that is used to effectively toggle
- * the Junkbuster off or on
- */
int toggled_on;
-#endif
+#endif /* def TOGGLE */
char *ip_addr_str;
long ip_addr_long;
@@ -228,9 +294,9 @@ struct client_state
struct list headers[1];
struct list cookie_list[1];
-#ifdef PCRS
+#if defined(PCRS) || defined(KILLPOPUPS)
int is_text;
-#endif /* def PCRS */
+#endif /* defined(PCRS) || defined(KILLPOPUPS) */
char *x_forwarded;
@@ -238,8 +304,9 @@ struct client_state
/* files associated with this client */
struct file_list *blist; /* blockfile */
- struct file_list *clist; /* cookiefile */
struct file_list *flist; /* forwardfile */
+ struct file_list *permissions_list;
+
#ifdef ACL_FILES
struct file_list *alist; /* aclfile */
@@ -249,12 +316,9 @@ struct client_state
struct file_list *ilist; /* imagefile */
#endif /* def USE_IMAGE_LIST */
-#ifdef KILLPOPUPS
- struct file_list *plist; /* kill popup file */
-#endif /* def KILLPOPUPS */
-
#ifdef PCRS
struct file_list *rlist; /* Perl re_filterfile */
+ size_t content_length; /* Length after processing */
#endif /* def PCRS */
#ifdef TRUST_FILES
@@ -346,20 +410,23 @@ struct file_list
struct block_spec
{
struct url_spec url[1];
- int reject;
+ int reject;
struct block_spec *next;
};
-struct cookie_spec
+#define PERMIT_COOKIE_SET 0x0001
+#define PERMIT_COOKIE_READ 0x0002
+#define PERMIT_RE_FILTER 0x0004
+#define PERMIT_POPUPS 0x0008
+
+struct permissions_spec
{
- struct url_spec url[1];
- int send_user_cookie;
- int accept_server_cookie;
- struct cookie_spec *next;
+ struct url_spec url[1];
+ int permissions;
+ struct permissions_spec * next;
};
-
struct forward_spec
{
struct url_spec url[1];
@@ -379,22 +446,6 @@ struct re_filterfile_spec
#endif /* def PCRS */
-#ifdef KILLPOPUPS
-/* Entries on popup blocklist */
-struct popup_blocklist
-{
- char *host_name;
- struct popup_blocklist *next;
-};
-
-/* Actual type used in file object */
-struct popup_settings
-{
- struct popup_blocklist *blocked;
- struct popup_blocklist *allowed;
-};
-#endif /* def KILLPOPUPS */
-
#ifdef ACL_FILES
#define ACL_PERMIT 1 /* accept connection request */
#define ACL_DENY 2 /* reject connection request */
@@ -416,6 +467,98 @@ struct access_control_list
};
#endif /* def ACL_FILES */
+/* Maximum number of loaders (permissions, block, forward, acl...) */
+#define NLOADERS 8
+
+/*
+ * Data loaded from the configuration file.
+ *
+ * (Anomaly: toggle is still handled through a global, not this structure)
+ */
+struct configuration_spec
+{
+ int debug;
+ int multi_threaded;
+
+#if defined(DETECT_MSIE_IMAGES) || defined(USE_IMAGE_LIST)
+ int tinygif;
+ const char *tinygifurl;
+#endif /* defined(DETECT_MSIE_IMAGES) || defined(USE_IMAGE_LIST) */
+
+ const char *logfile;
+
+ const char *blockfile;
+ const char *permissions_file;
+ const char *forwardfile;
+
+#ifdef ACL_FILES
+ const char *aclfile;
+#endif /* def ACL_FILES */
+
+#ifdef USE_IMAGE_LIST
+ const char *imagefile;
+#endif /* def USE_IMAGE_LIST */
+
+#ifdef PCRS
+ const char *re_filterfile;
+#endif /* def PCRS */
+
+ /*
+ * Permissions to use for URLs not in the permissions list.
+ */
+ int default_permissions;
+
+#ifdef JAR_FILES
+ const char * jarfile;
+ FILE * jar;
+#endif /* def JAR_FILES */
+
+ const char *referrer;
+ const char *uagent;
+ const char *from;
+
+ int add_forwarded;
+
+ struct list wafer_list[1];
+ struct list xtra_list[1];
+
+ /*
+ * Port and IP to bind to.
+ * Defaults to HADDR_DEFAULT:HADDR_PORT == 127.0.0.1:8000
+ */
+ const char *haddr;
+ int hport;
+
+#ifndef SPLIT_PROXY_ARGS
+ const char *suppress_message;
+#endif /* ndef SPLIT_PROXY_ARGS */
+
+#ifndef SPLIT_PROXY_ARGS
+ /* suppress listing sblock and simage */
+ int suppress_blocklists;
+#endif /* ndef SPLIT_PROXY_ARGS */
+
+#ifdef FAST_REDIRECTS
+ int fast_redirects;
+#endif /* def FAST_REDIRECTS */
+
+#ifdef TRUST_FILES
+ const char * trustfile;
+
+ struct list trust_info[1];
+ struct url_spec *trust_list[64];
+#endif /* def TRUST_FILES */
+
+ struct proxy_args proxy_args[1];
+
+ struct file_list *config_file_list;
+
+ int (*loaders[NLOADERS])(struct client_state *);
+
+ int need_bind; /* bool, nonzero if we need to bind() to the new port */
+};
+
+
#define SZ(X) (sizeof(X) / sizeof(*X))
#define WHITEBG "\n"
@@ -423,20 +566,113 @@ struct access_control_list
#define BANNER "Internet JUNKBUSTER"
#ifdef FORCE_LOAD
-/*
- * FIXME: Unfortunately, IE lowercases the domain name. JunkBuster does
- * a case-sensitive compare. JunkBuster should be modified to do a
- * case-insensitive compatison. As a temporary workaround, I've lowercased
- * the FORCE_PREFIX.
- *
- * #define FORCE_PREFIX "IJB-FORCE-LOAD-"
- */
-#define FORCE_PREFIX "ijb-force-load-"
+#define FORCE_PREFIX "/IJB-FORCE-LOAD"
#endif /* def FORCE_LOAD */
#define HOME_PAGE_URL "http://ijbswa.sourceforge.net/"
#define REDIRECT_URL HOME_PAGE_URL "redirect.php?v=" VERSION "&to="
+static const char CFAIL[] =
+ "HTTP/1.0 503 Connect failed\n"
+ "Content-Type: text/html\n\n"
+ "\n"
+ "\n"
+ "Internet Junkbuster: Connect failed\n"
+ "\n"
+ BODY
+ ""
+ BANNER
+ "
"
+ "TCP connection to '%s' failed: %s.\n
"
+ "\n"
+ "\n";
+
+static const char CNXDOM[] =
+ "HTTP/1.0 404 Non-existent domain\n"
+ "Content-Type: text/html\n\n"
+ "\n"
+ "\n"
+ "Internet Junkbuster: Non-existent domain\n"
+ "\n"
+ BODY
+ ""
+ BANNER
+ "
"
+ "No such domain: %s\n"
+ "\n"
+ "