X-Git-Url: http://www.privoxy.org/gitweb/?p=privoxy.git;a=blobdiff_plain;f=showargs.c;h=a5b85b381f0a1c3be9d6156d32e460b8147491d8;hp=d80353819ea7c522dfefbf1bfe925351942b736d;hb=4793e1be2b24df19d6aa42a84b95653d040054f9;hpb=f31670ca5360e64312185b670be81939f7a1c0f5 diff --git a/showargs.c b/showargs.c index d8035381..a5b85b38 100644 --- a/showargs.c +++ b/showargs.c @@ -1,4 +1,4 @@ -const char showargs_rcs[] = "$Id: showargs.c,v 1.3 2001/05/20 01:21:20 jongfoster Exp $"; +const char showargs_rcs[] = "$Id: showargs.c,v 1.8 2001/05/29 09:50:24 jongfoster Exp $"; /********************************************************************* * * File : $Source: /cvsroot/ijbswa/current/showargs.c,v $ @@ -33,6 +33,86 @@ const char showargs_rcs[] = "$Id: showargs.c,v 1.3 2001/05/20 01:21:20 jongfoste * * Revisions : * $Log: showargs.c,v $ + * Revision 1.8 2001/05/29 09:50:24 jongfoster + * Unified blocklist/imagelist/permissionslist. + * File format is still under discussion, but the internal changes + * are (mostly) done. + * + * Also modified interceptor behaviour: + * - We now intercept all URLs beginning with one of the following + * prefixes (and *only* these prefixes): + * * http://i.j.b/ + * * http://ijbswa.sf.net/config/ + * * http://ijbswa.sourceforge.net/config/ + * - New interceptors "home page" - go to http://i.j.b/ to see it. + * - Internal changes so that intercepted and fast redirect pages + * are not replaced with an image. + * - Interceptors now have the option to send a binary page direct + * to the client. (i.e. ijb-send-banner uses this) + * - Implemented show-url-info interceptor. (Which is why I needed + * the above interceptors changes - a typical URL is + * "http://i.j.b/show-url-info?url=www.somesite.com/banner.gif". + * The previous mechanism would not have intercepted that, and + * if it had been intercepted then it then it would have replaced + * it with an image.) + * + * 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 @@ -64,6 +144,7 @@ const char showargs_rcs[] = "$Id: showargs.c,v 1.3 2001/05/20 01:21:20 jongfoste #include #include +#include "project.h" #include "showargs.h" #include "jcc.h" #include "encode.h" @@ -74,66 +155,6 @@ const char showargs_rcs[] = "$Id: showargs.c,v 1.3 2001/05/20 01:21:20 jongfoste const char showargs_h_rcs[] = SHOWARGS_H_VERSION; -/********************************************************************* - * - * Function : strsav - * - * Description : Reallocate "old" and append text to it. This makes - * it easier to append to malloc'd strings. - * - * Parameters : - * 1 : old = Old text that is to be extended. Will be - * free()d by this routine. - * 2 : text_to_append = Text to be appended to old. - * - * Returns : Pointer to newly malloc'ed appended string. - * If there is no text to append, return old. Caller - * must free(). - * - *********************************************************************/ -char *strsav(char *old, const char *text_to_append) -{ - int old_len, new_len; - char *p; - - if (( text_to_append == NULL) || (*text_to_append == '\0')) - { - return(old); - } - - if (NULL != old) - { - old_len = strlen(old); - } - else - { - old_len = 0; - } - - new_len = old_len + strlen(text_to_append) + 1; - - if (old) - { - if ((p = realloc(old, new_len)) == NULL) - { - 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_FATAL, "malloc(%d) bytes for proxy_args failed!", new_len); - /* Never get here - LOG_LEVEL_FATAL causes program exit */ - } - } - - strcpy(p + old_len, text_to_append); - return(p); - -} - /********************************************************************* * @@ -150,7 +171,7 @@ char *strsav(char *old, const char *text_to_append) * Returns : N/A * *********************************************************************/ -void savearg(char *c, char *o) +void savearg(char *c, char *o, struct configuration_spec * config) { char buf[BUFSIZ]; @@ -186,7 +207,7 @@ void savearg(char *c, char *o) strcat(buf, "
\n"); - proxy_args->invocation = strsav(proxy_args->invocation, buf); + config->proxy_args_invocation = strsav(config->proxy_args_invocation, buf); } @@ -204,18 +225,20 @@ void savearg(char *c, char *o) * 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" @@ -235,35 +258,38 @@ void init_proxy_args(int argc, const char *argv[]) "

