X-Git-Url: http://www.privoxy.org/gitweb/?p=privoxy.git;a=blobdiff_plain;f=jcc.c;h=90100762b676fd3946ae8986aabed25895e9c52c;hp=c752cd5e71f755165fd483b9262f3ce66cb037c4;hb=72081f829de368392d04076728f8c991178c0080;hpb=8d7cdd184298be68f6864c828ae592656ba6b43c diff --git a/jcc.c b/jcc.c index c752cd5e..90100762 100644 --- a/jcc.c +++ b/jcc.c @@ -1,7 +1,7 @@ -const char jcc_rcs[] = "$Id: jcc.c,v 1.88 2002/03/27 14:32:43 david__schmidt Exp $"; +const char jcc_rcs[] = "$Id: jcc.c,v 1.92.2.16 2005/04/03 20:10:50 david__schmidt Exp $"; /********************************************************************* * - * File : $Source: /cvsroot/ijbswa/current/jcc.c,v $ + * File : $Source: /cvsroot/ijbswa/current/Attic/jcc.c,v $ * * Purpose : Main file. Contains main() method, main loop, and * the main connection-handling function. @@ -33,6 +33,100 @@ const char jcc_rcs[] = "$Id: jcc.c,v 1.88 2002/03/27 14:32:43 david__schmidt Exp * * Revisions : * $Log: jcc.c,v $ + * Revision 1.92.2.16 2005/04/03 20:10:50 david__schmidt + * Thanks to Jindrich Makovicka for a race condition fix for the log + * file. The race condition remains for non-pthread implementations. + * Reference patch #1175720. + * + * Revision 1.92.2.15 2004/10/03 12:53:32 david__schmidt + * Add the ability to check jpeg images for invalid + * lengths of comment blocks. Defensive strategy + * against the exploit: + * Microsoft Security Bulletin MS04-028 + * Buffer Overrun in JPEG Processing (GDI+) Could + * Allow Code Execution (833987) + * Enabled with +inspect-jpegs in actions files. + * + * Revision 1.92.2.14 2003/12/12 12:52:53 oes + * - Fixed usage info for non-unix platforms + * - Fixed small cmdline parsing bug + * + * Revision 1.92.2.13 2003/11/27 19:20:27 oes + * Diagnostics: Now preserve the returncode of pthread_create + * in errno. Closes BR #775721. Thanks to Geoffrey Hausheer. + * + * Revision 1.92.2.12 2003/07/11 11:34:19 oes + * No longer ignore SIGCHLD. Fixes bug #769381 + * + * Revision 1.92.2.11 2003/05/14 12:32:02 oes + * Close jarfile on graceful exit, remove stray line + * + * Revision 1.92.2.10 2003/05/08 15:13:46 oes + * Cosmetics: Killed a warning, a typo and an allocation left at exit + * + * Revision 1.92.2.9 2003/04/03 15:08:42 oes + * No longer rely on non-POSIX.1 extensions of getcwd(). + * Fixes bug #711001 + * + * Revision 1.92.2.8 2003/03/31 13:12:32 oes + * Replaced setenv() by posix-compliant putenv() + * Thanks to Neil McCalden (nmcc AT users.sf.net). + * + * Revision 1.92.2.7 2003/03/17 16:48:59 oes + * Added chroot ability, thanks to patch by Sviatoslav Sviridov + * + * Revision 1.92.2.6 2003/03/11 11:55:00 oes + * Clean-up and extension of improvements for forked mode: + * - Child's return code now consists of flags RC_FLAG_* + * - Reporting toggle to parent now properly #ifdef'ed + * - Children now report blocking to parent. This enables + * statistics in forked mode + * + * Revision 1.92.2.5 2003/03/10 23:45:32 oes + * Fixed bug #700381: Non-Threaded version now capable of being toggled. + * Children now report having been toggled through _exit(17), parents + * watch for that code and toggle themselves if found. + * + * Revision 1.92.2.4 2003/03/07 03:41:04 david__schmidt + * Wrapping all *_r functions (the non-_r versions of them) with + * mutex semaphores for OSX. Hopefully this will take care of all + * of those pesky crash reports. + * + * Revision 1.92.2.3 2003/02/28 12:53:06 oes + * Fixed two mostly harmless mem leaks + * + * Revision 1.92.2.2 2002/11/20 14:37:47 oes + * Fix: Head of global clients list now initialized to NULL + * + * Revision 1.92.2.1 2002/09/25 14:52:24 oes + * Added basic support for OPTIONS and TRACE HTTP methods: + * - New interceptor direct_response() added in chat(). + * - sed() moved to earlier in the process, so that the + * Host: header is evaluated before actions and forwarding + * are decided on. + * + * Revision 1.92 2002/05/08 16:00:46 oes + * Chat's buffer handling: + * - Fixed bug with unchecked out-of-mem conditions + * while reading client request & server headers + * - No longer predict if the buffer limit will be exceeded + * in the next read -- check add_to_iob's new + * return code. If buffer couldn't be extended + * (policy or out-of-mem) while + * - reading from client: abort + * - reading server headers: send error page + * - buffering server body for filter: flush, + * and if that fails: send error page + * + * Revision 1.91 2002/04/08 20:35:58 swa + * fixed JB spelling + * + * Revision 1.90 2002/04/02 14:57:28 oes + * Made sending wafers independent of FEATURE_COOKIE_JAR + * + * Revision 1.89 2002/03/31 17:18:59 jongfoster + * Win32 only: Enabling STRICT to fix a VC++ compile warning. + * * Revision 1.88 2002/03/27 14:32:43 david__schmidt * More compiler warning message maintenance * @@ -635,8 +729,23 @@ static int32 server_thread(void *data); #define sleep(N) DosSleep(((N) * 100)) #endif +#ifdef OSX_DARWIN +/* + * Hit OSX over the head with a hammer. Protect all *_r functions. + */ +pthread_mutex_t gmtime_mutex; +pthread_mutex_t localtime_mutex; +pthread_mutex_t gethostbyaddr_mutex; +pthread_mutex_t gethostbyname_mutex; +#endif /* def OSX_DARWIN */ + +#ifdef FEATURE_PTHREAD +pthread_mutex_t log_mutex; +pthread_mutex_t log_init_mutex; +#endif /* FEATURE_PTHREAD */ + #if defined(unix) || defined(__EMX__) -const char *basedir; +const char *basedir = NULL; const char *pidfile = NULL; int received_hup_signal = 0; #endif /* defined unix */ @@ -761,6 +870,7 @@ static void chat(struct client_state *csp) int pcrs_filter; /* bool, 1==will filter through pcrs */ int gif_deanimate; /* bool, 1==will deanimate gifs */ + int jpeg_inspect; /* bool, 1==will inspect jpegs */ /* Function that does the content filtering for the current request */ char *(*content_filter)() = NULL; @@ -780,8 +890,15 @@ static void chat(struct client_state *csp) len = read_socket(csp->cfd, buf, sizeof(buf)); if (len <= 0) break; /* error! */ - - add_to_iob(csp, buf, len); + + /* + * If there is no memory left for buffering the + * request, there is nothing we can do but hang up + */ + if (add_to_iob(csp, buf, len)) + { + return; + } req = get_header(csp); @@ -821,6 +938,7 @@ static void chat(struct client_state *csp) log_error(LOG_LEVEL_CLF, "%s - - [%T] \" \" 400 0", csp->ip_addr_str); + free_http_request(http); return; } @@ -952,31 +1070,27 @@ static void chat(struct client_state *csp) { string_append(&http->cmd, http->path); } - string_append(&http->cmd, " "); string_append(&http->cmd, http->ver); if (http->cmd == NULL) { - log_error(LOG_LEVEL_FATAL, "Out of memory rewiting SSL command"); + log_error(LOG_LEVEL_FATAL, "Out of memory writing HTTP command"); } + log_error(LOG_LEVEL_HEADER, "New HTTP Request-Line: %s", http->cmd); } enlist(csp->headers, http->cmd); -#ifdef FEATURE_COOKIE_JAR /* - * If we're logging cookies in a cookie jar, and the user has not - * supplied any wafers, and the user has not told us to suppress the - * vanilla wafer, then send the vanilla wafer. + * If the user has not supplied any wafers, and the user has not + * told us to suppress the vanilla wafer, then send the vanilla wafer. */ - if ((csp->config->jarfile != NULL) - && list_is_empty(csp->action->multi[ACTION_MULTI_WAFER]) + if (list_is_empty(csp->action->multi[ACTION_MULTI_WAFER]) && ((csp->action->flags & ACTION_VANILLA_WAFER) != 0)) { enlist(csp->action->multi[ACTION_MULTI_WAFER], VANILLA_WAFER); } -#endif /* def FEATURE_COOKIE_JAR */ #ifdef FEATURE_KILL_POPUPS @@ -988,6 +1102,8 @@ static void chat(struct client_state *csp) gif_deanimate = ((csp->action->flags & ACTION_DEANIMATE) != 0); + jpeg_inspect = ((csp->action->flags & ACTION_JPEG_INSPECT) != 0); + /* grab the rest of the client's headers */ for (;;) @@ -1000,7 +1116,15 @@ static void chat(struct client_state *csp) log_error(LOG_LEVEL_ERROR, "read from client failed: %E"); return; } - add_to_iob(csp, buf, len); + + /* + * If there is no memory left for buffering the + * request, there is nothing we can do but hang up + */ + if (add_to_iob(csp, buf, len)) + { + return; + } continue; } @@ -1009,14 +1133,18 @@ static void chat(struct client_state *csp) enlist(csp->headers, p); freez(p); } + /* * We have a request. Now, check to see if we need to * intercept it, i.e. If .. */ if ( - /* a CGI call was detected and answered */ - (NULL != (rsp = dispatch_cgi(csp))) + /* We may not forward the request by rfc2616 sect 14.31 */ + (NULL != (rsp = direct_response(csp))) + + /* or a CGI call was detected and answered */ + || (NULL != (rsp = dispatch_cgi(csp))) /* or we are enabled and... */ || (IS_ENABLED_AND ( @@ -1058,6 +1186,15 @@ static void chat(struct client_state *csp) return; } + hdr = sed(client_patterns, add_client_headers, csp); + if (hdr == NULL) + { + /* FIXME Should handle error properly */ + log_error(LOG_LEVEL_FATAL, "Out of memory parsing client header"); + } + + list_remove_all(csp->headers); + log_error(LOG_LEVEL_GPC, "%s%s", http->hostport, http->path); if (fwd->forward_host) @@ -1106,20 +1243,12 @@ static void chat(struct client_state *csp) } free_http_response(rsp); + freez(hdr); return; } log_error(LOG_LEVEL_CONNECT, "OK"); - hdr = sed(client_patterns, add_client_headers, csp); - if (hdr == NULL) - { - /* FIXME Should handle error properly */ - log_error(LOG_LEVEL_FATAL, "Out of memory parsing client header"); - } - - list_remove_all(csp->headers); - if (fwd->forward_host || (http->ssl == 0)) { /* write the client's (modified) header to the server @@ -1321,13 +1450,13 @@ static void chat(struct client_state *csp) || write_socket(csp->cfd, p != NULL ? p : csp->iob->cur, csp->content_length)) { log_error(LOG_LEVEL_ERROR, "write modified content to client failed: %E"); + freez(hdr); + freez(p); return; } freez(hdr); - if (NULL != p) { - freez(p); - } + freez(p); } break; /* "game over, man" */ @@ -1357,41 +1486,50 @@ static void chat(struct client_state *csp) { if (content_filter) { - add_to_iob(csp, buf, len); - /* - * If the buffer limit will be reached on the next read, - * switch to non-filtering mode, i.e. make & write the - * header, flush the socket and get out of the way. + * If there is no memory left for buffering the content, or the buffer limit + * has been reached, switch to non-filtering mode, i.e. make & write the + * header, flush the iob and buf, and get out of the way. */ - if (((size_t)(csp->iob->eod - csp->iob->buf)) + (size_t)BUFFER_SIZE > csp->config->buffer_limit) + if (add_to_iob(csp, buf, len)) { size_t hdrlen; + int flushed; - log_error(LOG_LEVEL_ERROR, "Buffer size limit reached! Flushing and stepping back."); + log_error(LOG_LEVEL_ERROR, "Flushing header and buffers. Stepping back from filtering."); hdr = sed(server_patterns, add_server_headers, csp); if (hdr == NULL) { - /* FIXME Should handle error properly */ - log_error(LOG_LEVEL_FATAL, "Out of memory parsing server header"); + /* + * Memory is too tight to even generate the header. + * Send our static "Out-of-memory" page. + */ + log_error(LOG_LEVEL_ERROR, "Out of memory while trying to flush."); + rsp = cgi_error_memory(); + + if (write_socket(csp->cfd, rsp->head, rsp->head_length) + || write_socket(csp->cfd, rsp->body, rsp->content_length)) + { + log_error(LOG_LEVEL_ERROR, "write to: %s failed: %E", http->host); + } + return; } hdrlen = strlen(hdr); - byte_count += hdrlen; if (write_socket(csp->cfd, hdr, hdrlen) - || ((len = flush_socket(csp->cfd, csp)) < 0)) + || ((flushed = flush_socket(csp->cfd, csp)) < 0) + || (write_socket(csp->cfd, buf, (size_t) len))) { - log_error(LOG_LEVEL_CONNECT, "write header to client failed: %E"); + log_error(LOG_LEVEL_CONNECT, "Flush header and buffers to client failed: %E"); freez(hdr); return; } + byte_count += hdrlen + flushed + len; freez(hdr); - byte_count += len; - content_filter = NULL; server_body = 1; @@ -1415,8 +1553,23 @@ static void chat(struct client_state *csp) * parsing an "out of body experience" ? */ - /* buffer up the data we just read */ - add_to_iob(csp, buf, len); + /* + * buffer up the data we just read. If that fails, + * there's little we can do but send our static + * out-of-memory page. + */ + if (add_to_iob(csp, buf, len)) + { + log_error(LOG_LEVEL_ERROR, "Out of memory while looking for end of server headers."); + rsp = cgi_error_memory(); + + if (write_socket(csp->cfd, rsp->head, rsp->head_length) + || write_socket(csp->cfd, rsp->body, rsp->content_length)) + { + log_error(LOG_LEVEL_ERROR, "write to: %s failed: %E", http->host); + } + return; + } /* get header lines from the iob */ @@ -1499,13 +1652,22 @@ static void chat(struct client_state *csp) /* Buffer and gif_deanimate this if appropriate. */ - if ((csp->content_type & CT_GIF) && /* It's a image/gif MIME-Type */ + if ((csp->content_type & CT_GIF) && /* It's an image/gif MIME-Type */ !http->ssl && /* We talk plaintext */ gif_deanimate) /* Policy allows */ { content_filter = gif_deanimate_response; } + /* Buffer and jpg_inspect this if appropriate. */ + + if ((csp->content_type & CT_JPEG) && /* It's an image/jpeg MIME-Type */ + !http->ssl && /* We talk plaintext */ + jpeg_inspect) /* Policy allows */ + { + content_filter = jpeg_inspect_response; + } + /* * Only write if we're not buffering for content modification */ @@ -1626,7 +1788,11 @@ static int32 server_thread(void *data) void usage(const char *myname) { printf("Privoxy version " VERSION " (" HOME_PAGE_URL ")\n" +#if !defined(unix) + "Usage: %s [--help] [--version] [configfile]\n" +#else "Usage: %s [--help] [--version] [--no-daemon] [--pidfile pidfile] [--user user[.group]] [configfile]\n" +#endif "Aborting.\n", myname); exit(2); @@ -1668,6 +1834,7 @@ int main(int argc, const char *argv[]) struct passwd *pw = NULL; struct group *grp = NULL; char *p; + int do_chroot = 0; #endif Argc = argc; @@ -1686,8 +1853,6 @@ int main(int argc, const char *argv[]) */ while (++argc_pos < argc) { -#if !defined(_WIN32) || defined(_WIN_CONSOLE) - if (strcmp(argv[argc_pos], "--help") == 0) { usage(argv[0]); @@ -1699,11 +1864,13 @@ int main(int argc, const char *argv[]) exit(0); } - else if (strcmp(argv[argc_pos], "--no-daemon" ) == 0) +#if defined(unix) + + else if (strcmp(argv[argc_pos], "--no-daemon" ) == 0) { no_daemon = 1; } -#if defined(unix) + else if (strcmp(argv[argc_pos], "--pidfile" ) == 0) { if (++argc_pos == argc) usage(argv[0]); @@ -1730,9 +1897,15 @@ int main(int argc, const char *argv[]) if (p != NULL) *--p = '\0'; } + + else if (strcmp(argv[argc_pos], "--chroot" ) == 0) + { + do_chroot = 1; + } + #endif /* defined(unix) */ + else -#endif /* defined(_WIN32) && !defined(_WIN_CONSOLE) */ { configfile = argv[argc_pos]; } @@ -1742,16 +1915,17 @@ int main(int argc, const char *argv[]) #if defined(unix) if ( *configfile != '/' ) { - char *abs_file; + char *abs_file, cwd[1024]; /* make config-filename absolute here */ - if ( !(basedir = getcwd( NULL, 1024 ))) + if ( !(getcwd(cwd, sizeof(cwd)))) { perror("get working dir failed"); exit( 1 ); } - if ( !(abs_file = malloc( strlen( basedir ) + strlen( configfile ) + 5 ))) + if (!(basedir = strdup(cwd)) + || (!(abs_file = malloc( strlen( basedir ) + strlen( configfile ) + 5 )))) { perror("malloc failed"); exit( 1 ); @@ -1765,6 +1939,7 @@ int main(int argc, const char *argv[]) files->next = NULL; + clients->next = NULL; #ifdef AMIGA InitAmiga(); @@ -1772,19 +1947,33 @@ int main(int argc, const char *argv[]) InitWin32(); #endif +#ifdef OSX_DARWIN + /* + * Prepare global mutex semaphores + */ + pthread_mutex_init(&gmtime_mutex,0); + pthread_mutex_init(&localtime_mutex,0); + pthread_mutex_init(&gethostbyaddr_mutex,0); + pthread_mutex_init(&gethostbyname_mutex,0); +#endif /* def OSX_DARWIN */ + +#ifdef FEATURE_PTHREAD + pthread_mutex_init(&log_mutex,0); + pthread_mutex_init(&log_init_mutex,0); +#endif /* FEATURE_PTHREAD */ + /* * Unix signal handling * * Catch the abort, interrupt and terminate signals for a graceful exit * Catch the hangup signal so the errlog can be reopened. - * Ignore the broken pipe and child signals - * FIXME: Isn't ignoring the default for SIGCHLD anyway and why ignore SIGPIPE? + * Ignore the broken pipe signals (FIXME: Why?) */ #if !defined(_WIN32) && !defined(__OS2__) && !defined(AMIGA) { int idx; const int catched_signals[] = { SIGABRT, SIGTERM, SIGINT, SIGHUP, 0 }; - const int ignored_signals[] = { SIGPIPE, SIGCHLD, 0 }; + const int ignored_signals[] = { SIGPIPE, 0 }; for (idx = 0; catched_signals[idx] != 0; idx++) { @@ -1896,10 +2085,45 @@ int main(int argc, const char *argv[]) { log_error(LOG_LEVEL_FATAL, "Cannot setgid(): Insufficient permissions."); } + if (do_chroot) + { + if (!pw->pw_dir) + { + log_error(LOG_LEVEL_FATAL, "Home directory for %s undefined", pw->pw_name); + } + if (chroot(pw->pw_dir) < 0) + { + log_error(LOG_LEVEL_FATAL, "Cannot chroot to %s", pw->pw_dir); + } + if (chdir ("/")) + { + log_error(LOG_LEVEL_FATAL, "Cannot chdir /"); + } + } if (setuid(pw->pw_uid)) { log_error(LOG_LEVEL_FATAL, "Cannot setuid(): Insufficient permissions."); } + if (do_chroot) + { + char putenv_dummy[64]; + + strcpy(putenv_dummy, "HOME=/"); + if (putenv(putenv_dummy) != 0) + { + log_error(LOG_LEVEL_FATAL, "Cannot putenv(): HOME"); + } + + snprintf(putenv_dummy, 64, "USER=%s", pw->pw_name); + if (putenv(putenv_dummy) != 0) + { + log_error(LOG_LEVEL_FATAL, "Cannot putenv(): USER"); + } + } + } + else if (do_chroot) + { + log_error(LOG_LEVEL_FATAL, "Cannot chroot without --user argument."); } } #endif /* defined unix */ @@ -2103,7 +2327,7 @@ static void listen_loop(void) } #ifdef FEATURE_TOGGLE - if (g_bToggleIJB) + if (global_toggle_state) { csp->flags |= CSP_FLAG_TOGGLED_ON; } @@ -2145,8 +2369,9 @@ static void listen_loop(void) pthread_attr_init(&attrs); pthread_attr_setdetachstate(&attrs, PTHREAD_CREATE_DETACHED); - child_id = (pthread_create(&the_thread, &attrs, - (void*)serve, csp) ? -1 : 0); + errno = pthread_create(&the_thread, &attrs, + (void*)serve, csp); + child_id = errno ? -1 : 0; pthread_attr_destroy(&attrs); } #endif @@ -2188,6 +2413,7 @@ static void listen_loop(void) #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(), @@ -2212,9 +2438,32 @@ static void listen_loop(void) */ if (child_id == 0) /* child */ { + int rc = 0; +#ifdef FEATURE_TOGGLE + int inherited_toggle_state = global_toggle_state; +#endif /* def FEATURE_TOGGLE */ + serve(csp); - _exit(0); + /* + * If we've been toggled or we've blocked the request, tell Mom + */ + +#ifdef FEATURE_TOGGLE + if (inherited_toggle_state != global_toggle_state) + { + rc |= RC_FLAG_TOGGLED; + } +#endif /* def FEATURE_TOGGLE */ + +#ifdef FEATURE_STATISTICS + if (csp->flags & CSP_FLAG_REJECTED) + { + rc |= RC_FLAG_BLOCKED; + } +#endif /* ndef FEATURE_STATISTICS */ + + _exit(rc); } else if (child_id > 0) /* parent */ { @@ -2222,9 +2471,32 @@ static void listen_loop(void) * copy of the client socket and the CSP * are not used. */ + int child_status; +#if !defined(_WIN32) && !defined(__CYGWIN__) + + wait( &child_status ); + + /* + * Evaluate child's return code: If the child has + * - been toggled, toggle ourselves + * - blocked its request, bump up the stats counter + */ + +#ifdef FEATURE_TOGGLE + if (WIFEXITED(child_status) && (WEXITSTATUS(child_status) & RC_FLAG_TOGGLED)) + { + global_toggle_state = !global_toggle_state; + } +#endif /* def FEATURE_TOGGLE */ + +#ifdef FEATURE_STATISTICS + urls_read++; + if (WIFEXITED(child_status) && (WEXITSTATUS(child_status) & RC_FLAG_BLOCKED)) + { + urls_rejected++; + } +#endif /* def FEATURE_STATISTICS */ -#if !defined(_WIN32) && defined(__CYGWIN__) - wait( NULL ); #endif /* !defined(_WIN32) && defined(__CYGWIN__) */ close_socket(csp->cfd); csp->flags &= ~CSP_FLAG_ACTIVE; @@ -2240,7 +2512,7 @@ static void listen_loop(void) log_error(LOG_LEVEL_ERROR, "can't fork: %E"); - sprintf(buf , "JunkBuster: can't fork: errno = %d", errno); + sprintf(buf , "Privoxy: can't fork: errno = %d", errno); write_socket(csp->cfd, buf, strlen(buf)); close_socket(csp->cfd); @@ -2287,8 +2559,17 @@ static void listen_loop(void) sweep(); #if defined(unix) - free(basedir); + freez(basedir); #endif + freez(configfile); + +#ifdef FEATURE_COOKIE_JAR + if (NULL != config->jar) + { + fclose(config->jar); + } +#endif + #if defined(_WIN32) && !defined(_WIN_CONSOLE) /* Cleanup - remove taskbar icon etc. */ TermLogWindow();