X-Git-Url: http://www.privoxy.org/gitweb/?p=privoxy.git;a=blobdiff_plain;f=jcc.c;h=9b3b9ee82d641c9dc7606043ceaa3d6755a4588e;hp=e6d06bd70139db943d828092f0dd7014e01717ff;hb=018dde6ee8206f03a350d5c1c19213e37d60532a;hpb=c75584ebcc79f939fb4ec9c8f842cef6692640c7 diff --git a/jcc.c b/jcc.c index e6d06bd7..9b3b9ee8 100644 --- a/jcc.c +++ b/jcc.c @@ -1,7 +1,7 @@ -const char jcc_rcs[] = "$Id: jcc.c,v 1.1 2001/05/13 21:57:06 administrator Exp $"; +const char jcc_rcs[] = "$Id: jcc.c,v 1.4 2001/05/21 19:34:01 jongfoster Exp $"; /********************************************************************* * - * File : $Source: /home/administrator/cvs/ijb/jcc.c,v $ + * File : $Source: /cvsroot/ijbswa/current/jcc.c,v $ * * Purpose : Main file. Contains main() method, main loop, and * the main connection-handling function. @@ -33,6 +33,30 @@ const char jcc_rcs[] = "$Id: jcc.c,v 1.1 2001/05/13 21:57:06 administrator Exp $ * * Revisions : * $Log: jcc.c,v $ + * 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 + * 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 22:34:44 oes + * - Added hint on GIF char array generation to jcc.c + * - Cleaned CRLF's from the sources and related files + * - Repaired logging for REF and FRC + * + * Revision 1.1.1.1 2001/05/15 13:58:56 oes + * Initial import of version 2.9.3 source tree + * * *********************************************************************/ @@ -114,84 +138,6 @@ static void serve(struct client_state *csp); 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) -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 @@ -220,16 +166,36 @@ 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 */ + char buf[BUFSIZ], *hdr, *p, *req; char *err = NULL; char *eno; fd_set rfds; int n, maxfd, server_body, ms_iis5_hack = 0; - struct cookie_spec *cs; 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 */ #ifdef PCRS - int filtering = 0; + int pcrs_filter; /* bool, 1==will filter through pcrs */ + int filtering = 0; /* bool, 1==currently filtering through pcrs */ #endif /* def PCRS */ http = csp->http; @@ -249,14 +215,14 @@ static void chat(struct client_state *csp) req = get_header(csp); - if (req == NULL) - { - break; /* no HTTP request! */ + if (req == NULL) + { + break; /* no HTTP request! */ } - if (*req == '\0') - { - continue; /* more to come! */ + if (*req == '\0') + { + continue; /* more to come! */ } #ifdef FORCE_LOAD @@ -267,7 +233,7 @@ static void chat(struct client_state *csp) if(strstr(req, FORCE_PREFIX)) { strclean(req, FORCE_PREFIX); - /* if DEBUG(FRC) fprintf(logfp, "%s: Enforcing request \"%s\".\n", prog, req); */ + log_error(LOG_LEVEL_FORCE, "Enforcing request \"%s\".\n", req); csp->force = 1; } else @@ -292,8 +258,8 @@ static void chat(struct client_state *csp) if ((gw = forward_url(http, csp)) == NULL) { - log_error(LOG_LEVEL_ERROR, "gateway spec is NULL!?!? This can't happen!"); - abort(); + log_error(LOG_LEVEL_FATAL, "gateway spec is NULL!?!? This can't happen!"); + /* Never get here - LOG_LEVEL_FATAL causes program exit */ } /* build the http request to send to the server @@ -344,29 +310,28 @@ static void chat(struct client_state *csp) /* decide what we're to do with cookies */ -#if defined(TOGGLE) - /* - * by haroon - most of credit to srt19170 - * if toggled_on flag is false IJB is disabled, pass cookies thru - */ +#ifdef TOGGLE if (!csp->toggled_on) { - csp->accept_server_cookie = 1; - csp->send_user_cookie = 1; - } - else -#endif - - if ((cs = cookie_url(http, csp))) - { - csp->accept_server_cookie = cs->accept_server_cookie; - csp->send_user_cookie = cs->send_user_cookie; + /* Most compatible set of permissions */ + csp->permissions = PERMIT_COOKIE_SET | PERMIT_COOKIE_READ | PERMIT_POPUPS; } else { - csp->accept_server_cookie = 0; - csp->send_user_cookie = 0; + 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 */ + /* grab the rest of the client's headers */ @@ -396,40 +361,8 @@ static void chat(struct client_state *csp) destroy_list(csp->headers); -#ifdef TOGGLE - /* - * by haroon - most of credit to srt19170 - * if toggled_on flag is true then IJB is enabled, do the usual - * otherwise avoid crunching - */ - -/* 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 */ -#define IS_TOGGLED_ON csp->toggled_on && - -#else /* ifndef TOGGLE */ - -/* We don't have TOGGLE, so we don't care about toggling. */ -#define IS_TOGGLED_ON - -#endif /* ndef TOGGLE */ - - -#ifdef TRUST_FILES -/* 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 */ -#define IS_TRUSTED_URL (p = trust_url(http, csp)) || - -#else /* ifndef TRUST_FILES */ - -/* We don't have TRUST_FILES, so we don't care about trusted URL's. */ -#define IS_TRUSTED_URL - -#endif /* ndef TRUST_FILES */ - - /* Check the request against all rules, unless - * we're disabled or in force mode. + * we're toggled off or in force mode. */ if (IS_TOGGLED_ON @@ -438,7 +371,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 + || (fast_redirects && (p = redirect_url(http, csp))) +#endif /* def FAST_REDIRECTS */ + )) { #ifdef STATISTICS csp->rejected = 1; @@ -447,31 +384,33 @@ 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 */ + /* Block as image? */ if ( (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")) + { + write_socket(csp->cfd, JBGIF, sizeof(JBGIF)-1); + } if (tinygif == 1) { write_socket(csp->cfd, BLANKGIF, sizeof(BLANKGIF)-1); } - else if ((tinygif == 3) && (tinygifurl)) - { - write_socket(csp->cfd, FWGIF, sizeof(FWGIF)-1); - write_socket(csp->cfd, tinygifurl, strlen(tinygifurl)); - } - else + else if ((tinygif == 3) && (tinygifurl)) { - write_socket(csp->cfd, JBGIF, sizeof(JBGIF)-1); + p = (char *)malloc(strlen(HTTP_REDIRECT_TEMPLATE) + strlen(tinygifurl)); + sprintf(p, HTTP_REDIRECT_TEMPLATE, tinygifurl); + write_socket(csp->cfd, p, strlen(p)); } } 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)); } @@ -639,11 +578,9 @@ static void chat(struct client_state *csp) #ifdef KILLPOPUPS /* Filter the popups on this read. */ - if ( IS_TOGGLED_ON - ( kill_all_popups || - ( ( http->host != NULL ) && ( popupfile != NULL ) ) ) ) + if (block_popups_now) { - filter_popups(csp, http->host, buf, n); + filter_popups(buf, n); } #endif /* def KILLPOPUPS */ @@ -778,14 +715,24 @@ static void chat(struct client_state *csp) * 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 PCRS - /* Decide if we want to re_filter this. */ + /* Start re_filtering this if appropriate. */ - if (IS_TOGGLED_ON /* Only filter if toggle is "on" */ - csp->is_text && /* It's a text / * MIME-Type */ - re_filterfile && /* There are expressions to be used */ + if (csp->is_text && /* It's a text / * MIME-Type */ !http->ssl && /* We talk plaintext */ - (re_filter_all || !csp->send_user_cookie)) /* Policy allows */ + pcrs_filter) /* Policy allows */ { filtering = 1; } @@ -1022,11 +969,12 @@ static void listen_loop(void) if (bfd < 0) { - log_error(LOG_LEVEL_ERROR, "can't bind %s:%d: %E " + 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 ); + /* shouldn't get here */ return; } @@ -1080,13 +1028,13 @@ static void listen_loop(void) if (!accept_connection(csp, bfd)) { log_error(LOG_LEVEL_CONNECT, "accept failed: %E"); - -#ifdef AMIGA - if(!childs) - { - exit(1); - } -#endif + +#ifdef AMIGA + if(!childs) + { + exit(1); + } +#endif continue; } else @@ -1105,8 +1053,8 @@ static void listen_loop(void) if (run_loader(csp)) { - log_error(LOG_LEVEL_ERROR, "a loader failed - must exit"); - return; + log_error(LOG_LEVEL_FATAL, "a loader failed - must exit"); + /* Never get here - LOG_LEVEL_FATAL causes program exit */ } if (multi_threaded) @@ -1141,24 +1089,24 @@ static void listen_loop(void) } #endif -#if defined(AMIGA) && !defined(SELECTED_ONE_OPTION) -#define SELECTED_ONE_OPTION - csp->cfd = ReleaseSocket(csp->cfd, -1); - if((child_id = (int)CreateNewProcTags( - NP_Entry, (ULONG)server_thread, - NP_Output, Output(), - NP_CloseOutput, FALSE, - NP_Name, (ULONG)"junkbuster child", - NP_StackSize, 20*1024, - TAG_DONE))) - { - childs++; - ((struct Task *)child_id)->tc_UserData = csp; - Signal((struct Task *)child_id, SIGF_SINGLE); - Wait(SIGF_SINGLE); - } -#endif - +#if defined(AMIGA) && !defined(SELECTED_ONE_OPTION) +#define SELECTED_ONE_OPTION + csp->cfd = ReleaseSocket(csp->cfd, -1); + if((child_id = (int)CreateNewProcTags( + NP_Entry, (ULONG)server_thread, + NP_Output, Output(), + NP_CloseOutput, FALSE, + NP_Name, (ULONG)"junkbuster child", + NP_StackSize, 20*1024, + TAG_DONE))) + { + childs++; + ((struct Task *)child_id)->tc_UserData = csp; + Signal((struct Task *)child_id, SIGF_SINGLE); + Wait(SIGF_SINGLE); + } +#endif + #if !defined(SELECTED_ONE_OPTION) child_id = fork(); #endif