-const char showargs_rcs[] = "$Id: showargs.c,v 1.1 2001/05/13 21:57:07 administrator Exp $";
+const char showargs_rcs[] = "$Id: showargs.c,v 1.7 2001/05/26 00:28:36 jongfoster Exp $";
/*********************************************************************
*
- * File : $Source: /home/administrator/cvs/ijb/showargs.c,v $
+ * File : $Source: /cvsroot/ijbswa/current/showargs.c,v $
*
* Purpose : Contains various utility routines needed to
* generate the show-proxy-args page.
*
* Revisions :
* $Log: showargs.c,v $
+ * Revision 1.7 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.6 2001/05/25 22:32:56 jongfoster
+ * CRLF->LF
+ *
+ * Revision 1.5 2001/05/22 18:54:49 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.4 2001/05/20 16:44:47 jongfoster
+ * Removing last hardcoded JunkBusters.com URLs.
+ *
+ * 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
+ *
*
*********************************************************************/
\f
#include <malloc.h>
#include <errno.h>
+#include "project.h"
#include "showargs.h"
#include "jcc.h"
#include "encode.h"
{
if ((p = realloc(old, new_len)) == NULL)
{
- log_error(LOG_LEVEL_ERROR, "realloc(%d) bytes for proxy_args failed!", new_len);
- exit(1);
+ log_error(LOG_LEVEL_FATAL, "realloc(%d) bytes for proxy_args failed!", new_len);
+ /* Never get here - LOG_LEVEL_FATAL causes program exit */
}
}
else
{
if ((p = (char *)malloc(new_len)) == NULL)
{
- log_error(LOG_LEVEL_ERROR, "malloc(%d) bytes for proxy_args failed!", new_len);
- exit(1);
+ log_error(LOG_LEVEL_FATAL, "malloc(%d) bytes for proxy_args failed!", new_len);
+ /* Never get here - LOG_LEVEL_FATAL causes program exit */
}
}
* Returns : N/A
*
*********************************************************************/
-void savearg(char *c, char *o)
+void savearg(char *c, char *o, struct configuration_spec * config)
{
char buf[BUFSIZ];
strcat(buf, "<br>\n");
- proxy_args->invocation = strsav(proxy_args->invocation, buf);
+ config->proxy_args_invocation = strsav(config->proxy_args_invocation, buf);
}
* Returns : N/A
*
*********************************************************************/
-void init_proxy_args(int argc, const char *argv[])
+void init_proxy_args(int argc, const char *argv[], struct configuration_spec * config)
{
const struct gateway *g;
+ char * b;
int i;
- freez(proxy_args->header);
- freez(proxy_args->invocation);
- freez(proxy_args->gateways);
- freez(proxy_args->trailer);
+ freez(config->proxy_args_header);
+ freez(config->proxy_args_invocation);
+ freez(config->proxy_args_gateways);
+ freez(config->proxy_args_trailer);
- proxy_args->header = strsav(proxy_args->header,
+ b = NULL;
+ b = strsav(b,
"HTTP/1.0 200 OK\n"
"Server: IJ/" VERSION "\n"
"Content-type: text/html\n\n"
"</h1></center>\n"
"<h2>You are using the " BANNER " <sup><small><small>TM</small></small></sup></h2>\n"
"Version: " VERSION "\n"
- "<br>Home page: <a href=\"" HOME_PAGE_URL "\">" HOME_PAGE_URL "</a>\n"\r
+ "<br>Home page: <a href=\"" HOME_PAGE_URL "\">" HOME_PAGE_URL "</a>\n"
"<p>\n"
);
- proxy_args->header = strsav(proxy_args->header,
+ b = strsav(b,
"<h2>The program was invoked as follows</h2>\n");
for (i=0; i < argc; i++)
{
- proxy_args->header = strsav(proxy_args->header, argv[i]);
- proxy_args->header = strsav(proxy_args->header, " ");
+ b = strsav(b, argv[i]);
+ b = strsav(b, " ");
}
- proxy_args->header = strsav(proxy_args->header, "<br>\n");
+ b = strsav(b, "<br>\n");
+ config->proxy_args_header = b;
- proxy_args->invocation = strsav(
- proxy_args->invocation,
+ config->proxy_args_invocation = strsav(
+ config->proxy_args_invocation,
"<br>\n"
"and the following options were set in the configuration file"
"<br><br>\n"
);
+ b = NULL;
- proxy_args->gateways = strsav(proxy_args->gateways,
+ b = strsav(b,
"<h2>It supports the following gateway protocols:</h2>\n");
for (g = gateways; g->name; g++)
{
- proxy_args->gateways = strsav(proxy_args->gateways, g->name);
- proxy_args->gateways = strsav(proxy_args->gateways, " ");
+ b = strsav(b, g->name);
+ b = strsav(b, " ");
}
- proxy_args->gateways = strsav(proxy_args->gateways, "<br>\n");
+ b = strsav(b, "<br>\n");
+ config->proxy_args_gateways = b;
}
* Returns : N/A
*
*********************************************************************/
-void end_proxy_args(void)
+void end_proxy_args(struct configuration_spec * config)
{
char *b = NULL;
char buf[BUFSIZ];
SHOW_RCS(ssplit_h_rcs)
SHOW_RCS(ssplit_rcs)
#ifdef _WIN32
+#ifndef _WIN_CONSOLE
SHOW_RCS(w32log_h_rcs)
SHOW_RCS(w32log_rcs)
SHOW_RCS(w32res_h_rcs)
SHOW_RCS(w32rulesdlg_rcs)
SHOW_RCS(w32taskbar_h_rcs)
SHOW_RCS(w32taskbar_rcs)
+#endif /* ndef _WIN_CONSOLE */
SHOW_RCS(win32_h_rcs)
SHOW_RCS(win32_rcs)
#endif /* def _WIN32 */
#else /* ifndef REGEX */
b = strsav(b, " <li><code>#undef <b>REGEX</b></code> - No support for regular expressions in the path specs.</li>\n");
#endif /* ndef REGEX */
-\r
-#ifdef PCRE\r
- b = strsav(b, " <li><code>#define <b>PCRE</b></code> - Use PCRE rather than old GNU regex library.</li>\n");\r
-#else /* ifndef PCRE */\r
- b = strsav(b, " <li><code>#undef <b>PCRE</b></code> - Use old GNU regex library rather than PCRE.</li>\n");\r
-#endif /* ndef PCRE */\r
+
+#ifdef PCRE
+ b = strsav(b, " <li><code>#define <b>PCRE</b></code> - Use PCRE rather than old GNU regex library.</li>\n");
+#else /* ifndef PCRE */
+ b = strsav(b, " <li><code>#undef <b>PCRE</b></code> - Use old GNU regex library rather than PCRE.</li>\n");
+#endif /* ndef PCRE */
#ifdef PCRS
b = strsav(b, " <li><code>#define <b>PCRS</b></code> - Enables arbitrary content modification regexps.</li>\n");
#else /* ifndef PCRS */
b = strsav(b, " <li><code>#undef <b>PCRS</b></code> - Disables arbitrary content modification regexps.</li>\n");
#endif /* ndef PCRS */
-\r
-#ifdef TOGGLE\r
- b = strsav(b, " <li><code>#define <b>TOGGLE</b></code> - Allow JunkBuster to be \"disabled\" so it is just a normal non-blocking non-anonymizing proxy.</li>\n");\r
-#else /* ifndef TOGGLE */\r
- b = strsav(b, " <li><code>#undef <b>TOGGLE</b></code> - Do not allow JunkBuster to be \"disabled\" so it is just a normal non-blocking non-anonymizing proxy.</li>\n");\r
-#endif /* ndef TOGGLE */\r
-\r
-#ifdef FORCE_LOAD\r
- b = strsav(b, " <li><code>#define <b>FORCE_LOAD</b></code> - Enables bypassing filtering for a single page using the prefix \"" FORCE_PREFIX "\".</li>\n");\r
-#else /* ifndef FORCE_LOAD */\r
- b = strsav(b, " <li><code>#undef <b>FORCE_LOAD</b></code> - Disables bypassing filtering for a single page.</li>\n");\r
-#endif /* ndef FORCE_LOAD */\r
+
+#ifdef TOGGLE
+ b = strsav(b, " <li><code>#define <b>TOGGLE</b></code> - Allow JunkBuster to be \"disabled\" so it is just a normal non-blocking non-anonymizing proxy.</li>\n");
+#else /* ifndef TOGGLE */
+ b = strsav(b, " <li><code>#undef <b>TOGGLE</b></code> - Do not allow JunkBuster to be \"disabled\" so it is just a normal non-blocking non-anonymizing proxy.</li>\n");
+#endif /* ndef TOGGLE */
+
+#ifdef FORCE_LOAD
+ b = strsav(b, " <li><code>#define <b>FORCE_LOAD</b></code> - Enables bypassing filtering for a single page using the prefix \"" FORCE_PREFIX "\".</li>\n");
+#else /* ifndef FORCE_LOAD */
+ b = strsav(b, " <li><code>#undef <b>FORCE_LOAD</b></code> - Disables bypassing filtering for a single page.</li>\n");
+#endif /* ndef FORCE_LOAD */
#ifdef DENY_GZIP
b = strsav(b, " <li><code>#define <b>DENY_GZIP</b></code> - Prevents requests from being compressed - required for PCRS.</li>\n");
b = strsav(b, " <li><code>#undef <b>DETECT_MSIE_IMAGES</b></code> - Disables detecting image requests automatically for MSIE.</li>\n");
#endif /* ndef DETECT_MSIE_IMAGES */
-#ifdef USE_IMAGE_LIST
- b = strsav(b, " <li><code>#define <b>USE_IMAGE_LIST</b></code> - Enables using image list to detect images.</li>\n");
-#else /* ifndef USE_IMAGE_LIST */
- b = strsav(b, " <li><code>#undef <b>USE_IMAGE_LIST</b></code> - Disables using image list to detect images.</li>\n");
-#endif /* ndef USE_IMAGE_LIST */
+#ifdef IMAGE_BLOCKING
+ b = strsav(b, " <li><code>#define <b>IMAGE_BLOCKING</b></code> - Enables sending \"blocked\" images instead of HTML.</li>\n");
+#else /* ifndef IMAGE_BLOCKING */
+ b = strsav(b, " <li><code>#undef <b>IMAGE_BLOCKING</b></code> - Disables sending \"blocked\" images instead of HTML.</li>\n");
+#endif /* ndef IMAGE_BLOCKING */
#ifdef ACL_FILES
b = strsav(b, " <li><code>#define <b>ACL_FILES</b></code> - Enables the use of ACL files to control access to the proxy by IP address.</li>\n");
#else /* ifndef ACL_FILES */
b = strsav(b, " <li><code>#undef <b>ACL_FILES</b></code> - Disables the use of ACL files to control access to the proxy by IP address.</li>\n");
#endif /* ndef ACL_FILES */
-\r
+
#ifdef TRUST_FILES
b = strsav(b, " <li><code>#define <b>TRUST_FILES</b></code> - Enables the use of trust files.</li>\n");
#else /* ifndef TRUST_FILES */
b = strsav(b, " <li><code>#undef <b>TRUST_FILES</b></code> - Disables the use of trust files.</li>\n");
#endif /* ndef TRUST_FILES */
-#ifdef JAR_FILES\r
- b = strsav(b, " <li><code>#define <b>JAR_FILES</b></code> - Enables the use of jar files to capture cookies.</li>\n");\r
-#else /* ifndef JAR_FILES */\r
- b = strsav(b, " <li><code>#undef <b>JAR_FILES</b></code> - Disables the use of jar files to capture cookies.</li>\n");\r
-#endif /* ndef JAR_FILES */\r
+#ifdef JAR_FILES
+ b = strsav(b, " <li><code>#define <b>JAR_FILES</b></code> - Enables the use of jar files to capture cookies.</li>\n");
+#else /* ifndef JAR_FILES */
+ b = strsav(b, " <li><code>#undef <b>JAR_FILES</b></code> - Disables the use of jar files to capture cookies.</li>\n");
+#endif /* ndef JAR_FILES */
+
+#ifdef FAST_REDIRECTS
+ b = strsav(b, " <li><code>#define <b>FAST_REDIRECTS</b></code> - Enables intercepting remote script redirects.</li>\n");
+#else /* ifndef FAST_REDIRECTS */
+ b = strsav(b, " <li><code>#undef <b>FAST_REDIRECTS</b></code> - Disables intercepting remote script redirects.</li>\n");
+#endif ndef /* FAST_REDIRECTS */
b = strsav(b, "</ul>\n<br>\n");
b = strsav(b,
"<small><small><p>\n"
- "Code and documentation of the " BANNER " Proxy"
- "<sup><small>TM</small></sup>\n"
- "<a href=\"http://www.junkbusters.com/ht/en/legal.html#copy\">\n" "Copyright</a>© 1997 Junkbusters Corporation\n"
- "<a href=\"http://www.junkbusters.com/ht/en/legal.html#marks\"><sup><small>TM</small></sup></a><br>\n"
- "Copying and distribution permitted under the"
- "<a href=\"http://www.gnu.org/copyleft/gpl.html\">\n"
- "<small>GNU</small></a> "
- "General Public License.\n"
- "</small>"
- "<address><kbd>webmaster@junkbusters.com</kbd></address>"
- "</small>"
+ "The " BANNER " Proxy - \n"
+ "<a href=\"" HOME_PAGE_URL "\">" HOME_PAGE_URL "</a><p>\n"
+ "Copyright © 2001 <a href=\"" HOME_PAGE_URL "\">the SourceForge IJBSWA team</a><br>\n"
+ "Copyright © 1997 <a href=\"http://www.junkbusters.com/\">\n" "Junkbusters Corporation</a><br>\n"
+ "Copying and distribution permitted under the "
+ "<a href=\"http://www.gnu.org/copyleft/gpl.html\">GNU General Public License.</a>\n"
+ "</small></small>"
"</body></html>\n"
);
- proxy_args->trailer = b;
+ config->proxy_args_trailer = b;
}
projects / privoxy.git / blobdiff