X-Git-Url: http://www.privoxy.org/gitweb/?p=privoxy.git;a=blobdiff_plain;f=jcc.c;h=cb3027516cb96d14ecf7ea0c3bdaaa092ac88bc7;hp=9b3b9ee82d641c9dc7606043ceaa3d6755a4588e;hb=34d10921b08f7df2539f4fd318a72c7e755ef5f6;hpb=1952a87fe55ceeff77c376d61e281df7aee11db7 diff --git a/jcc.c b/jcc.c index 9b3b9ee8..cb302751 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.11 2001/05/26 17:27:53 jongfoster Exp $"; /********************************************************************* * * File : $Source: /cvsroot/ijbswa/current/jcc.c,v $ @@ -33,6 +33,74 @@ 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.11 2001/05/26 17:27:53 jongfoster + * Added support for CLF and fixed LOG_LEVEL_LOG. + * Also did CRLF->LF fix of my previous patch. + * + * Revision 1.10 2001/05/26 15:26:15 jongfoster + * ACL feature now provides more security by immediately dropping + * connections from untrusted hosts. + * + * Revision 1.9 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.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 +201,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__ */ @@ -186,7 +259,9 @@ static void chat(struct client_state *csp) char *err = NULL; char *eno; fd_set rfds; - int n, maxfd, server_body, ms_iis5_hack = 0; + int n, maxfd, server_body; + int ms_iis5_hack = 0; + int byte_count = 0; const struct gateway *gw; struct http_request *http; #ifdef KILLPOPUPS @@ -227,19 +302,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); @@ -251,6 +326,9 @@ static void chat(struct client_state *csp) { strcpy(buf, CHEADER); write_socket(csp->cfd, buf, strlen(buf)); + + log_error(LOG_LEVEL_CLF, "%s - - [%T] \" \" 400 0", csp->ip_addr_str); + return; } @@ -361,8 +439,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 +451,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 */ )) { @@ -383,28 +461,37 @@ static void chat(struct client_state *csp) log_error(LOG_LEVEL_GPC, "%s%s crunch!", http->hostport, http->path); + log_error(LOG_LEVEL_CLF, "%s - - [%T] \"%s\" 200 1", + csp->ip_addr_str, http->cmd); + #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) */ @@ -414,8 +501,6 @@ static void chat(struct client_state *csp) write_socket(csp->cfd, p, strlen(p)); } - log_error(LOG_LEVEL_LOG, "%s", p); - freez(p); freez(hdr); return; @@ -446,18 +531,22 @@ static void chat(struct client_state *csp) { err = zalloc(strlen(CNXDOM) + strlen(http->host)); sprintf(err, CNXDOM, http->host); + + log_error(LOG_LEVEL_CLF, "%s - - [%T] \"%s\" 404 0", + csp->ip_addr_str, http->cmd); } else { eno = safe_strerror(errno); err = zalloc(strlen(CFAIL) + strlen(http->hostport) + strlen(eno)); sprintf(err, CFAIL, http->hostport, eno); + + log_error(LOG_LEVEL_CLF, "%s - - [%T] \"%s\" 503 0", + csp->ip_addr_str, http->cmd); } write_socket(csp->cfd, err, strlen(err)); - log_error(LOG_LEVEL_LOG, err); - freez(err); freez(hdr); return; @@ -484,6 +573,9 @@ static void chat(struct client_state *csp) sprintf(err, CFAIL, http->hostport, eno); write_socket(csp->cfd, err, strlen(err)); + log_error(LOG_LEVEL_CLF, "%s - - [%T] \"%s\" 503 0", + csp->ip_addr_str, http->cmd); + freez(err); freez(hdr); return; @@ -496,6 +588,9 @@ static void chat(struct client_state *csp) * so just send the "connect succeeded" message to the * client, flush the rest, and get out of the way. */ + log_error(LOG_LEVEL_CLF, "%s - - [%T] \"%s\" 200 2\n", + csp->ip_addr_str, http->cmd); + if (write_socket(csp->cfd, CSUCCEED, sizeof(CSUCCEED)-1) < 0) { freez(hdr); @@ -538,7 +633,10 @@ static void chat(struct client_state *csp) { n = read_socket(csp->cfd, buf, sizeof(buf)); - if (n <= 0) break; /* "game over, man" */ + if (n <= 0) + { + break; /* "game over, man" */ + } if (write_socket(csp->sfd, buf, n) != n) { @@ -567,6 +665,10 @@ static void chat(struct client_state *csp) eno = safe_strerror(errno); sprintf(buf, CFAIL, http->hostport, eno); freez(eno); + + log_error(LOG_LEVEL_CLF, "%s - - [%T] \"%s\" 503 0", + csp->ip_addr_str, http->cmd); + write_socket(csp->cfd, buf, strlen(buf)); return; } @@ -610,7 +712,17 @@ static void chat(struct client_state *csp) #ifdef PCRS if (filtering) { - re_process_buffer(csp); + p = re_process_buffer(csp); + hdr = sed(server_patterns, add_server_headers, csp); + n = strlen(hdr); + if ((write_socket(csp->cfd, hdr, n) != n) + || (write_socket(csp->cfd, p, csp->content_length) != csp->content_length)) + { + log_error(LOG_LEVEL_CONNECT, "write modified content to client failed: %E"); + return; + } + freez(hdr); + freez(p); } #endif /* def PCRS */ break; /* "game over, man" */ @@ -649,6 +761,7 @@ static void chat(struct client_state *csp) return; } } + byte_count += n; continue; } else @@ -720,7 +833,7 @@ static void chat(struct client_state *csp) if (csp->is_text && /* It's a text / * MIME-Type */ !http->ssl && /* We talk plaintext */ - block_popups) + block_popups) /* Policy allows */ { block_popups_now = 1; } @@ -747,9 +860,8 @@ static void chat(struct client_state *csp) #endif /* def PCRS */ - - if ((write_socket(csp->cfd, hdr, n) != n) - || (NOT_FILTERING_AND (flush_socket(csp->cfd, csp) < 0))) + if (NOT_FILTERING_AND ((write_socket(csp->cfd, hdr, n) != n) + || (n = flush_socket(csp->cfd, csp) < 0))) { log_error(LOG_LEVEL_CONNECT, "write header to client failed: %E"); @@ -761,6 +873,8 @@ static void chat(struct client_state *csp) return; } + NOT_FILTERING_AND (byte_count += n); + /* we're finished with the server's header */ freez(hdr); @@ -782,7 +896,8 @@ static void chat(struct client_state *csp) return; /* huh? we should never get here */ } - + log_error(LOG_LEVEL_CLF, "%s - - [%T] \"%s\" 200 %d", + csp->ip_addr_str, http->cmd, byte_count); } @@ -799,7 +914,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 +987,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 +1013,10 @@ int main(int argc, const char *argv[]) } #endif /* !defined(_WIN32) || defined(_WIN_CONSOLE) */ +#ifdef AMIGA + InitAmiga(); +#endif + Argc = argc; Argv = argv; @@ -900,22 +1025,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 +1035,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 +1070,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) { @@ -989,9 +1104,9 @@ static void listen_loop(void) #endif /* !defined(_WIN32) && !defined(__BEOS__) && !defined(AMIGA) */ sweep(); - if ( NULL == (csp = (struct client_state *) malloc(sizeof(*csp))) ) + if ( NULL == (csp = (struct client_state *) zalloc(sizeof(*csp))) ) { - log_error(LOG_LEVEL_ERROR, "malloc(%d) for csp failed: %E", sizeof(*csp)); + log_error(LOG_LEVEL_FATAL, "malloc(%d) for csp failed: %E", sizeof(*csp)); continue; } @@ -1000,7 +1115,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 +1131,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); - config_changed = 0; + 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->need_bind = 0; } log_error(LOG_LEVEL_CONNECT, "accept connection ... "); @@ -1035,6 +1165,7 @@ static void listen_loop(void) exit(1); } #endif + freez(csp); continue; } else @@ -1047,17 +1178,25 @@ static void listen_loop(void) csp->toggled_on = g_bToggleIJB; #endif - /* add it to the list of clients */ - csp->next = clients->next; - clients->next = csp; - if (run_loader(csp)) { log_error(LOG_LEVEL_FATAL, "a loader failed - must exit"); /* Never get here - LOG_LEVEL_FATAL causes program exit */ } - if (multi_threaded) + if (block_acl(NULL,csp)) + { + log_error(LOG_LEVEL_CONNECT, "Connection dropped due to ACL"); + close_socket(csp->cfd); + freez(csp); + continue; + } + + /* add it to the list of clients */ + csp->next = clients->next; + clients->next = csp; + + if (config->multi_threaded) { int child_id;