X-Git-Url: http://www.privoxy.org/gitweb/?a=blobdiff_plain;ds=sidebyside;f=jcc.c;h=0970e0beb71255b7a1d77b9a9db2a336562b1a84;hb=8e22cb9cdedac101a56a2f4e724aef21ef1a1cc4;hp=ee27d19d4642c803af42d27ab92a0b26c033cd9a;hpb=1381e110e8518401178f393ac0e1e281040ad3d5;p=privoxy.git diff --git a/jcc.c b/jcc.c index ee27d19d..0970e0be 100644 --- a/jcc.c +++ b/jcc.c @@ -1,4 +1,4 @@ -const char jcc_rcs[] = "$Id: jcc.c,v 1.3 2001/05/20 01:21:20 jongfoster Exp $"; +const char jcc_rcs[] = "$Id: jcc.c,v 1.9 2001/05/26 00:28:36 jongfoster Exp $"; /********************************************************************* * * File : $Source: /cvsroot/ijbswa/current/jcc.c,v $ @@ -33,6 +33,69 @@ const char jcc_rcs[] = "$Id: jcc.c,v 1.3 2001/05/20 01:21:20 jongfoster Exp $"; * * Revisions : * $Log: jcc.c,v $ + * 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. + * * Revision 1.3 2001/05/20 01:21:20 jongfoster * Version 2.9.4 checkin. * - Merged popupfile and cookiefile, and added control over PCRS @@ -130,95 +193,16 @@ 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__ */ - -#define BODY "\n" - -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" - "\n"; - -static const char CSUCCEED[] = - "HTTP/1.0 200 Connection established\n" - "Proxy-Agent: IJ/" VERSION "\n\n"; - -static const char CHEADER[] = - "HTTP/1.0 400 Invalid header received from browser\n\n"; - -static const char SHEADER[] = - "HTTP/1.0 502 Invalid header received from server\n\n"; - -#if defined(DETECT_MSIE_IMAGES) || defined(USE_IMAGE_LIST) - -/* - * Hint: You can encode your own GIFs like that: - * perl -e 'while (read STDIN, $c, 1) { printf("\\%.3o,", unpack("C", $c)); }' - */ - -static const char BLANKGIF[] = - "HTTP/1.0 200 OK\r\n" - "Pragma: no-cache\r\n" - "Last-Modified: Thu Jul 31, 1997 07:42:22 pm GMT\r\n" - "Expires: Thu Jul 31, 1997 07:42:22 pm GMT\r\n" - "Content-type: image/gif\r\n\r\n" - "GIF89a\001\000\001\000\200\000\000\377\377\377\000\000" - "\000!\371\004\001\000\000\000\000,\000\000\000\000\001" - "\000\001\000\000\002\002D\001\000;"; - -static const char JBGIF[] = - "HTTP/1.0 200 OK\r\n" - "Pragma: no-cache\r\n" - "Last-Modified: Thu Jul 31, 1997 07:42:22 pm GMT\r\n" - "Expires: Thu Jul 31, 1997 07:42:22 pm GMT\r\n" - "Content-type: image/gif\r\n\r\n" - "GIF89aD\000\013\000\360\000\000\000\000\000\377\377\377!" - "\371\004\001\000\000\001\000,\000\000\000\000D\000\013\000" - "\000\002a\214\217\251\313\355\277\000\200G&K\025\316hC\037" - "\200\234\230Y\2309\235S\230\266\206\372J\253<\3131\253\271" - "\270\215\342\254\013\203\371\202\264\334P\207\332\020o\266" - "N\215I\332=\211\312\3513\266:\026AK)\364\370\365aobr\305" - "\372\003S\275\274k2\354\254z\347?\335\274x\306^9\374\276" - "\037Q\000\000;"; - -static const char FWGIF[] = - "HTTP/1.0 302 Blocked Advert\r\n" - "Pragma: no-cache\r\n" - "Last-Modified: Thu Jul 31, 1997 07:42:22 pm GMT\r\n" - "Expires: Thu Jul 31, 1997 07:42:22 pm GMT\r\n" - "Location: "; - -#endif /* defined(DETECT_MSIE_IMAGES) || defined(USE_IMAGE_LIST) */ - #ifdef _WIN32 #define sleep(N) Sleep(((N) * 1000)) #endif @@ -247,36 +231,35 @@ static const char FWGIF[] = *********************************************************************/ static void chat(struct client_state *csp) { -/* This next line is a little ugly, but it simplifies the if statement below. */ -/* Basically if TOGGLE, then we want the if to test "csp->toggled_on", else we don't */ -#ifdef TOGGLE -# define IS_TOGGLED_ON csp->toggled_on && -#else /* ifndef TOGGLE */ -# define IS_TOGGLED_ON -#endif /* ndef TOGGLE */ - -/* This next line is a little ugly, but it simplifies the if statement below. */ -/* Basically if TRUST_FILES, then we want the if to call "trust_url", else we don't */ -#ifdef TRUST_FILES -# define IS_TRUSTED_URL (p = trust_url(http, csp)) || -#else /* ifndef TRUST_FILES */ -# define IS_TRUSTED_URL -#endif /* ndef TRUST_FILES */ - - +/* This next line is a little ugly, but it simplifies the if statement below. */ +/* Basically if TOGGLE, then we want the if to test "csp->toggled_on", else we don't */ +#ifdef TOGGLE +# define IS_TOGGLED_ON csp->toggled_on && +#else /* ifndef TOGGLE */ +# define IS_TOGGLED_ON +#endif /* ndef TOGGLE */ + +/* This next line is a little ugly, but it simplifies the if statement below. */ +/* Basically if TRUST_FILES, then we want the if to call "trust_url", else we don't */ +#ifdef TRUST_FILES +# define IS_TRUSTED_URL (p = trust_url(http, csp)) || +#else /* ifndef TRUST_FILES */ +# define IS_TRUSTED_URL +#endif /* ndef TRUST_FILES */ + char buf[BUFSIZ], *hdr, *p, *req; char *err = NULL; char *eno; fd_set rfds; int n, maxfd, server_body, ms_iis5_hack = 0; const struct gateway *gw; - struct http_request *http; -#ifdef KILLPOPUPS - int block_popups; /* bool, 1==will block popups */ - int block_popups_now = 0; /* bool, 1==currently blocking popups */ -#endif /* def KILLPOPUPS */ + struct http_request *http; +#ifdef KILLPOPUPS + int block_popups; /* bool, 1==will block popups */ + int block_popups_now = 0; /* bool, 1==currently blocking popups */ +#endif /* def KILLPOPUPS */ #ifdef PCRS - int pcrs_filter; /* bool, 1==will filter through pcrs */ + int pcrs_filter; /* bool, 1==will filter through pcrs */ int filtering = 0; /* bool, 1==currently filtering through pcrs */ #endif /* def PCRS */ @@ -309,19 +292,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); @@ -341,7 +324,7 @@ static void chat(struct client_state *csp) if ((gw = forward_url(http, csp)) == NULL) { log_error(LOG_LEVEL_FATAL, "gateway spec is NULL!?!? This can't happen!"); - /* Never get here - LOG_LEVEL_FATAL causes program exit */ + /* Never get here - LOG_LEVEL_FATAL causes program exit */ } /* build the http request to send to the server @@ -389,31 +372,31 @@ static void chat(struct client_state *csp) freez(p); } } - + /* decide what we're to do with cookies */ - -#ifdef TOGGLE - if (!csp->toggled_on) - { - /* Most compatible set of permissions */ - csp->permissions = PERMIT_COOKIE_SET | PERMIT_COOKIE_READ | PERMIT_POPUPS; - } - else - { - csp->permissions = url_permissions(http, csp); - } -#else /* ifndef TOGGLE */ - csp->permissions = url_permissions(http, csp); -#endif /* ndef TOGGLE */ - -#ifdef KILLPOPUPS - block_popups = ((csp->permissions & PERMIT_POPUPS) == 0); -#endif /* def KILLPOPUPS */ -#ifdef PCRS - pcrs_filter = (csp->rlist != NULL) && /* There are expressions to be used */ + +#ifdef TOGGLE + if (!csp->toggled_on) + { + /* Most compatible set of permissions */ + csp->permissions = PERMIT_COOKIE_SET | PERMIT_COOKIE_READ | PERMIT_POPUPS; + } + else + { + csp->permissions = url_permissions(http, csp); + } +#else /* ifndef TOGGLE */ + csp->permissions = url_permissions(http, csp); +#endif /* ndef TOGGLE */ + +#ifdef KILLPOPUPS + block_popups = ((csp->permissions & PERMIT_POPUPS) == 0); +#endif /* def KILLPOPUPS */ +#ifdef PCRS + pcrs_filter = (csp->rlist != NULL) && /* There are expressions to be used */ ((csp->permissions & PERMIT_RE_FILTER) != 0); -#endif /* def PCRS */ - +#endif /* def PCRS */ + /* grab the rest of the client's headers */ @@ -443,15 +426,8 @@ static void chat(struct client_state *csp) destroy_list(csp->headers); - - /* - * by haroon - most of credit to srt19170 - * if toggled_on flag is true then IJB is enabled, do the usual - * otherwise avoid crunching - */ - - /* Check the request against all rules, unless - * we're disabled or in force mode. + /* Check the request against all rules, unless + * we're toggled off or in force mode. */ if (IS_TOGGLED_ON @@ -460,7 +436,11 @@ static void chat(struct client_state *csp) #endif /* def FORCE_LOAD */ ( (p = intercept_url(http, csp)) || IS_TRUSTED_URL - (p = block_url(http, csp)) )) + (p = block_url(http, csp)) +#ifdef FAST_REDIRECTS + || (csp->config->fast_redirects && (p = redirect_url(http, csp))) +#endif /* def FAST_REDIRECTS */ + )) { #ifdef STATISTICS csp->rejected = 1; @@ -469,21 +449,28 @@ static void chat(struct client_state *csp) log_error(LOG_LEVEL_GPC, "%s%s crunch!", http->hostport, http->path); #if defined(DETECT_MSIE_IMAGES) || defined(USE_IMAGE_LIST) - /* now use block_imageurl */ - if ( (tinygif > 0) && block_imageurl(http, csp) ) + /* Block as image? */ + 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 == 1) + if ((csp->config->tinygif == 2) || strstr(http->path, "ijb-send-banner")) + { + write_socket(csp->cfd, JBGIF, sizeof(JBGIF)-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)) { - write_socket(csp->cfd, FWGIF, sizeof(FWGIF)-1); - write_socket(csp->cfd, tinygifurl, strlen(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 { @@ -492,8 +479,9 @@ static void chat(struct client_state *csp) } else #endif /* defined(DETECT_MSIE_IMAGES) || defined(USE_IMAGE_LIST) */ + /* Block as HTML */ { - /* Send HTML "blocked" message */ + /* Send HTML "blocked" message, interception, or redirection result */ write_socket(csp->cfd, p, strlen(p)); } @@ -797,24 +785,24 @@ static void chat(struct client_state *csp) * the client (along with anything else that * may be in the buffer) */ - -#ifdef KILLPOPUPS - /* Start blocking popups if appropriate. */ - - if (csp->is_text && /* It's a text / * MIME-Type */ - !http->ssl && /* We talk plaintext */ - block_popups) - { - block_popups_now = 1; - } - -#endif /* def KILLPOPUPS */ - + +#ifdef KILLPOPUPS + /* Start blocking popups if appropriate. */ + + if (csp->is_text && /* It's a text / * MIME-Type */ + !http->ssl && /* We talk plaintext */ + block_popups) + { + block_popups_now = 1; + } + +#endif /* def KILLPOPUPS */ + #ifdef PCRS /* Start re_filtering this if appropriate. */ - + if (csp->is_text && /* It's a text / * MIME-Type */ - !http->ssl && /* We talk plaintext */ + !http->ssl && /* We talk plaintext */ pcrs_filter) /* Policy allows */ { filtering = 1; @@ -882,7 +870,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); @@ -951,7 +943,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" @@ -975,6 +969,10 @@ int main(int argc, const char *argv[]) } #endif /* !defined(_WIN32) || defined(_WIN_CONSOLE) */ +#ifdef AMIGA + InitAmiga(); +#endif + Argc = argc; Argv = argv; @@ -983,22 +981,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 @@ -1007,7 +991,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 @@ -1043,24 +1026,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) { @@ -1083,7 +1071,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 @@ -1097,13 +1087,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 ... "); @@ -1117,30 +1120,39 @@ static void listen_loop(void) { exit(1); } -#endif +#endif + freez(csp); continue; } else { log_error(LOG_LEVEL_CONNECT, "OK"); - } + } #if defined(TOGGLE) /* by haroon - most of credit to srt19170 */ 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"); + 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;