X-Git-Url: http://www.privoxy.org/gitweb/?p=privoxy.git;a=blobdiff_plain;f=jcc.c;h=c367919f4cee9ef500863ca618259b3ec4161581;hp=905cdcf3ec09430617765b8f0d33368cbf9a6ee2;hb=0c23a618d5329fde36809d32054664039aabbd7a;hpb=b6917ab0d64284748563147b9e2795840c323921 diff --git a/jcc.c b/jcc.c index 905cdcf3..c367919f 100644 --- a/jcc.c +++ b/jcc.c @@ -1,4 +1,4 @@ -const char jcc_rcs[] = "$Id: jcc.c,v 1.67 2002/03/04 18:18:57 oes Exp $"; +const char jcc_rcs[] = "$Id: jcc.c,v 1.75 2002/03/06 10:02:19 oes Exp $"; /********************************************************************* * * File : $Source: /cvsroot/ijbswa/current/jcc.c,v $ @@ -33,6 +33,35 @@ const char jcc_rcs[] = "$Id: jcc.c,v 1.67 2002/03/04 18:18:57 oes Exp $"; * * Revisions : * $Log: jcc.c,v $ + * 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 @@ -456,6 +485,10 @@ const char jcc_rcs[] = "$Id: jcc.c,v 1.67 2002/03/04 18:18:57 oes Exp $"; #include #endif /* sun */ +#ifdef unix +#include +#endif + # include # ifdef __BEOS__ @@ -555,7 +588,7 @@ static const char VANILLA_WAFER[] = * to be reopened by the main thread on HUP. * * Parameters : - * 1 : the_signal - the signal cause this function to call + * 1 : the_signal = the signal cause this function to call * * Returns : - * @@ -1508,7 +1541,7 @@ static int32 server_thread(void *data) void usage(const char *myname) { printf("JunkBuster proxy version " VERSION " (" HOME_PAGE_URL ")\n" - "Usage: %s [--help] [--version] [--no-daemon] [--pidfile pidfile] [configfile]\n" + "Usage: %s [--help] [--version] [--no-daemon] [--pidfile pidfile] [--user user] [configfile]\n" "Aborting.\n", myname); exit(2); @@ -1546,6 +1579,9 @@ int main(int argc, const char *argv[]) #endif { int argc_pos = 0; +#ifdef unix + struct passwd *pw = NULL; +#endif Argc = argc; Argv = argv; @@ -1580,16 +1616,26 @@ int main(int argc, const char *argv[]) { 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]); } -#endif /* !defined(_WIN32) || defined(_WIN_CONSOLE) */ - + else if (strcmp(argv[argc_pos], "--user" ) == 0) + { + if (++argc_pos == argc) usage(argv[0]); + pw = getpwnam(argv[argc_pos]); + + if (pw == NULL) + { + log_error(LOG_LEVEL_FATAL, "User %s not found.", argv[argc_pos]); + } + } +#endif /* defined(unix) */ else +#endif /* defined(_WIN32) && !defined(_WIN_CONSOLE) */ { configfile = argv[argc_pos]; } @@ -1601,15 +1647,13 @@ int main(int argc, const char *argv[]) { 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"); @@ -1619,7 +1663,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 */ @@ -1742,13 +1785,22 @@ int main(int argc, const char *argv[]) close( 1 ); chdir("/"); - write_pid_file(); - } /* -END- if (!no_daemon) */ + + /* + * As soon as we have written the PID file, we can switch + * to the user ID indicated by the --user option + */ + write_pid_file(); + + if ((NULL != pw) && 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 */ @@ -1759,25 +1811,41 @@ int main(int argc, const char *argv[]) /********************************************************************* * - * Function : listen_loop + * Function : bind_port_helper * - * Description : bind the listen port and enter a "FOREVER" listening loop. + * Description : Bind the listen port. Handles logging, and aborts + * on failure. * - * Parameters : N/A + * Parameters : + * 1 : config = Junkbuster configuration. Specifies port + * to bind to. * - * Returns : Never. + * Returns : Port that was opened. * *********************************************************************/ -static void listen_loop(void) +static int bind_port_helper(struct configuration_spec * config) { - struct client_state *csp = NULL; int bfd; - struct configuration_spec * config; - - config = load_config(); - log_error(LOG_LEVEL_CONNECT, "bind (%s, %d)", - config->haddr ? config->haddr : "INADDR_ANY", config->hport); + 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); + } bfd = bind_port(config->haddr, config->hport); @@ -1790,11 +1858,36 @@ static void listen_loop(void) config->hport, config->hport ); /* shouldn't get here */ - return; + return -1; } config->need_bind = 0; + return bfd; +} + + +/********************************************************************* + * + * Function : listen_loop + * + * Description : bind the listen port and enter a "FOREVER" listening loop. + * + * Parameters : N/A + * + * Returns : Never. + * + *********************************************************************/ +static void listen_loop(void) +{ + struct client_state *csp = NULL; + int bfd; + struct configuration_spec * config; + + config = load_config(); + + bfd = bind_port_helper(config); + while (FOREVER) { #if !defined(FEATURE_PTHREAD) && !defined(_WIN32) && !defined(__BEOS__) && !defined(AMIGA) && !defined(__OS2__) @@ -1809,6 +1902,7 @@ static void listen_loop(void) */ sweep(); +#if defined(unix) /* * Re-open the errlog after HUP signal */ @@ -1817,6 +1911,7 @@ static void listen_loop(void) init_error_log(Argv[0], config->logfile, config->debug); received_hup_signal = 0; } +#endif if ( NULL == (csp = (struct client_state *) zalloc(sizeof(*csp))) ) { @@ -1846,23 +1941,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 ... ");