X-Git-Url: http://www.privoxy.org/gitweb/?p=privoxy.git;a=blobdiff_plain;f=jcc.c;h=54f190efc84c2f9301ff8903be8c7f565eb41ca4;hp=28ee02b42763a8656d17f7bef63126de1abc8801;hb=d8a952c6da2ac7eda32c7b282cf847568c46bc22;hpb=89f4d632da7483f990e3fa75d4a11aee69c61386 diff --git a/jcc.c b/jcc.c index 28ee02b4..54f190ef 100644 --- a/jcc.c +++ b/jcc.c @@ -1,4 +1,4 @@ -const char jcc_rcs[] = "$Id: jcc.c,v 1.65 2002/03/03 14:49:11 oes Exp $"; +const char jcc_rcs[] = "$Id: jcc.c,v 1.90 2002/04/02 14:57:28 oes Exp $"; /********************************************************************* * * File : $Source: /cvsroot/ijbswa/current/jcc.c,v $ @@ -7,7 +7,7 @@ const char jcc_rcs[] = "$Id: jcc.c,v 1.65 2002/03/03 14:49:11 oes Exp $"; * the main connection-handling function. * * Copyright : Written by and Copyright (C) 2001 the SourceForge - * IJBSWA team. http://ijbswa.sourceforge.net + * Privoxy team. http://www.privoxy.org/ * * Based on the Internet Junkbuster originally written * by and Copyright (C) 1997 Anonymous Coders and @@ -33,6 +33,125 @@ const char jcc_rcs[] = "$Id: jcc.c,v 1.65 2002/03/03 14:49:11 oes Exp $"; * * Revisions : * $Log: jcc.c,v $ + * 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 + * + * Revision 1.87 2002/03/26 22:29:54 swa + * we have a new homepage! + * + * Revision 1.86 2002/03/25 17:04:55 david__schmidt + * Workaround for closing the jarfile before load_config() comes around again + * + * Revision 1.85 2002/03/24 15:23:33 jongfoster + * Name changes + * + * Revision 1.84 2002/03/24 13:25:43 swa + * name change related issues + * + * Revision 1.83 2002/03/16 23:54:06 jongfoster + * Adding graceful termination feature, to help look for memory leaks. + * If you enable this (which, by design, has to be done by hand + * editing config.h) and then go to http://i.j.b/die, then the program + * will exit cleanly after the *next* request. It should free all the + * memory that was used. + * + * Revision 1.82 2002/03/13 00:27:05 jongfoster + * Killing warnings + * + * Revision 1.81 2002/03/12 01:42:50 oes + * Introduced modular filters + * + * Revision 1.80 2002/03/11 22:07:05 david__schmidt + * OS/2 port maintenance: + * - Fixed EMX build - it had decayed a little + * - Fixed inexplicable crash during FD_ZERO - must be due to a bad macro. + * substituted a memset for now. + * + * Revision 1.79 2002/03/09 20:03:52 jongfoster + * - Making various functions return int rather than size_t. + * (Undoing a recent change). Since size_t is unsigned on + * Windows, functions like read_socket that return -1 on + * error cannot return a size_t. + * + * THIS WAS A MAJOR BUG - it caused frequent, unpredictable + * crashes, and also frequently caused JB to jump to 100% + * CPU and stay there. (Because it thought it had just + * read ((unsigned)-1) == 4Gb of data...) + * + * - The signature of write_socket has changed, it now simply + * returns success=0/failure=nonzero. + * + * - Trying to get rid of a few warnings --with-debug on + * Windows, I've introduced a new type "jb_socket". This is + * used for the socket file descriptors. On Windows, this + * is SOCKET (a typedef for unsigned). Everywhere else, it's + * an int. The error value can't be -1 any more, so it's + * now JB_INVALID_SOCKET (which is -1 on UNIX, and in + * Windows it maps to the #define INVALID_SOCKET.) + * + * - The signature of bind_port has changed. + * + * Revision 1.78 2002/03/08 21:35:04 oes + * Added optional group supplement to --user option. Will now use default group of user if no group given + * + * Revision 1.77 2002/03/07 03:52:06 oes + * - Fixed compiler warnings etc + * - Improved handling of failed DNS lookups + * + * Revision 1.76 2002/03/06 22:54:35 jongfoster + * Automated function-comment nitpicking. + * + * Revision 1.75 2002/03/06 10:02:19 oes + * Fixed stupid bug when --user was not given + * + * Revision 1.74 2002/03/06 00:49:31 jongfoster + * Fixing warning on Windows + * Making #ifdefs that refer to the same variable consistently + * use #ifdef unix rather than mixing #ifdef unix & #ifndef OS2 + * + * Revision 1.73 2002/03/05 23:57:30 hal9 + * Stray character 's' on line 1618 was breaking build. + * + * Revision 1.72 2002/03/05 21:33:45 david__schmidt + * - Re-enable OS/2 building after new parms were added + * - Fix false out of memory report when resolving CGI templates when no IP + * address is available of failed attempt (a la no such domain) + * + * Revision 1.71 2002/03/05 18:13:56 oes + * Added --user option + * + * Revision 1.70 2002/03/05 04:52:42 oes + * Deleted non-errlog debugging code + * + * Revision 1.69 2002/03/04 23:50:00 jongfoster + * Splitting off bind_port() call into bind_port_helper(), with + * improved logging. + * + * Revision 1.68 2002/03/04 20:17:32 oes + * Fixed usage info + * + * Revision 1.67 2002/03/04 18:18:57 oes + * - Removed _DEBUG mode + * - Cleand up cmdline parsing + * - Introduced --no-daemon, --pidfile options + * - Cleaned up signal handling: + * - Terminate cleanly on INT, TERM and ABRT + * - Schedule logfile for re-opening on HUP + * - Ignore CHLD and PIPE + * - Leave the rest with their default handlers + * - Uniform handler registration + * - Added usage() function + * - Played styleguide police + * + * Revision 1.66 2002/03/03 15:06:55 oes + * Re-enabled automatic config reloading + * * Revision 1.65 2002/03/03 14:49:11 oes * Fixed CLF logging: Now uses client's original HTTP request * @@ -417,6 +536,9 @@ const char jcc_rcs[] = "$Id: jcc.c,v 1.65 2002/03/03 14:49:11 oes Exp $"; #ifdef _WIN32 # ifndef FEATURE_PTHREAD +# ifndef STRICT +# define STRICT +# endif # include # include # endif /* ndef FEATURE_PTHREAD */ @@ -440,6 +562,11 @@ const char jcc_rcs[] = "$Id: jcc.c,v 1.65 2002/03/03 14:49:11 oes Exp $"; #include #endif /* sun */ +#ifdef unix +#include +#include +#endif + # include # ifdef __BEOS__ @@ -462,10 +589,6 @@ const char jcc_rcs[] = "$Id: jcc.c,v 1.65 2002/03/03 14:49:11 oes Exp $"; #endif -#ifdef _DEBUG -int ldebug = 0; -#endif - #include "project.h" #include "list.h" #include "jcc.h" @@ -485,6 +608,7 @@ int ldebug = 0; const char jcc_h_rcs[] = JCC_H_VERSION; const char project_h_rcs[] = PROJECT_H_VERSION; +int no_daemon = 0; struct client_state clients[1]; struct file_list files[1]; @@ -493,6 +617,9 @@ int urls_read = 0; /* total nr of urls read inc rejected */ int urls_rejected = 0; /* total nr of urls rejected */ #endif /* def FEATURE_STATISTICS */ +#ifdef FEATURE_GRACEFUL_TERMINATION +int g_terminate = 0; +#endif static void listen_loop(void); static void chat(struct client_state *csp); @@ -514,8 +641,10 @@ static int32 server_thread(void *data); #define sleep(N) DosSleep(((N) * 100)) #endif -#if defined(unix) +#if defined(unix) || defined(__EMX__) const char *basedir; +const char *pidfile = NULL; +int received_hup_signal = 0; #endif /* defined unix */ /* The vanilla wafer. */ @@ -532,41 +661,50 @@ static const char VANILLA_WAFER[] = #if !defined(_WIN32) && !defined(__OS2__) && !defined(AMIGA) /********************************************************************* * - * Function : SIG_handler + * Function : sig_handler * * Description : Signal handler for different signals. - * see man kill, signal .. + * Exit gracefully on ABRT, TERM and INT + * or set a flag that will cause the errlog + * to be reopened by the main thread on HUP. * * Parameters : - * 1 : signal - the signal cause this function to call + * 1 : the_signal = the signal cause this function to call * * Returns : - * *********************************************************************/ -static void SIG_handler( int signal ) +static void sig_handler(int the_signal) { - switch( signal ) + switch(the_signal) { - case SIGHUP: - log_error(LOG_LEVEL_INFO, "ignoring HUP signal (%d)", signal); - break; + case SIGABRT: case SIGTERM: - log_error(LOG_LEVEL_INFO, "exiting by signal %d .. bye", signal); - + case SIGINT: + log_error(LOG_LEVEL_INFO, "exiting by signal %d .. bye", the_signal); #if defined(unix) - deletePidFile(); + unlink(pidfile); #endif /* unix */ - - exit( signal ); + exit(the_signal); break; + case SIGHUP: + received_hup_signal = 1; + break; + default: - /* want to exit jb so use FATAL */ - log_error(LOG_LEVEL_FATAL, "SIG_handler: receive signal %d without handler.", signal); + /* + * We shouldn't be here, unless we catch signals + * in main() that we can't handle here! + */ + log_error(LOG_LEVEL_FATAL, "sig_handler: exiting on unexpected signal %d", the_signal); } return; + } #endif + + /********************************************************************* * * Function : chat @@ -610,13 +748,18 @@ static void chat(struct client_state *csp) #define IS_ENABLED_AND IS_TOGGLED_ON_AND IS_NOT_FORCED_AND char buf[BUFFER_SIZE]; - char *hdr, *p, *req; + char *hdr; + char *p; + char *req; fd_set rfds; - int n, maxfd, server_body; + int n; + jb_socket maxfd; + int server_body; int ms_iis5_hack = 0; int byte_count = 0; const struct forward_spec * fwd; struct http_request *http; + int len; /* for buffer sizes */ #ifdef FEATURE_KILL_POPUPS int block_popups; /* bool, 1==will block popups */ int block_popups_now = 0; /* bool, 1==currently blocking popups */ @@ -638,13 +781,13 @@ static void chat(struct client_state *csp) * could get blocked here if a client connected, then didn't say anything! */ - while (FOREVER) + for (;;) { - n = read_socket(csp->cfd, buf, sizeof(buf)); + len = read_socket(csp->cfd, buf, sizeof(buf)); - if (n <= 0) break; /* error! */ + if (len <= 0) break; /* error! */ - add_to_iob(csp, buf, n); + add_to_iob(csp, buf, len); req = get_header(csp); @@ -827,19 +970,15 @@ static void chat(struct client_state *csp) 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 @@ -847,23 +986,23 @@ static void chat(struct client_state *csp) #endif /* def FEATURE_KILL_POPUPS */ pcrs_filter = (csp->rlist != NULL) && /* There are expressions to be used */ - ((csp->action->flags & ACTION_FILTER) != 0); + (!list_is_empty(csp->action->multi[ACTION_MULTI_FILTER])); gif_deanimate = ((csp->action->flags & ACTION_DEANIMATE) != 0); /* grab the rest of the client's headers */ - while (FOREVER) + for (;;) { - if ( ( p = get_header(csp) ) && ( *p == '\0' ) ) + if ( ( ( p = get_header(csp) ) != NULL) && ( *p == '\0' ) ) { - n = read_socket(csp->cfd, buf, sizeof(buf)); - if (n <= 0) + len = read_socket(csp->cfd, buf, sizeof(buf)); + if (len <= 0) { log_error(LOG_LEVEL_ERROR, "read from client failed: %E"); return; } - add_to_iob(csp, buf, n); + add_to_iob(csp, buf, len); continue; } @@ -901,8 +1040,8 @@ static void chat(struct client_state *csp) ) { /* Write the answer to the client */ - if ((write_socket(csp->cfd, rsp->head, rsp->head_length) != rsp->head_length) - || (write_socket(csp->cfd, rsp->body, rsp->content_length) != rsp->content_length)) + 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); } @@ -937,7 +1076,7 @@ static void chat(struct client_state *csp) csp->sfd = forwarded_connect(fwd, http, csp); - if (csp->sfd < 0) + if (csp->sfd == JB_INVALID_SOCKET) { log_error(LOG_LEVEL_CONNECT, "connect to: %s failed: %E", http->hostport); @@ -961,8 +1100,8 @@ static void chat(struct client_state *csp) /* Write the answer to the client */ if(rsp) { - if ((write_socket(csp->cfd, rsp->head, rsp->head_length) != rsp->head_length) - || (write_socket(csp->cfd, rsp->body, rsp->content_length) != rsp->content_length)) + 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); } @@ -989,10 +1128,8 @@ static void chat(struct client_state *csp) * (along with anything else that may be in the buffer) */ - n = strlen(hdr); - - if ((write_socket(csp->sfd, hdr, n) != n) - || (flush_socket(csp->sfd, csp ) < 0)) + if (write_socket(csp->sfd, hdr, strlen(hdr)) + || (flush_socket(csp->sfd, csp) < 0)) { log_error(LOG_LEVEL_CONNECT, "write header to: %s failed: %E", http->hostport); @@ -1004,8 +1141,8 @@ static void chat(struct client_state *csp) if(rsp) { - if ((write_socket(csp->cfd, rsp->head, rsp->head_length) != rsp->head_length) - || (write_socket(csp->cfd, rsp->body, rsp->content_length) != rsp->content_length)) + 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); } @@ -1026,7 +1163,7 @@ static void chat(struct client_state *csp) log_error(LOG_LEVEL_CLF, "%s - - [%T] \"%s\" 200 2\n", csp->ip_addr_str, http->ocmd); - if (write_socket(csp->cfd, CSUCCEED, sizeof(CSUCCEED)-1) < 0) + if (write_socket(csp->cfd, CSUCCEED, sizeof(CSUCCEED)-1)) { freez(hdr); return; @@ -1045,14 +1182,21 @@ static void chat(struct client_state *csp) server_body = 0; - while (FOREVER) + for (;;) { +#ifdef __OS2__ + /* + * FD_ZERO here seems to point to an errant macro which crashes. + * So do this by hand for now... + */ + memset(&rfds,0x00,sizeof(fd_set)); +#else FD_ZERO(&rfds); - +#endif FD_SET(csp->cfd, &rfds); FD_SET(csp->sfd, &rfds); - n = select(maxfd+1, &rfds, NULL, NULL, NULL); + n = select((int)maxfd+1, &rfds, NULL, NULL, NULL); if (n < 0) { @@ -1066,14 +1210,14 @@ static void chat(struct client_state *csp) if (FD_ISSET(csp->cfd, &rfds)) { - n = read_socket(csp->cfd, buf, sizeof(buf)); + len = read_socket(csp->cfd, buf, sizeof(buf)); - if (n <= 0) + if (len <= 0) { break; /* "game over, man" */ } - if (write_socket(csp->sfd, buf, n) != n) + if (write_socket(csp->sfd, buf, (size_t)len)) { log_error(LOG_LEVEL_ERROR, "write to: %s failed: %E", http->host); return; @@ -1091,9 +1235,9 @@ static void chat(struct client_state *csp) if (FD_ISSET(csp->sfd, &rfds)) { fflush( 0 ); - n = read_socket(csp->sfd, buf, sizeof(buf) - 1); + len = read_socket(csp->sfd, buf, sizeof(buf) - 1); - if (n < 0) + if (len < 0) { log_error(LOG_LEVEL_ERROR, "read from: %s failed: %E", http->host); @@ -1104,8 +1248,8 @@ static void chat(struct client_state *csp) if(rsp) { - if ((write_socket(csp->cfd, rsp->head, rsp->head_length) != rsp->head_length) - || (write_socket(csp->cfd, rsp->body, rsp->content_length) != rsp->content_length)) + 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); } @@ -1118,7 +1262,7 @@ static void chat(struct client_state *csp) /* Add a trailing zero. This lets filter_popups * use string operations. */ - buf[n] = '\0'; + buf[len] = '\0'; #ifdef FEATURE_KILL_POPUPS /* Filter the popups on this read. */ @@ -1146,7 +1290,7 @@ static void chat(struct client_state *csp) * doesn't generate a valid header, then we won't * transmit anything to the client. */ - if (n == 0) + if (len == 0) { if (server_body || http->ssl) @@ -1175,10 +1319,8 @@ static void chat(struct client_state *csp) log_error(LOG_LEVEL_FATAL, "Out of memory parsing server header"); } - n = strlen(hdr); - - if ((write_socket(csp->cfd, hdr, n) != n) - || (write_socket(csp->cfd, p != NULL ? p : csp->iob->cur, csp->content_length) != (int)csp->content_length)) + if (write_socket(csp->cfd, hdr, strlen(hdr)) + || 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"); return; @@ -1197,7 +1339,7 @@ static void chat(struct client_state *csp) * This is NOT the body, so * Let's pretend the server just sent us a blank line. */ - n = sprintf(buf, "\r\n"); + len = sprintf(buf, "\r\n"); /* * Now, let the normal header parsing algorithm below do its @@ -1217,7 +1359,7 @@ static void chat(struct client_state *csp) { if (content_filter) { - add_to_iob(csp, buf, n); + add_to_iob(csp, buf, len); /* * If the buffer limit will be reached on the next read, @@ -1226,6 +1368,8 @@ static void chat(struct client_state *csp) */ if (((size_t)(csp->iob->eod - csp->iob->buf)) + (size_t)BUFFER_SIZE > csp->config->buffer_limit) { + size_t hdrlen; + log_error(LOG_LEVEL_ERROR, "Buffer size limit reached! Flushing and stepping back."); hdr = sed(server_patterns, add_server_headers, csp); @@ -1235,11 +1379,11 @@ static void chat(struct client_state *csp) log_error(LOG_LEVEL_FATAL, "Out of memory parsing server header"); } - n = strlen(hdr); - byte_count += n; + hdrlen = strlen(hdr); + byte_count += hdrlen; - if (((write_socket(csp->cfd, hdr, n) != n) - || (n = flush_socket(csp->cfd, csp) < 0))) + if (write_socket(csp->cfd, hdr, hdrlen) + || ((len = flush_socket(csp->cfd, csp)) < 0)) { log_error(LOG_LEVEL_CONNECT, "write header to client failed: %E"); @@ -1248,7 +1392,7 @@ static void chat(struct client_state *csp) } freez(hdr); - byte_count += n; + byte_count += len; content_filter = NULL; server_body = 1; @@ -1257,13 +1401,13 @@ static void chat(struct client_state *csp) } else { - if (write_socket(csp->cfd, buf, n) != n) + if (write_socket(csp->cfd, buf, (size_t)len)) { log_error(LOG_LEVEL_ERROR, "write to client failed: %E"); return; } } - byte_count += n; + byte_count += len; continue; } else @@ -1274,11 +1418,11 @@ static void chat(struct client_state *csp) */ /* buffer up the data we just read */ - add_to_iob(csp, buf, n); + add_to_iob(csp, buf, len); /* get header lines from the iob */ - while ((p = get_header(csp))) + while ((p = get_header(csp)) != NULL) { if (*p == '\0') { @@ -1329,13 +1473,6 @@ static void chat(struct client_state *csp) log_error(LOG_LEVEL_FATAL, "Out of memory parsing server header"); } - n = strlen(hdr); - - /* write the server's (modified) header to - * the client (along with anything else that - * may be in the buffer) - */ - #ifdef FEATURE_KILL_POPUPS /* Start blocking popups if appropriate. */ @@ -1371,24 +1508,31 @@ static void chat(struct client_state *csp) content_filter = gif_deanimate_response; } - /* * Only write if we're not buffering for content modification */ - if (!content_filter && ((write_socket(csp->cfd, hdr, n) != n) - || (n = flush_socket(csp->cfd, csp) < 0))) + if (!content_filter) { - log_error(LOG_LEVEL_CONNECT, "write header to client failed: %E"); - - /* the write failed, so don't bother - * mentioning it to the client... - * it probably can't hear us anyway. + /* write the server's (modified) header to + * the client (along with anything else that + * may be in the buffer) */ - freez(hdr); - return; - } - if(!content_filter) byte_count += n; + if (write_socket(csp->cfd, hdr, strlen(hdr)) + || ((len = flush_socket(csp->cfd, csp)) < 0)) + { + log_error(LOG_LEVEL_CONNECT, "write header to client failed: %E"); + + /* the write failed, so don't bother + * mentioning it to the client... + * it probably can't hear us anyway. + */ + freez(hdr); + return; + } + + byte_count += len; + } /* we're finished with the server's header */ @@ -1438,7 +1582,7 @@ static void serve(struct client_state *csp) chat(csp); close_socket(csp->cfd); - if (csp->sfd >= 0) + if (csp->sfd != JB_INVALID_SOCKET) { close_socket(csp->sfd); } @@ -1470,6 +1614,28 @@ static int32 server_thread(void *data) #endif +/********************************************************************* + * + * Function : usage + * + * Description : Print usage info & exit. + * + * Parameters : Pointer to argv[0] for identifying ourselves + * + * Returns : No. ,-) + * + *********************************************************************/ +void usage(const char *myname) +{ + printf("Privoxy version " VERSION " (" HOME_PAGE_URL ")\n" + "Usage: %s [--help] [--version] [--no-daemon] [--pidfile pidfile] [--user user[.group]] [configfile]\n" + "Aborting.\n", myname); + + exit(2); + +} + + /********************************************************************* * * Function : main @@ -1499,7 +1665,15 @@ int real_main(int argc, const char *argv[]) int main(int argc, const char *argv[]) #endif { - int argc_pos = 1; + int argc_pos = 0; +#ifdef unix + struct passwd *pw = NULL; + struct group *grp = NULL; + char *p; +#endif + + Argc = argc; + Argv = argv; configfile = #if !defined(_WIN32) @@ -1509,53 +1683,76 @@ int main(int argc, const char *argv[]) #endif ; -#if !defined(_WIN32) || defined(_WIN_CONSOLE) - if ((argc >= 2) && (strcmp(argv[1], "--help")==0)) - { - printf("JunkBuster proxy version " VERSION ".\n\n" - "Usage: %s [configfile]\n\n" - "See " HOME_PAGE_URL " for details.\n" - "This program is distributed under the GNU GPL, version 2 or later.\n", - argv[0]); - exit(2); - } - if ((argc >= 2) && (strcmp(argv[1], "--version")==0)) - { - printf(VERSION "\n"); - exit(2); - } -#ifdef _DEBUG - if ((argc >= 2) && (strcmp(argv[1], "-d")==0)) + /* + * Parse the command line arguments + */ + while (++argc_pos < argc) { - ldebug++; - argc_pos++; - fprintf(stderr,"debugging enabled..\n"); - } -#endif /* _DEBUG */ -#endif /* !defined(_WIN32) || defined(_WIN_CONSOLE) */ +#if !defined(_WIN32) || defined(_WIN_CONSOLE) - Argc = argc; - Argv = argv; + if (strcmp(argv[argc_pos], "--help") == 0) + { + usage(argv[0]); + } - if (argc > argc_pos ) - { - configfile = argv[argc_pos]; - } + else if(strcmp(argv[argc_pos], "--version") == 0) + { + printf("Privoxy version " VERSION " (" HOME_PAGE_URL ")\n"); + exit(0); + } + + 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]); + pidfile = strdup(argv[argc_pos]); + } + + else if (strcmp(argv[argc_pos], "--user" ) == 0) + { + if (++argc_pos == argc) usage(argv[argc_pos]); + + if ((NULL != (p = strchr(argv[argc_pos], '.'))) && *(p + 1) != '0') + { + *p++ = '\0'; + if (NULL == (grp = getgrnam(p))) + { + log_error(LOG_LEVEL_FATAL, "Group %s not found.", p); + } + } + + if (NULL == (pw = getpwnam(argv[argc_pos]))) + { + log_error(LOG_LEVEL_FATAL, "User %s not found.", argv[argc_pos]); + } + + if (p != NULL) *--p = '\0'; + } +#endif /* defined(unix) */ + else +#endif /* defined(_WIN32) && !defined(_WIN_CONSOLE) */ + { + configfile = argv[argc_pos]; + } + + } /* -END- while (more arguments) */ #if defined(unix) if ( *configfile != '/' ) { char *abs_file; - DBG(1, ("configfile before '%s'\n",configfile) ); - /* make config-filename absolute here */ if ( !(basedir = getcwd( NULL, 1024 ))) { perror("get working dir failed"); exit( 1 ); } - DBG(1, ("working dir '%s'\n",basedir) ); + if ( !(abs_file = malloc( strlen( basedir ) + strlen( configfile ) + 5 ))) { perror("malloc failed"); @@ -1565,7 +1762,6 @@ int main(int argc, const char *argv[]) strcat( abs_file, "/" ); strcat( abs_file, configfile ); configfile = abs_file; - DBG(1, ("configfile after '%s'\n",configfile) ); } #endif /* defined unix */ @@ -1578,47 +1774,37 @@ int main(int argc, const char *argv[]) InitWin32(); #endif - + /* + * 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? + */ #if !defined(_WIN32) && !defined(__OS2__) && !defined(AMIGA) { - int sig; - struct sigaction action; + int idx; + const int catched_signals[] = { SIGABRT, SIGTERM, SIGINT, SIGHUP, 0 }; + const int ignored_signals[] = { SIGPIPE, SIGCHLD, 0 }; - for ( sig = 1; sig < 16; sig++ ) + for (idx = 0; catched_signals[idx] != 0; idx++) { - switch( sig ) + if (signal(catched_signals[idx], sig_handler) == SIG_ERR) { - case 9: - case SIGPIPE: - case SIGCHLD: - case SIGHUP: - continue; + log_error(LOG_LEVEL_FATAL, "Can't set signal-handler for signal %d: %E", catched_signals[idx]); } - if ( signal(sig, SIG_handler) == SIG_ERR ) - log_error(LOG_LEVEL_FATAL, "Can't set signal-handler for signal %d: %E", sig); } - /* SIG_IGN */ - if ( signal(SIGPIPE, SIG_IGN) == SIG_ERR ) - log_error(LOG_LEVEL_FATAL, "Can't set SIG_IGN to SIGPIPE: %E"); - if ( signal(SIGCHLD, SIG_IGN) == SIG_ERR ) - log_error(LOG_LEVEL_FATAL, "Can't set SIG_IGN to SIGCHLD: %E"); - /* log file reload */ - if (!sigaction(SIGHUP,NULL,&action)) - { - action.sa_handler = &SIG_handler; - action.sa_flags = SA_RESTART; - if ( sigaction(SIGHUP,&action,NULL)) - log_error(LOG_LEVEL_FATAL, "Can't set signal-handler for signal SIGHUP: %E"); - } - else + for (idx = 0; ignored_signals[idx] != 0; idx++) { - perror("sigaction"); - log_error(LOG_LEVEL_FATAL, "Can't get sigaction data for signal SIGHUP"); + if (signal(ignored_signals[idx], SIG_IGN) == SIG_ERR) + { + log_error(LOG_LEVEL_FATAL, "Can't set ignore-handler for signal %d: %E", ignored_signals[idx]); + } } - -} +} #else /* ifdef _WIN32 */ # ifdef _WIN_CONSOLE /* @@ -1633,6 +1819,11 @@ int main(int argc, const char *argv[]) /* Initialize the CGI subsystem */ cgi_init_error_messages(); + /* + * If runnig on unix and without the --nodaemon + * option, become a daemon. I.e. fork, detach + * from tty and get process group leadership + */ #if defined(unix) { pid_t pid = 0; @@ -1640,73 +1831,81 @@ int main(int argc, const char *argv[]) int fd; #endif - /* - * we make us a real daemon - */ -#ifdef _DEBUG - if ( !ldebug) -#endif - pid = fork(); - if ( pid < 0 ) /* error */ - { - perror("fork"); - exit( 3 ); - } - else if ( pid != 0 ) /* parent */ + if (!no_daemon) { - int status; - pid_t wpid; - /* - * must check for errors - * child died due to missing files aso - */ - sleep( 1 ); - wpid = waitpid( pid, &status, WNOHANG ); - if ( wpid != 0 ) + pid = fork(); + + if ( pid < 0 ) /* error */ { - exit( 1 ); + perror("fork"); + exit( 3 ); } - exit( 0 ); - } - /* child */ + else if ( pid != 0 ) /* parent */ + { + int status; + pid_t wpid; + /* + * must check for errors + * child died due to missing files aso + */ + sleep( 1 ); + wpid = waitpid( pid, &status, WNOHANG ); + if ( wpid != 0 ) + { + exit( 1 ); + } + exit( 0 ); + } + /* child */ #if 1 - /* Should be more portable, but not as well tested */ - setsid(); + /* Should be more portable, but not as well tested */ + setsid(); #else /* !1 */ #ifdef __FreeBSD__ - setpgrp(0,0); + setpgrp(0,0); #else /* ndef __FreeBSD__ */ - setpgrp(); + setpgrp(); #endif /* ndef __FreeBSD__ */ - fd = open("/dev/tty", O_RDONLY); - if ( fd ) - { - /* no error check here */ - ioctl( fd, TIOCNOTTY,0 ); - close ( fd ); - } -#endif /* !1 */ - /* should close stderr (fd 2) here too, but the test for existence - ** and load config file is done in listen_loop() and puts - ** some messages on stderr there. - */ -#ifdef _DEBUG - if ( !ldebug ) - { + fd = open("/dev/tty", O_RDONLY); + if ( fd ) + { + /* no error check here */ + ioctl( fd, TIOCNOTTY,0 ); + close ( fd ); + } +#endif /* 1 */ + /* FIXME: should close stderr (fd 2) here too, but the test + * for existence + * and load config file is done in listen_loop() and puts + * some messages on stderr there. + */ + close( 0 ); close( 1 ); - } -#else - close( 0 ); - close( 1 ); -#endif /* _DEBUG */ - chdir("/"); + chdir("/"); - writePidFile(); + } /* -END- if (!no_daemon) */ + + /* + * As soon as we have written the PID file, we can switch + * to the user and group ID indicated by the --user option + */ + write_pid_file(); + + if (NULL != pw) + { + if (((NULL != grp) && setgid(grp->gr_gid)) || (setgid(pw->pw_gid))) + { + log_error(LOG_LEVEL_FATAL, "Cannot setgid(): Insufficient permissions."); + } + if (setuid(pw->pw_uid)) + { + log_error(LOG_LEVEL_FATAL, "Cannot setuid(): Insufficient permissions."); + } + } } #endif /* defined unix */ - DBG(1, ("call listen_loop() \n") ); listen_loop(); /* NOTREACHED */ @@ -1715,6 +1914,78 @@ int main(int argc, const char *argv[]) } +/********************************************************************* + * + * Function : bind_port_helper + * + * Description : Bind the listen port. Handles logging, and aborts + * on failure. + * + * Parameters : + * 1 : config = Privoxy configuration. Specifies port + * to bind to. + * + * Returns : Port that was opened. + * + *********************************************************************/ +static jb_socket bind_port_helper(struct configuration_spec * config) +{ + int result; + jb_socket bfd; + + if ( (config->haddr != NULL) + && (config->haddr[0] == '1') + && (config->haddr[1] == '2') + && (config->haddr[2] == '7') + && (config->haddr[3] == '.') ) + { + log_error(LOG_LEVEL_INFO, "Listening on port %d for local connections only", + config->hport); + } + else if (config->haddr == NULL) + { + log_error(LOG_LEVEL_INFO, "Listening on port %d on all IP addresses", + config->hport); + } + else + { + log_error(LOG_LEVEL_INFO, "Listening on port %d on IP address %s", + config->hport, config->haddr); + } + + result = bind_port(config->haddr, config->hport, &bfd); + + if (result < 0) + { + switch(result) + { + case -3 : + log_error(LOG_LEVEL_FATAL, "can't bind to %s:%d: " + "There may be another Privoxy or some other " + "proxy running on port %d", + (NULL != config->haddr) ? config->haddr : "INADDR_ANY", + config->hport, config->hport); + + case -2 : + log_error(LOG_LEVEL_FATAL, "can't bind to %s:%d: " + "The hostname is not resolvable", + (NULL != config->haddr) ? config->haddr : "INADDR_ANY", config->hport); + + default : + log_error(LOG_LEVEL_FATAL, "can't bind to %s:%d: because %E", + (NULL != config->haddr) ? config->haddr : "INADDR_ANY", config->hport); + } + + /* shouldn't get here */ + return JB_INVALID_SOCKET; + } + + config->need_bind = 0; + + return bfd; +} + + /********************************************************************* * * Function : listen_loop @@ -1729,31 +2000,18 @@ int main(int argc, const char *argv[]) static void listen_loop(void) { struct client_state *csp = NULL; - int bfd; + jb_socket bfd; struct configuration_spec * config; config = load_config(); - log_error(LOG_LEVEL_CONNECT, "bind (%s, %d)", - 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->need_bind = 0; + bfd = bind_port_helper(config); - while (FOREVER) +#ifdef FEATURE_GRACEFUL_TERMINATION + while (!g_terminate) +#else + for (;;) +#endif { #if !defined(FEATURE_PTHREAD) && !defined(_WIN32) && !defined(__BEOS__) && !defined(AMIGA) && !defined(__OS2__) while (waitpid(-1, NULL, WNOHANG) > 0) @@ -1761,8 +2019,40 @@ static void listen_loop(void) /* zombie children */ } #endif /* !defined(FEATURE_PTHREAD) && !defined(_WIN32) && !defined(__BEOS__) && !defined(AMIGA) */ + + /* + * Free data that was used by died threads + */ sweep(); +#if defined(unix) + /* + * Re-open the errlog after HUP signal + */ + if (received_hup_signal) + { + init_error_log(Argv[0], config->logfile, config->debug); + received_hup_signal = 0; + } +#endif + +#ifdef __OS2__ +#ifdef FEATURE_COOKIE_JAR + /* + * Need a workaround here: we have to fclose() the jarfile, or we die because it's + * already open. I think unload_configfile() is not being run, which should do + * this work. Until that can get resolved, we'll use this workaround. + */ + if (csp) + if(csp->config) + if (csp->config->jar) + { + fclose(csp->config->jar); + csp->config->jar = NULL; + } +#endif /* FEATURE_COOKIE_JAR */ +#endif /* __OS2__ */ + if ( NULL == (csp = (struct client_state *) zalloc(sizeof(*csp))) ) { log_error(LOG_LEVEL_FATAL, "malloc(%d) for csp failed: %E", sizeof(*csp)); @@ -1770,7 +2060,7 @@ static void listen_loop(void) } csp->flags |= CSP_FLAG_ACTIVE; - csp->sfd = -1; + csp->sfd = JB_INVALID_SOCKET; csp->config = config = load_config(); @@ -1791,23 +2081,7 @@ static void listen_loop(void) close_socket(bfd); - log_error(LOG_LEVEL_CONNECT, "bind (%s, %d)", - 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->need_bind = 0; + bfd = bind_port_helper(config); } log_error(LOG_LEVEL_CONNECT, "accept connection ... "); @@ -1882,7 +2156,7 @@ static void listen_loop(void) #if defined(_WIN32) && !defined(_CYGWIN) && !defined(SELECTED_ONE_OPTION) #define SELECTED_ONE_OPTION child_id = _beginthread( - (void*)serve, + (void (*)(void *))serve, 64 * 1024, csp); #endif @@ -1890,7 +2164,7 @@ static void listen_loop(void) #if defined(__OS2__) && !defined(SELECTED_ONE_OPTION) #define SELECTED_ONE_OPTION child_id = _beginthread( - serve, + (void(* _Optlink)(void*))serve, NULL, 64 * 1024, csp); @@ -1920,7 +2194,7 @@ static void listen_loop(void) NP_Entry, (ULONG)server_thread, NP_Output, Output(), NP_CloseOutput, FALSE, - NP_Name, (ULONG)"junkbuster child", + NP_Name, (ULONG)"privoxy child", NP_StackSize, 200*1024, TAG_DONE))) { @@ -1968,7 +2242,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); @@ -1982,7 +2256,48 @@ static void listen_loop(void) serve(csp); } } - /* NOTREACHED */ + + /* NOTREACHED unless FEATURE_GRACEFUL_TERMINATION is defined */ + + /* Clean up. Aim: free all memory (no leaks) */ +#ifdef FEATURE_GRACEFUL_TERMINATION + + log_error(LOG_LEVEL_ERROR, "Graceful termination requested"); + + unload_current_config_file(); + unload_current_actions_file(); + unload_current_re_filterfile(); +#ifdef FEATURE_TRUST + unload_current_trust_file(); +#endif + + if (config->multi_threaded) + { + int i = 60; + do + { + sleep(1); + sweep(); + } while ((clients->next != NULL) && (--i > 0)); + + if (i <= 0) + { + log_error(LOG_LEVEL_ERROR, "Graceful termination failed - still some live clients after 1 minute wait."); + } + } + sweep(); + sweep(); + +#if defined(unix) + free(basedir); +#endif +#if defined(_WIN32) && !defined(_WIN_CONSOLE) + /* Cleanup - remove taskbar icon etc. */ + TermLogWindow(); +#endif + + exit(0); +#endif /* FEATURE_GRACEFUL_TERMINATION */ }