X-Git-Url: http://www.privoxy.org/gitweb/?p=privoxy.git;a=blobdiff_plain;f=jcc.c;h=38ac12d9fa7d046e9b26c862dbdcff37f15d266a;hp=9b3b9ee82d641c9dc7606043ceaa3d6755a4588e;hb=88722394d0d63c4b2356a78139653bb0a4c03611;hpb=1952a87fe55ceeff77c376d61e281df7aee11db7 diff --git a/jcc.c b/jcc.c index 9b3b9ee8..38ac12d9 100644 --- a/jcc.c +++ b/jcc.c @@ -1,4 +1,4 @@ -const char jcc_rcs[] = "$Id: jcc.c,v 1.4 2001/05/21 19:34:01 jongfoster Exp $"; +const char jcc_rcs[] = "$Id: jcc.c,v 1.8 2001/05/25 22:43:18 jongfoster Exp $"; /********************************************************************* * * File : $Source: /cvsroot/ijbswa/current/jcc.c,v $ @@ -33,6 +33,59 @@ const char jcc_rcs[] = "$Id: jcc.c,v 1.4 2001/05/21 19:34:01 jongfoster Exp $"; * * Revisions : * $Log: jcc.c,v $ + * Revision 1.8 2001/05/25 22:43:18 jongfoster + * Fixing minor memory leak and buffer overflow. + * + * Revision 1.7 2001/05/25 22:34:30 jongfoster + * Hard tabs->Spaces + * + * Revision 1.6 2001/05/23 00:13:58 joergs + * AmigaOS support fixed. + * + * Revision 1.5 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.4 2001/05/21 19:34:01 jongfoster * Made failure to bind() a fatal error. * @@ -133,7 +186,12 @@ int urls_rejected = 0; /* total nr of urls rejected */ static void listen_loop(void); static void chat(struct client_state *csp); +#ifdef AMIGA +void serve(struct client_state *csp); +#else /* ifndef AMIGA */ static void serve(struct client_state *csp); +#endif /* def AMIGA */ + #ifdef __BEOS__ static int32 server_thread(void *data); #endif /* def __BEOS__ */ @@ -227,19 +285,19 @@ static void chat(struct client_state *csp) #ifdef FORCE_LOAD /* If this request contains the FORCE_PREFIX, - * better get rid of it now and set the force flag --oes + * better get rid of it now and set the force flag --oes */ - if(strstr(req, FORCE_PREFIX)) + if (strstr(req, FORCE_PREFIX)) { - strclean(req, FORCE_PREFIX); - log_error(LOG_LEVEL_FORCE, "Enforcing request \"%s\".\n", req); - csp->force = 1; - } + strclean(req, FORCE_PREFIX); + log_error(LOG_LEVEL_FORCE, "Enforcing request \"%s\".\n", req); + csp->force = 1; + } else { - csp->force = 0; - } + csp->force = 0; + } #endif /* def FORCE_LOAD */ parse_http_request(req, http, csp); @@ -361,8 +419,8 @@ static void chat(struct client_state *csp) destroy_list(csp->headers); - /* Check the request against all rules, unless - * we're toggled off or in force mode. + /* Check the request against all rules, unless + * we're toggled off or in force mode. */ if (IS_TOGGLED_ON @@ -373,7 +431,7 @@ static void chat(struct client_state *csp) IS_TRUSTED_URL (p = block_url(http, csp)) #ifdef FAST_REDIRECTS - || (fast_redirects && (p = redirect_url(http, csp))) + || (csp->config->fast_redirects && (p = redirect_url(http, csp))) #endif /* def FAST_REDIRECTS */ )) { @@ -385,26 +443,32 @@ static void chat(struct client_state *csp) #if defined(DETECT_MSIE_IMAGES) || defined(USE_IMAGE_LIST) /* Block as image? */ - if ( (tinygif > 0) && block_imageurl(http, csp) ) + if ( (csp->config->tinygif > 0) && block_imageurl(http, csp) ) { /* Send "blocked" image */ log_error(LOG_LEVEL_GPC, "%s%s image crunch!", http->hostport, http->path); - if ((tinygif == 2) || strstr(http->path, "ijb-send-banner")) + if ((csp->config->tinygif == 2) || strstr(http->path, "ijb-send-banner")) { write_socket(csp->cfd, JBGIF, sizeof(JBGIF)-1); } - if (tinygif == 1) + else if (csp->config->tinygif == 1) { write_socket(csp->cfd, BLANKGIF, sizeof(BLANKGIF)-1); } - else if ((tinygif == 3) && (tinygifurl)) + else if ((csp->config->tinygif == 3) && (csp->config->tinygifurl)) { - p = (char *)malloc(strlen(HTTP_REDIRECT_TEMPLATE) + strlen(tinygifurl)); - sprintf(p, HTTP_REDIRECT_TEMPLATE, tinygifurl); + freez(p); + p = (char *)malloc(sizeof(HTTP_REDIRECT_TEMPLATE) + + strlen(csp->config->tinygifurl)); + sprintf(p, HTTP_REDIRECT_TEMPLATE, csp->config->tinygifurl); write_socket(csp->cfd, p, strlen(p)); } + else + { + write_socket(csp->cfd, JBGIF, sizeof(JBGIF)-1); + } } else #endif /* defined(DETECT_MSIE_IMAGES) || defined(USE_IMAGE_LIST) */ @@ -799,7 +863,11 @@ static void chat(struct client_state *csp) * Returns : N/A * *********************************************************************/ +#ifdef AMIGA +void serve(struct client_state *csp) +#else /* ifndef AMIGA */ static void serve(struct client_state *csp) +#endif /* def AMIGA */ { chat(csp); close_socket(csp->cfd); @@ -868,7 +936,9 @@ int main(int argc, const char *argv[]) #endif { configfile = -#ifndef _WIN32 +#ifdef AMIGA + "AmiTCP:db/junkbuster.config" +#elif !defined(_WIN32) "config" #else "junkbstr.txt" @@ -892,6 +962,10 @@ int main(int argc, const char *argv[]) } #endif /* !defined(_WIN32) || defined(_WIN_CONSOLE) */ +#ifdef AMIGA + InitAmiga(); +#endif + Argc = argc; Argv = argv; @@ -900,22 +974,8 @@ int main(int argc, const char *argv[]) configfile = argv[1]; } - remove_all_loaders(); - memset( proxy_args, 0, sizeof( proxy_args ) ); files->next = NULL; - load_config( 0 ); - - /* - * Since load_config acts as a signal handler too, it returns - * its status in configret. Check it for an error in loading. - */ - if ( 0 != configret ) - { - /* load config failed! Exit with error. */ - return( 1 ); - } - #ifdef _WIN32 InitWin32(); #endif @@ -924,7 +984,6 @@ int main(int argc, const char *argv[]) #ifndef _WIN32 signal(SIGPIPE, SIG_IGN); signal(SIGCHLD, SIG_IGN); - signal(SIGHUP, load_config); #else /* ifdef _WIN32 */ # ifdef _WIN_CONSOLE @@ -960,24 +1019,29 @@ static void listen_loop(void) { struct client_state *csp = NULL; int bfd; + struct configuration_spec * config; + + config = load_config(); log_error(LOG_LEVEL_CONNECT, "bind (%s, %d)", - haddr ? haddr : "INADDR_ANY", hport); + config->haddr ? config->haddr : "INADDR_ANY", config->hport); - bfd = bind_port(haddr, hport); - config_changed = 0; + bfd = bind_port(config->haddr, config->hport); if (bfd < 0) { log_error(LOG_LEVEL_FATAL, "can't bind %s:%d: %E " "- There may be another junkbuster or some other " "proxy running on port %d", - (NULL != haddr) ? haddr : "INADDR_ANY", hport, hport + (NULL != config->haddr) ? config->haddr : "INADDR_ANY", + config->hport, config->hport ); /* shouldn't get here */ return; } + config->need_bind = 0; + while (FOREVER) { @@ -1000,7 +1064,9 @@ static void listen_loop(void) csp->active = 1; csp->sfd = -1; - if ( config_changed ) + csp->config = config = load_config(); + + if ( config->need_bind ) { /* * Since we were listening to the "old port", we will not see @@ -1014,13 +1080,26 @@ static void listen_loop(void) * request. This should not be a so common of an operation * that this will hurt people's feelings. */ + close_socket(bfd); log_error(LOG_LEVEL_CONNECT, "bind (%s, %d)", - haddr ? haddr : "INADDR_ANY", hport); - bfd = bind_port(haddr, hport); + config->haddr ? config->haddr : "INADDR_ANY", config->hport); + bfd = bind_port(config->haddr, config->hport); + + if (bfd < 0) + { + log_error(LOG_LEVEL_FATAL, "can't bind %s:%d: %E " + "- There may be another junkbuster or some other " + "proxy running on port %d", + (NULL != config->haddr) ? config->haddr : "INADDR_ANY", + config->hport, config->hport + ); + /* shouldn't get here */ + return; + } - config_changed = 0; + config->need_bind = 0; } log_error(LOG_LEVEL_CONNECT, "accept connection ... "); @@ -1057,7 +1136,7 @@ static void listen_loop(void) /* Never get here - LOG_LEVEL_FATAL causes program exit */ } - if (multi_threaded) + if (config->multi_threaded) { int child_id;