\n" ); - proxy_args->header = strsav(proxy_args->header, + b = strsav(b, "

The program was invoked as follows

\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, "
\n"); + b = strsav(b, "
\n"); + config->proxy_args_header = b; - proxy_args->invocation = strsav( - proxy_args->invocation, + config->proxy_args_invocation = strsav( + config->proxy_args_invocation, "
\n" "and the following options were set in the configuration file" "

\n" ); + b = NULL; - proxy_args->gateways = strsav(proxy_args->gateways, + b = strsav(b, "

It supports the following gateway protocols:

\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, "
\n"); + b = strsav(b, "
\n"); + config->proxy_args_gateways = b; } @@ -278,7 +304,7 @@ void init_proxy_args(int argc, const char *argv[]) * Returns : N/A * *********************************************************************/ -void end_proxy_args(void) +void end_proxy_args(struct configuration_spec * config) { char *b = NULL; char buf[BUFSIZ]; @@ -348,8 +374,8 @@ void end_proxy_args(void) SHOW_RCS(showargs_rcs) SHOW_RCS(ssplit_h_rcs) SHOW_RCS(ssplit_rcs) -#ifdef _WIN32 -#ifndef _WIN_CONSOLE +#ifdef _WIN32 +#ifndef _WIN_CONSOLE SHOW_RCS(w32log_h_rcs) SHOW_RCS(w32log_rcs) SHOW_RCS(w32res_h_rcs) @@ -357,7 +383,7 @@ void end_proxy_args(void) SHOW_RCS(w32rulesdlg_rcs) SHOW_RCS(w32taskbar_h_rcs) SHOW_RCS(w32taskbar_rcs) -#endif /* ndef _WIN_CONSOLE */ +#endif /* ndef _WIN_CONSOLE */ SHOW_RCS(win32_h_rcs) SHOW_RCS(win32_rcs) #endif /* def _WIN32 */ @@ -434,11 +460,11 @@ void end_proxy_args(void) b = strsav(b, "
  • #undef DETECT_MSIE_IMAGES - Disables detecting image requests automatically for MSIE.
    • \n"); #endif /* ndef DETECT_MSIE_IMAGES */ -#ifdef USE_IMAGE_LIST - b = strsav(b, "
  • #define USE_IMAGE_LIST - Enables using image list to detect images.
    • \n"); -#else /* ifndef USE_IMAGE_LIST */ - b = strsav(b, "
  • #undef USE_IMAGE_LIST - Disables using image list to detect images.
    • \n"); -#endif /* ndef USE_IMAGE_LIST */ +#ifdef IMAGE_BLOCKING + b = strsav(b, "
  • #define IMAGE_BLOCKING - Enables sending \"blocked\" images instead of HTML.
    • \n"); +#else /* ifndef IMAGE_BLOCKING */ + b = strsav(b, "
  • #undef IMAGE_BLOCKING - Disables sending \"blocked\" images instead of HTML.
    • \n"); +#endif /* ndef IMAGE_BLOCKING */ #ifdef ACL_FILES b = strsav(b, "
  • #define ACL_FILES - Enables the use of ACL files to control access to the proxy by IP address.
    • \n"); @@ -458,13 +484,19 @@ void end_proxy_args(void) b = strsav(b, "
  • #undef JAR_FILES - Disables the use of jar files to capture cookies.
    • \n"); #endif /* ndef JAR_FILES */ +#ifdef FAST_REDIRECTS + b = strsav(b, "
  • #define FAST_REDIRECTS - Enables intercepting remote script redirects.
    • \n"); +#else /* ifndef FAST_REDIRECTS */ + b = strsav(b, "
  • #undef FAST_REDIRECTS - Disables intercepting remote script redirects.
    • \n"); +#endif ndef /* FAST_REDIRECTS */ + b = strsav(b, "\n
    \n"); b = strsav(b, "

    \n" - "The " BANNER " Proxy - \n" - "" HOME_PAGE_URL "

    \n" - "Copyright © 2001 the SourceForge IJBSWA team
    \n" + "The " BANNER " Proxy - \n" + "" HOME_PAGE_URL "

    \n" + "Copyright © 2001 the SourceForge IJBSWA team
    \n" "Copyright © 1997 \n" "Junkbusters Corporation
    \n" "Copying and distribution permitted under the " "GNU General Public License.\n" @@ -472,7 +504,7 @@ void end_proxy_args(void) "\n" ); - proxy_args->trailer = b; + config->proxy_args_trailer = b; }