X-Git-Url: http://www.privoxy.org/gitweb/?p=privoxy.git;a=blobdiff_plain;f=jcc.c;h=18ed76d8193f22263030e788ebf9165b5eca9193;hp=0dbbf8d99b685a51ed946fe4fc533fb0d2b1eead;hb=7c7592fae8bbc71e2b255289e5a1eebd752e4dfc;hpb=4fb6666adffa08140c83792106e25ac8f9008fb1 diff --git a/jcc.c b/jcc.c index 0dbbf8d9..5a05d086 100644 --- a/jcc.c +++ b/jcc.c @@ -1,19 +1,19 @@ -const char jcc_rcs[] = "$Id: jcc.c,v 1.13 2001/05/29 09:50:24 jongfoster Exp $"; +const char jcc_rcs[] = "$Id: jcc.c,v 1.173 2008/05/06 15:09:00 fabiankeil Exp $"; /********************************************************************* * * File : $Source: /cvsroot/ijbswa/current/jcc.c,v $ * - * Purpose : Main file. Contains main() method, main loop, and + * Purpose : Main file. Contains main() method, main loop, and * the main connection-handling function. * - * Copyright : Written by and Copyright (C) 2001 the SourceForge - * IJBSWA team. http://ijbswa.sourceforge.net + * Copyright : Written by and Copyright (C) 2001-2008 the SourceForge + * Privoxy team. http://www.privoxy.org/ * * Based on the Internet Junkbuster originally written - * by and Copyright (C) 1997 Anonymous Coders and + * by and Copyright (C) 1997 Anonymous Coders and * Junkbusters Corporation. http://www.junkbusters.com * - * This program is free software; you can redistribute it + * This program is free software; you can redistribute it * and/or modify it under the terms of the GNU General * Public License as published by the Free Software * Foundation; either version 2 of the License, or (at @@ -33,6 +33,827 @@ const char jcc_rcs[] = "$Id: jcc.c,v 1.13 2001/05/29 09:50:24 jongfoster Exp $"; * * Revisions : * $Log: jcc.c,v $ + * Revision 1.173 2008/05/06 15:09:00 fabiankeil + * Least-effort fix for bug #1821930 (reported by Lee): + * If the response doesn't look like HTTP, + * tell the client and log the problem. + * + * Revision 1.172 2008/04/16 16:38:21 fabiankeil + * Don't pass the whole csp structure to flush_socket() + * when it only needs a file descriptor and a buffer. + * + * Revision 1.171 2008/03/27 18:27:25 fabiankeil + * Remove kill-popups action. + * + * Revision 1.170 2008/03/06 16:33:46 fabiankeil + * If limit-connect isn't used, don't limit CONNECT requests to port 443. + * + * Revision 1.169 2008/03/04 18:30:39 fabiankeil + * Remove the treat-forbidden-connects-like-blocks action. We now + * use the "blocked" page for forbidden CONNECT requests by default. + * + * Revision 1.168 2008/03/02 12:25:25 fabiankeil + * Also use shiny new connect_port_is_forbidden() in jcc.c. + * + * Revision 1.167 2008/02/23 16:57:12 fabiankeil + * Rename url_actions() to get_url_actions() and let it + * use the standard parameter ordering. + * + * Revision 1.166 2008/02/23 16:33:43 fabiankeil + * Let forward_url() use the standard parameter ordering + * and mark its second parameter immutable. + * + * Revision 1.165 2008/02/02 19:36:56 fabiankeil + * Remove the "Listening ... for local connections only" log message. + * Whether or not remote connections are able to reach Privoxy is up + * to the operating system. + * + * Revision 1.164 2007/12/16 18:32:46 fabiankeil + * Prevent the log messages for CONNECT requests to unacceptable + * ports from printing the limit-connect argument as [null] if + * limit-connect hasn't been explicitly enabled. + * + * Revision 1.163 2007/12/13 01:47:11 david__schmidt + * Make sure all console-mode apps get a usage() instance + * + * Revision 1.162 2007/12/06 17:54:57 fabiankeil + * Reword NO_SERVER_DATA_RESPONSE to make it harder + * to misunderstand what the message is all about. + * + * Revision 1.161 2007/12/04 19:44:22 fabiankeil + * Unbreak trustfile which previously didn't work without + * FEATURE_TOGGLE. Fixes BR#1843585, reported by Lee. + * + * Revision 1.160 2007/11/29 18:00:29 fabiankeil + * Plug memory leak. Spotted by Valgrind, triggered by + * Privoxy-Regression-Test feeding proxyfuzz.py. + * + * Revision 1.159 2007/11/24 14:34:09 fabiankeil + * In the HTTP snipplets, refer to the client as client. + * + * Revision 1.158 2007/11/11 16:44:17 fabiankeil + * Emit a log message when activating the MS IIS5 hack. + * + * Revision 1.157 2007/11/03 17:34:49 fabiankeil + * Log the "weak randomization factor" warning only + * once for mingw32 and provide some more details. + * + * Revision 1.156 2007/11/01 18:20:58 fabiankeil + * Initialize log module after initializing mutexes, future + * deadlocks in that code should now work cross-platform. + * + * Revision 1.155 2007/10/23 20:12:45 fabiankeil + * Fix first CSUCCEED line to end in \r\n as required by RFC1945. + * Reported by Bert van Leeuwen in BR#1818808. + * + * Revision 1.154 2007/10/19 17:00:08 fabiankeil + * Downgrade "Flushing header and buffers" message to LOG_LEVEL_INFO. + * + * Revision 1.153 2007/10/14 14:12:41 fabiankeil + * When in daemon mode, close stderr after the configuration file has been + * parsed the first time. If logfile isn't set, stop logging. Fixes BR#897436. + * + * Revision 1.152 2007/10/04 18:03:34 fabiankeil + * - Fix a crash when parsing invalid requests whose first header + * is rejected by get_header(). Regression (re?)introduced + * in r1.143 by yours truly. + * - Move ACTION_VANILLA_WAFER handling into parsers.c's + * client_cookie_adder() to make sure send-vanilla-wafer can be + * controlled through tags (and thus regression-tested). + * + * Revision 1.151 2007/09/29 10:21:16 fabiankeil + * - Move get_filter_function() from jcc.c to filters.c + * so the filter functions can be static. + * - Don't bother filtering body-less responses. + * + * Revision 1.150 2007/09/28 16:39:29 fabiankeil + * Execute content filters through execute_content_filter(). + * + * Revision 1.149 2007/09/04 15:08:48 fabiankeil + * Initialize req to NULL to make sure it's defined if the + * first read_socket() call fails. Reported by icmp30. + * + * Revision 1.148 2007/08/26 16:47:13 fabiankeil + * Add Stephen Gildea's --pre-chroot-nslookup patch [#1276666], + * extensive comments moved to user manual. + * + * Revision 1.147 2007/08/25 14:42:40 fabiankeil + * Don't crash if a broken header filter wiped out the request line. + * + * Revision 1.146 2007/08/20 17:09:32 fabiankeil + * Fix byte_count calculation in case of flushes + * and don't parse the server headers a second time. + * + * Revision 1.145 2007/08/19 13:13:31 fabiankeil + * - If there's a connection problem after we already forwarded + * parts of the original content, just hang up. Fixes BR#1776724. + * - Fix warnings about unused code on mingw32. + * - In case of flushes, calculate the byte count + * less incorrectly (I think). + * + * Revision 1.144 2007/08/11 14:43:22 fabiankeil + * Add some more prototypes for static functions. + * + * Revision 1.143 2007/08/05 13:58:19 fabiankeil + * Comment out request_contains_null_bytes() until it's used again. + * + * Revision 1.142 2007/08/05 13:50:26 fabiankeil + * #1763173 from Stefan Huehner: s@const static@static const@ + * and declare some more functions static. + * + * Revision 1.141 2007/08/04 09:56:23 fabiankeil + * - Log rejected CONNECT requests with LOG_LEVEL_INFO + * and explain why they were rejected in the first place. + * - Fix the LOG_LEVEL_CLF message for crunches of unallowed + * CONNECT requests. The request line was missing. + * - Add two more XXX reminders as we don't have enough already. + * + * Revision 1.140 2007/07/21 11:51:36 fabiankeil + * As Hal noticed, checking dispatch_cgi() as the last cruncher + * looks like a bug if CGI requests are blocked unintentionally, + * so don't do it unless the user enabled the new config option + * "allow-cgi-request-crunching". + * + * Revision 1.139 2007/07/14 07:46:41 fabiankeil + * - Allow to rewrite the request destination behind the client's back. + * - Turn the weird-looking unconditional for loop that + * reads the client request into a conditional while loop. + * Move the stuff that only runs once out of the loop. + * - Move parts of chat(), server_content_type() and the + * necessary stuff to fix BR#1750917 into get_filter_function(). + * + * Revision 1.138 2007/06/03 18:45:18 fabiankeil + * Temporary workaround for BR#1730105. + * + * Revision 1.137 2007/06/01 18:16:36 fabiankeil + * Use the same mutex for gethostbyname() and gethostbyaddr() to prevent + * deadlocks and crashes on OpenBSD and possibly other OS with neither + * gethostbyname_r() nor gethostaddr_r(). Closes BR#1729174. + * Thanks to Ralf Horstmann for report and solution. + * + * Revision 1.136 2007/06/01 16:41:11 fabiankeil + * Add forward-override{} to change the forwarding settings through + * action sections. This is mainly interesting to forward different + * clients differently (for example based on User-Agent or request + * origin). + * + * Revision 1.135 2007/05/24 17:03:50 fabiankeil + * - Let usage() mention the --chroot parameter. + * - Use read_socket() consistently and always leave + * the last buffer byte alone, even in cases where + * null termination (currently) doesn't matter. + * + * Revision 1.134 2007/05/16 14:59:46 fabiankeil + * - Fix config file loading on Unix if no config file is specified. + * Since r1.97 Privoxy would always interpret the last argument as + * config file, even if it's a valid command line option. + * - Abort in case of unrecognized command line options. Closes #1719696. + * - Remove a bunch of unnecessary strcpy() calls (yay for c&p without thinking). + * - Replace the remaining strcpy() and strcat() calls with strlcpy() and strcat(). + * + * Revision 1.133 2007/05/04 11:23:19 fabiankeil + * - Don't rerun crunchers that only depend on the request URL. + * - Don't count redirects and CGI requests as "blocked requests". + * + * Revision 1.132 2007/04/25 15:15:17 fabiankeil + * Support crunching based on tags created by server-header taggers. + * + * Revision 1.131 2007/04/22 13:24:50 fabiankeil + * Make HTTP snippets static (again). Add a Content-Type for those + * with content so the browser doesn't guess it based on the URL. + * + * Revision 1.130 2007/04/19 13:47:34 fabiankeil + * Move crunching and request line rebuilding out of chat(). + * + * Revision 1.129 2007/04/15 16:39:20 fabiankeil + * Introduce tags as alternative way to specify which + * actions apply to a request. At the moment tags can be + * created based on client and server headers. + * + * Revision 1.128 2007/03/25 16:55:54 fabiankeil + * Don't CLF-log CONNECT requests twice. + * + * Revision 1.127 2007/03/20 13:53:17 fabiankeil + * Log the source address for ACL-related connection drops. + * + * Revision 1.126 2007/03/17 15:20:05 fabiankeil + * New config option: enforce-blocks. + * + * Revision 1.125 2007/03/09 14:12:00 fabiankeil + * - Move null byte check into separate function. + * - Don't confuse the client with error pages + * if a CONNECT request was already confirmed. + * + * Revision 1.124 2007/02/23 14:59:54 fabiankeil + * Speed up NULL byte escaping and only log the complete + * NULL byte requests with header debugging enabled. + * + * Revision 1.123 2007/02/21 18:42:10 fabiankeil + * Answer requests that contain NULL bytes with + * a custom response instead of waiting for more + * data until the client eventually hangs up. + * + * Revision 1.122 2007/02/07 11:12:02 fabiankeil + * - Move delivery and logging of crunched responses + * from chat() into send_crunch_response(). + * - Display the reason for generating http_responses. + * - Log the content length for LOG_LEVEL_CLF correctly + * (still incorrect for some fixed responses). + * - Reword an incorrect comment about + * treat-forbidden-connects-like-blocks violating + * the specs. + * - Add some log messages. + * + * Revision 1.121 2007/01/27 10:52:56 fabiankeil + * Move mutex initialization into separate + * function and exit in case of errors. + * + * Revision 1.120 2007/01/26 14:18:42 fabiankeil + * - Start to reduce chat()'s line count and move + * parts of it into separate functions. + * - Add "HTTP/1.1 100 Continue" hack for BR 756734. + * + * Revision 1.119 2007/01/25 14:02:30 fabiankeil + * - Add Proxy-Agent header to HTTP snippets that are + * supposed to reach HTTP clients only. + * - Made a few CONNECT log messages more descriptive. + * - Catch completely empty server responses (as seen + * with Tor's fake ".noconnect" top level domain). + * - Use shiny new "forwarding-failed" template for socks errors. + * + * Revision 1.118 2007/01/07 07:43:43 joergs + * AmigaOS4 support added. + * + * Revision 1.117 2006/12/31 17:56:37 fabiankeil + * Added config option accept-intercepted-requests + * and disabled it by default. + * + * Revision 1.116 2006/12/29 19:08:22 fabiankeil + * Reverted parts of my last commit + * to keep error handling working. + * + * Revision 1.115 2006/12/29 17:38:57 fabiankeil + * Fixed gcc43 conversion warnings. + * + * Revision 1.114 2006/12/27 18:52:02 fabiankeil + * Fix -pedantic ISO C warning about converting + * from function pointer to object pointer. + * + * Revision 1.113 2006/12/26 17:38:50 fabiankeil + * Silence compiler warning I introduced with my last commit. + * + * Revision 1.112 2006/12/26 17:31:41 fabiankeil + * Mutex protect rand() if POSIX threading + * is used, warn the user if that's not possible + * and stop using it on _WIN32 where it could + * cause crashes. + * + * Revision 1.111 2006/12/23 16:15:06 fabiankeil + * Don't prevent core dumps by catching SIGABRT. + * It's rude and makes debugging unreasonable painful. + * + * Revision 1.110 2006/12/13 14:52:53 etresoft + * Fix build failure on MacOS X. Global symbols can be either static or extern, but not both. + * + * Revision 1.109 2006/12/06 19:41:40 fabiankeil + * Privoxy is now able to run as intercepting + * proxy in combination with any packet filter + * that does the port redirection. The destination + * is extracted from the "Host:" header which + * should be available for nearly all requests. + * + * Moved HTTP snipplets into jcc.c. + * Added error message for gopher proxy requests. + * + * Revision 1.108 2006/11/28 15:38:51 fabiankeil + * Only unlink the pidfile if it's actually used. + * + * Change order of interception checks to make + * it possible to block or redirect requests for + * the cgi pages. + * + * Revision 1.107 2006/11/13 19:05:51 fabiankeil + * Make pthread mutex locking more generic. Instead of + * checking for OSX and OpenBSD, check for FEATURE_PTHREAD + * and use mutex locking unless there is an _r function + * available. Better safe than sorry. + * + * Fixes "./configure --disable-pthread" and should result + * in less threading-related problems on pthread-using platforms, + * but it still doesn't fix BR#1122404. + * + * Revision 1.106 2006/11/06 19:58:23 fabiankeil + * Move pthread.h inclusion from jcc.c to jcc.h. + * Fixes build on x86-freebsd1 (FreeBSD 5.4-RELEASE). + * + * Revision 1.105 2006/11/06 14:26:02 fabiankeil + * Don't exit after receiving the second SIGHUP on Solaris. + * + * Fixes BR 1052235, but the same problem may exist on other + * systems. Once 3.0.6 is out we should use sigset() + * where available and see if it breaks anything. + * + * Revision 1.104 2006/09/23 13:26:38 roro + * Replace TABs by spaces in source code. + * + * Revision 1.103 2006/09/21 12:54:43 fabiankeil + * Fix +redirect{}. Didn't work with -fast-redirects. + * + * Revision 1.102 2006/09/06 13:03:04 fabiankeil + * Respond with 400 and a short text message + * if the client tries to use Privoxy as FTP proxy. + * + * Revision 1.101 2006/09/06 09:23:37 fabiankeil + * Make number of retries in case of forwarded-connect problems + * a config file option (forwarded-connect-retries) and use 0 as + * default. + * + * Revision 1.100 2006/09/03 19:42:59 fabiankeil + * Set random(3) seed. + * + * Revision 1.99 2006/09/02 15:36:42 fabiankeil + * Follow the OpenBSD port's lead and protect the resolve + * functions on OpenBSD as well. + * + * Revision 1.98 2006/08/24 11:01:34 fabiankeil + * --user fix. Only use the user as group if no group is specified. + * Solves BR 1492612. Thanks to Spinor S. and David Laight. + * + * Revision 1.97 2006/08/18 15:23:17 david__schmidt + * Windows service (re-)integration + * + * The new args are: + * + * --install[:service_name] + * --uninstall[:service_name] + * --service + * + * They work as follows: + * --install will create a service for you and then terminate. + * By default the service name will be "privoxy" (without the quotes). + * However you can run multiple services if you wish, just by adding + * a colon and then a name (no spaces). + * + * --uninstall follows the exact same rules a --install. + * + * --service is used when the program is executed by the service + * control manager, and in normal circumstances would never be + * used as a command line argument. + * + * Revision 1.96 2006/08/15 20:12:36 david__schmidt + * Windows service integration + * + * Revision 1.95 2006/08/03 02:46:41 david__schmidt + * Incorporate Fabian Keil's patch work: +http://www.fabiankeil.de/sourcecode/privoxy/ + * + * Revision 1.94 2006/07/18 14:48:46 david__schmidt + * Reorganizing the repository: swapping out what was HEAD (the old 3.1 branch) + * with what was really the latest development (the v_3_0_branch branch) + * + * 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 + * + * 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 + * + * Revision 1.64 2002/03/03 09:18:03 joergs + * Made jumbjuster work on AmigaOS again. + * + * Revision 1.63 2002/03/02 04:14:50 david__schmidt + * Clean up a little CRLF unpleasantness that suddenly appeared + * + * Revision 1.62 2002/02/20 23:17:23 jongfoster + * Detecting some out-of memory conditions and exiting with a log message. + * + * Revision 1.61 2002/01/17 21:01:52 jongfoster + * Moving all our URL and URL pattern parsing code to urlmatch.c. + * + * Revision 1.60 2001/12/30 14:07:32 steudten + * - Add signal handling (unix) + * - Add SIGHUP handler (unix) + * - Add creation of pidfile (unix) + * - Add action 'top' in rc file (RH) + * - Add entry 'SIGNALS' to manpage + * - Add exit message to logfile (unix) + * + * Revision 1.59 2001/12/13 14:07:18 oes + * Fixed Bug: 503 error page now sent OK + * + * Revision 1.58 2001/11/30 23:37:24 jongfoster + * Renaming the Win32 config file to config.txt - this is almost the + * same as the corresponding UNIX name "config" + * + * Revision 1.57 2001/11/16 00:47:43 jongfoster + * Changing the tty-disconnection code to use setsid(). + * + * Revision 1.56 2001/11/13 20:20:54 jongfoster + * Tabs->spaces, fixing a bug with missing {} around an if() + * + * Revision 1.55 2001/11/13 20:14:53 jongfoster + * Patch for FreeBSD setpgrp() as suggested by Alexander Lazic + * + * Revision 1.54 2001/11/07 00:03:14 steudten + * Give reliable return value if an error + * occurs not just 0 with new daemon mode. + * + * Revision 1.53 2001/11/05 21:41:43 steudten + * Add changes to be a real daemon just for unix os. + * (change cwd to /, detach from controlling tty, set + * process group and session leader to the own process. + * Add DBG() Macro. + * Add some fatal-error log message for failed malloc(). + * Add '-d' if compiled with 'configure --with-debug' to + * enable debug output. + * + * Revision 1.52 2001/10/26 20:11:20 jongfoster + * Fixing type mismatch + * + * Revision 1.51 2001/10/26 17:38:28 oes + * Cosmetics + * + * Revision 1.50 2001/10/25 03:40:48 david__schmidt + * Change in porting tactics: OS/2's EMX porting layer doesn't allow multiple + * threads to call select() simultaneously. So, it's time to do a real, live, + * native OS/2 port. See defines for __EMX__ (the porting layer) vs. __OS2__ + * (native). Both versions will work, but using __OS2__ offers multi-threading. + * + * Revision 1.49 2001/10/23 21:41:35 jongfoster + * Added call to initialize the (statically-allocated of course) + * "out of memory" CGI response. + * + * Revision 1.48 2001/10/10 19:56:46 jongfoster + * Moving some code that wasn't cookie-related out of an #ifdef + * FEATURE_COOKIE_JAR + * + * Revision 1.47 2001/10/10 16:44:36 oes + * Added CONNECT destination port limitation check + * + * Revision 1.46 2001/10/08 15:17:41 oes + * Re-enabled SSL forwarding + * + * Revision 1.45 2001/10/07 15:42:11 oes + * Replaced 6 boolean members of csp with one bitmap (csp->flags) + * + * Moved downgrading of the HTTP version from parse_http_request to + * chat(), since we can't decide if it is necessary before we have + * determined the actions for the URL. The HTTP command is now + * *always* re-built so the repairs need no longer be special-cased. + * + * filter_popups now gets a csp pointer so it can raise the new + * CSP_FLAG_MODIFIED flag. + * + * Bugfix + * + * Added configurable size limit for the IOB. If the IOB grows so + * large that the next read would exceed the limit, the header + * is generated, and the header & unfiltered buffer are flushed + * to the client. Chat then continues in non-buffering, + * non-filtering body mode. + * + * Revision 1.44 2001/10/02 18:13:57 oes + * Ooops + * + * Revision 1.43 2001/10/02 15:32:13 oes + * Moved generation of hdr + * + * Revision 1.42 2001/09/21 23:02:02 david__schmidt + * Cleaning up 2 compiler warnings on OS/2. + * + * Revision 1.41 2001/09/16 17:05:14 jongfoster + * Removing unused #include showarg.h + * + * Revision 1.40 2001/09/16 15:41:45 jongfoster + * Fixing signed/unsigned comparison warning. + * + * Revision 1.39 2001/09/16 13:21:27 jongfoster + * Changes to use new list functions. + * + * Revision 1.38 2001/09/16 13:01:46 jongfoster + * Removing redundant function call that zeroed zalloc()'d memory. + * + * Revision 1.37 2001/09/10 11:12:24 oes + * Deleted unused variable + * + * Revision 1.36 2001/09/10 10:56:15 oes + * Silenced compiler warnings + * + * Revision 1.35 2001/07/31 14:44:22 oes + * Deleted unused size parameter from filter_popups() + * + * Revision 1.34 2001/07/30 22:08:36 jongfoster + * Tidying up #defines: + * - All feature #defines are now of the form FEATURE_xxx + * - Permanently turned off WIN_GUI_EDIT + * - Permanently turned on WEBDAV and SPLIT_PROXY_ARGS + * + * Revision 1.33 2001/07/29 19:32:00 jongfoster + * Renaming _main() [mingw32 only] to real_main(), for ANSI compliance. + * + * Revision 1.32 2001/07/29 18:47:05 jongfoster + * Adding missing #include "loadcfg.h" + * + * Revision 1.31 2001/07/29 12:17:48 oes + * Applied pthread fix by Paul Lieverse + * + * Revision 1.30 2001/07/25 22:57:13 jongfoster + * __BEOS__ no longer overrides FEATURE_PTHREAD. + * This is because FEATURE_PTHREAD will soon be widely used, so I + * want to keep it simple. + * + * Revision 1.29 2001/07/24 12:47:06 oes + * Applied BeOS support update by Eugenia + * + * Revision 1.28 2001/07/23 13:26:12 oes + * Fixed bug in popup-killing for the first read that caused binary garbage to be sent between headers and body + * + * Revision 1.27 2001/07/19 19:09:47 haroon + * - Added code to take care of the situation where while processing the first + * server response (which includes the server header), after finding the end + * of the headers we were not looking past the end of the headers for + * content modification. I enabled it for filter_popups. + * Someone else should look to see if other similar operations should be + * done to the discarded portion of the buffer. + * + * Note 2001/07/20: No, the other content modification mechanisms will process + * the whole iob later anyway. --oes + * + * Revision 1.26 2001/07/18 12:31:36 oes + * cosmetics + * + * Revision 1.25 2001/07/15 19:43:49 jongfoster + * Supports POSIX threads. + * Also removed some unused #includes. + * + * Revision 1.24 2001/07/13 14:00:40 oes + * - Generic content modification scheme: + * Each feature has its own applicability flag that is set + * from csp->action->flags. + * Replaced the "filtering" int flag , by a function pointer + * "content_filter" to the function that will do the content + * modification. If it is != NULL, the document will be buffered + * and processed through *content_filter, which must set + * csp->content_length and return a modified copy of the body + * or return NULL (on failiure). + * - Changed csp->is_text to the more generic bitmap csp->content_type + * which can currently take the valued CT_TEXT or CT_GIF + * - Reformatting etc + * - Removed all #ifdef PCRS + * + * Revision 1.23 2001/07/02 02:28:25 iwanttokeepanon + * Added "#ifdef ACL_FILES" conditional compilation to line 1291 to exclude + * the `block_acl' call. This prevents a compilation error when the user + * does not wish to use the "ACL" feature. + * + * Revision 1.22 2001/06/29 21:45:41 oes + * Indentation, CRLF->LF, Tab-> Space + * + * Revision 1.21 2001/06/29 13:29:36 oes + * - Cleaned up, improved comments + * - Unified all possible interceptors (CGI, + * block, trust, fast_redirect) in one + * place, with one (CGI) answer generation + * mechansim. Much clearer now. + * - Removed the GIF image generation, which + * is now done in filters.c:block_url() + * - Made error conditions like domain lookup + * failiure or (various) problems while talking + * to the server use cgi.c:error_response() + * instead of generating HTML/HTTP in chat() (yuck!) + * - Removed logentry from cancelled commit + * + * Revision 1.20 2001/06/09 10:55:28 jongfoster + * Changing BUFSIZ ==> BUFFER_SIZE + * + * Revision 1.19 2001/06/07 23:12:52 jongfoster + * Replacing function pointer in struct gateway with a directly + * called function forwarded_connect(). + * Replacing struct gateway with struct forward_spec + * + * Revision 1.18 2001/06/03 19:12:16 oes + * introduced new cgi handling + * + * Revision 1.17 2001/06/01 20:07:23 jongfoster + * Now uses action +image-blocker{} rather than config->tinygif + * + * Revision 1.16 2001/06/01 18:49:17 jongfoster + * Replaced "list_share" with "list" - the tiny memory gain was not + * worth the extra complexity. + * + * Revision 1.15 2001/05/31 21:24:47 jongfoster + * Changed "permission" to "action" throughout. + * Removed DEFAULT_USER_AGENT - it must now be specified manually. + * Moved vanilla wafer check into chat(), since we must now + * decide whether or not to add it based on the URL. + * + * Revision 1.14 2001/05/29 20:14:01 joergs + * AmigaOS bugfix: PCRS needs a lot of stack, stacksize for child threads + * increased. + * * Revision 1.13 2001/05/29 09:50:24 jongfoster * Unified blocklist/imagelist/permissionslist. * File format is still under discussion, but the internal changes @@ -174,28 +995,42 @@ const char jcc_rcs[] = "$Id: jcc.c,v 1.13 2001/05/29 09:50:24 jongfoster Exp $"; #include #include #include +#include #ifdef _WIN32 - -# include -# include -# include -# include -# ifdef TOGGLE -# include -# endif /* def TOGGLE */ +# ifndef FEATURE_PTHREAD +# ifndef STRICT +# define STRICT +# endif +# include +# include +# endif /* ndef FEATURE_PTHREAD */ # include "win32.h" # ifndef _WIN_CONSOLE # include "w32log.h" # endif /* ndef _WIN_CONSOLE */ +# include "w32svrapi.h" #else /* ifndef _WIN32 */ +# if !defined (__OS2__) # include -# include # include +# endif /* ndef __OS2__ */ +# include # include +# include + +#ifdef sun +#include +#endif /* sun */ + +#ifdef unix +#include +#include +#endif + # include # ifdef __BEOS__ @@ -203,6 +1038,15 @@ const char jcc_rcs[] = "$Id: jcc.c,v 1.13 2001/05/29 09:50:24 jongfoster Exp $"; # include /* declarations for threads and stuff. */ # endif +# if defined(__EMX__) || defined(__OS2__) +# include /* OS/2/EMX needs a little help with select */ +# endif +# ifdef __OS2__ +#define INCL_DOS +# include +#define bzero(B,N) memset(B,0x00,n) +# endif + # ifndef FD_ZERO # include # endif @@ -210,33 +1054,58 @@ const char jcc_rcs[] = "$Id: jcc.c,v 1.13 2001/05/29 09:50:24 jongfoster Exp $"; #endif #include "project.h" +#include "list.h" #include "jcc.h" #include "filters.h" #include "loaders.h" -#include "showargs.h" #include "parsers.h" -#include "killpopup.h" #include "miscutil.h" #include "errlog.h" #include "jbsockets.h" #include "gateway.h" +#include "actions.h" +#include "cgi.h" +#include "loadcfg.h" +#include "urlmatch.h" const char jcc_h_rcs[] = JCC_H_VERSION; const char project_h_rcs[] = PROJECT_H_VERSION; -const char DEFAULT_USER_AGENT[] ="User-Agent: Mozilla (X11; I; Linux 2.0.32 i586)"; - +int no_daemon = 0; struct client_state clients[1]; struct file_list files[1]; -#ifdef STATISTICS +#ifdef FEATURE_STATISTICS int urls_read = 0; /* total nr of urls read inc rejected */ int urls_rejected = 0; /* total nr of urls rejected */ -#endif /* def STATISTICS */ +#endif /* def FEATURE_STATISTICS */ +#ifdef FEATURE_GRACEFUL_TERMINATION +int g_terminate = 0; +#endif -static void listen_loop(void); +#if !defined(_WIN32) && !defined(__OS2__) && !defined(AMIGA) +static void sig_handler(int the_signal); +#endif +static int client_protocol_is_unsupported(const struct client_state *csp, char *req); +static jb_err get_request_destination_elsewhere(struct client_state *csp, struct list *headers); +static jb_err get_server_headers(struct client_state *csp); +static const char *crunch_reason(const struct http_response *rsp); +static void send_crunch_response(struct client_state *csp, struct http_response *rsp); +/* + * static int request_contains_null_bytes(const struct client_state *csp, char *buf, int len); + */ +static void build_request_line(struct client_state *csp, const struct forward_spec *fwd, char **request_line); +static jb_err change_request_destination(struct client_state *csp); static void chat(struct client_state *csp); +static void serve(struct client_state *csp); +#if !defined(_WIN32) || defined(_WIN_CONSOLE) +static void usage(const char *myname); +#endif +static void initialize_mutexes(void); +static jb_socket bind_port_helper(struct configuration_spec *config); +static void listen_loop(void); + #ifdef AMIGA void serve(struct client_state *csp); #else /* ifndef AMIGA */ @@ -251,877 +1120,2349 @@ static int32 server_thread(void *data); #define sleep(N) Sleep(((N) * 1000)) #endif +#ifdef __OS2__ +#define sleep(N) DosSleep(((N) * 100)) +#endif + +#ifdef FEATURE_PTHREAD +pthread_mutex_t log_mutex; +pthread_mutex_t log_init_mutex; + +#if !defined(HAVE_GETHOSTBYADDR_R) || !defined(HAVE_GETHOSTBYNAME_R) +pthread_mutex_t resolver_mutex; +#endif /* !defined(HAVE_GETHOSTBYADDR_R) || !defined(HAVE_GETHOSTBYNAME_R) */ + +#ifndef HAVE_GMTIME_R +pthread_mutex_t gmtime_mutex; +#endif /* ndef HAVE_GMTIME_R */ + +#ifndef HAVE_LOCALTIME_R +pthread_mutex_t localtime_mutex; +#endif /* ndef HAVE_GMTIME_R */ + +#ifndef HAVE_RANDOM +pthread_mutex_t rand_mutex; +#endif /* ndef HAVE_RANDOM */ + +#endif /* FEATURE_PTHREAD */ + +#if defined(unix) || defined(__EMX__) +const char *basedir = NULL; +const char *pidfile = NULL; +int received_hup_signal = 0; +#endif /* defined unix */ + +/* HTTP snipplets. */ +static const char CSUCCEED[] = + "HTTP/1.0 200 Connection established\r\n" + "Proxy-Agent: Privoxy/" VERSION "\r\n\r\n"; + +static const char CHEADER[] = + "HTTP/1.0 400 Invalid header received from client\r\n" + "Proxy-Agent: Privoxy " VERSION "\r\n" + "Content-Type: text/plain\r\n" + "Connection: close\r\n\r\n" + "Invalid header received from client.\r\n"; + +static const char FTP_RESPONSE[] = + "HTTP/1.0 400 Invalid request received from client\r\n" + "Content-Type: text/plain\r\n" + "Connection: close\r\n\r\n" + "Invalid request. Privoxy doesn't support FTP.\r\n"; + +static const char GOPHER_RESPONSE[] = + "HTTP/1.0 400 Invalid request received from client\r\n" + "Content-Type: text/plain\r\n" + "Connection: close\r\n\r\n" + "Invalid request. Privoxy doesn't support gopher.\r\n"; + +/* XXX: should be a template */ +static const char MISSING_DESTINATION_RESPONSE[] = + "HTTP/1.0 400 Bad request received from client\r\n" + "Proxy-Agent: Privoxy " VERSION "\r\n" + "Content-Type: text/plain\r\n" + "Connection: close\r\n\r\n" + "Bad request. Privoxy was unable to extract the destination.\r\n"; + +/* XXX: should be a template */ +static const char NO_SERVER_DATA_RESPONSE[] = + "HTTP/1.0 502 Server or forwarder response empty\r\n" + "Proxy-Agent: Privoxy " VERSION "\r\n" + "Content-Type: text/plain\r\n" + "Connection: close\r\n\r\n" + "Empty server or forwarder response.\r\n" + "The connection has been closed but Privoxy didn't receive any data.\r\n"; + +/* XXX: should be a template */ +static const char INVALID_SERVER_HEADERS_RESPONSE[] = + "HTTP/1.0 502 Server or forwarder response invalid\r\n" + "Proxy-Agent: Privoxy " VERSION "\r\n" + "Content-Type: text/plain\r\n" + "Connection: close\r\n\r\n" + "Bad response. The server or forwarder response doesn't look like HTTP.\r\n"; + +#if 0 +/* XXX: should be a template */ +static const char NULL_BYTE_RESPONSE[] = + "HTTP/1.0 400 Bad request received from client\r\n" + "Proxy-Agent: Privoxy " VERSION "\r\n" + "Content-Type: text/plain\r\n" + "Connection: close\r\n\r\n" + "Bad request. Null byte(s) before end of request.\r\n"; +#endif +/* XXX: should be a template */ +static const char MESSED_UP_REQUEST_RESPONSE[] = + "HTTP/1.0 400 Malformed request after rewriting\r\n" + "Proxy-Agent: Privoxy " VERSION "\r\n" + "Content-Type: text/plain\r\n" + "Connection: close\r\n\r\n" + "Bad request. Messed up with header filters.\r\n"; + +/* A function to crunch a response */ +typedef struct http_response *(*crunch_func_ptr)(struct client_state *); + +/* Crunch function flags */ +#define CF_NO_FLAGS 0 +/* Cruncher applies to forced requests as well */ +#define CF_IGNORE_FORCE 1 +/* Crunched requests are counted for the block statistics */ +#define CF_COUNT_AS_REJECT 2 + +/* A crunch function and its flags */ +struct cruncher +{ + const crunch_func_ptr cruncher; + const int flags; +}; + +static int crunch_response_triggered(struct client_state *csp, const struct cruncher crunchers[]); + +/* Complete list of cruncher functions */ +static const struct cruncher crunchers_all[] = { + { direct_response, CF_COUNT_AS_REJECT|CF_IGNORE_FORCE}, + { block_url, CF_COUNT_AS_REJECT }, +#ifdef FEATURE_TRUST + { trust_url, CF_COUNT_AS_REJECT }, +#endif /* def FEATURE_TRUST */ + { redirect_url, CF_NO_FLAGS }, + { dispatch_cgi, CF_IGNORE_FORCE}, + { NULL, 0 } +}; + +/* Light version, used after tags are applied */ +static const struct cruncher crunchers_light[] = { + { block_url, CF_COUNT_AS_REJECT }, + { redirect_url, CF_NO_FLAGS }, + { NULL, 0 } +}; + + +#if !defined(_WIN32) && !defined(__OS2__) && !defined(AMIGA) /********************************************************************* * - * Function : chat + * Function : sig_handler * - * Description : Once a connection to the client has been accepted, - * this function is called (via serve()) to handle the - * main business of the communication. When this - * function returns, the caller must close the client - * socket handle. + * Description : Signal handler for different signals. + * Exit gracefully on TERM and INT + * or set a flag that will cause the errlog + * to be reopened by the main thread on HUP. * * Parameters : - * 1 : csp = Current client state (buffers, headers, etc...) + * 1 : the_signal = the signal cause this function to call * - * Returns : On success, the number of bytes written are returned (zero - * indicates nothing was written). On error, -1 is returned, - * and errno is set appropriately. If count is zero and the - * file descriptor refers to a regular file, 0 will be - * returned without causing any other effect. For a special - * file, the results are not portable. + * Returns : - * *********************************************************************/ -static void chat(struct client_state *csp) +static void sig_handler(int the_signal) { -/* - * This next lines are a little ugly, but they simplifies the if statements below. - * Basically if TOGGLE, then we want the if to test "csp->toggled_on", else we don't - * And if FORCE_LOAD, then we want the if to test "csp->toggled_on", else we don't - */ -#ifdef TOGGLE -# define IS_TOGGLED_ON_AND (csp->toggled_on) && -#else /* ifndef TOGGLE */ -# define IS_TOGGLED_ON_AND -#endif /* ndef TOGGLE */ -#ifdef FORCE_LOAD -# define IS_NOT_FORCED_AND (!csp->force) && -#else /* ifndef TOGGLE */ -# define IS_NOT_FORCED_AND -#endif /* def FORCE_LOAD */ - -#define IS_ENABLED_AND IS_TOGGLED_ON_AND IS_NOT_FORCED_AND - - char buf[BUFSIZ], *hdr, *p, *req; - char *err = NULL; - char *eno; - fd_set rfds; - int n, maxfd, server_body; - int ms_iis5_hack = 0; - int byte_count = 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 */ -#ifdef PCRS - int pcrs_filter; /* bool, 1==will filter through pcrs */ - int filtering = 0; /* bool, 1==currently filtering through pcrs */ -#endif /* def PCRS */ + switch(the_signal) + { + case SIGTERM: + case SIGINT: + log_error(LOG_LEVEL_INFO, "exiting by signal %d .. bye", the_signal); +#if defined(unix) + if(pidfile) + { + unlink(pidfile); + } +#endif /* unix */ + exit(the_signal); + break; + + case SIGHUP: + received_hup_signal = 1; + break; + + default: + /* + * 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; - http = csp->http; +} +#endif + +/********************************************************************* + * + * Function : client_protocol_is_unsupported + * + * Description : Checks if the client used a known unsupported + * protocol and deals with it by sending an error + * response. + * + * Parameters : + * 1 : csp = Current client state (buffers, headers, etc...) + * 2 : req = the first request line send by the client + * + * Returns : TRUE if an error response has been generated, or + * FALSE if the request doesn't look invalid. + * + *********************************************************************/ +static int client_protocol_is_unsupported(const struct client_state *csp, char *req) +{ /* - * Read the client's request. Note that since we're not using select() we - * could get blocked here if a client connected, then didn't say anything! + * If it's a FTP or gopher request, we don't support it. + * + * These checks are better than nothing, but they might + * not work in all configurations and some clients might + * have problems digesting the answer. + * + * They should, however, never cause more problems than + * Privoxy's old behaviour (returning the misleading HTML + * error message: + * + * "Could not resolve http://(ftp|gopher)://example.org"). */ - - while (FOREVER) + if (!strncmpic(req, "GET ftp://", 10) || !strncmpic(req, "GET gopher://", 13)) { - n = read_socket(csp->cfd, buf, sizeof(buf)); - - if (n <= 0) break; /* error! */ + const char *response = NULL; + const char *protocol = NULL; - add_to_iob(csp, buf, n); - - req = get_header(csp); - - if (req == NULL) - { - break; /* no HTTP request! */ - } - - if (*req == '\0') + if (!strncmpic(req, "GET ftp://", 10)) { - continue; /* more to come! */ + response = FTP_RESPONSE; + protocol = "FTP"; } - -#ifdef FORCE_LOAD - /* If this request contains the FORCE_PREFIX, - * better get rid of it now and set the force flag --oes - */ - - if (strstr(req, FORCE_PREFIX)) - { - strclean(req, FORCE_PREFIX); - log_error(LOG_LEVEL_FORCE, "Enforcing request \"%s\".\n", req); - csp->force = 1; - } else { - csp->force = 0; + response = GOPHER_RESPONSE; + protocol = "GOPHER"; } -#endif /* def FORCE_LOAD */ - - parse_http_request(req, http, csp); + log_error(LOG_LEVEL_ERROR, + "%s tried to use Privoxy as %s proxy: %s", + csp->ip_addr_str, protocol, req); + log_error(LOG_LEVEL_CLF, + "%s - - [%T] \"%s\" 400 0", csp->ip_addr_str, req); freez(req); - break; - } + write_socket(csp->cfd, response, strlen(response)); - if (http->cmd == NULL) - { - strcpy(buf, CHEADER); - write_socket(csp->cfd, buf, strlen(buf)); + return TRUE; + } - log_error(LOG_LEVEL_CLF, "%s - - [%T] \" \" 400 0", csp->ip_addr_str); + return FALSE; +} - return; - } - /* decide how to route the HTTP request */ +/********************************************************************* + * + * Function : get_request_destination_elsewhere + * + * Description : If the client's request was redirected into + * Privoxy without the client's knowledge, + * the request line lacks the destination host. + * + * This function tries to get it elsewhere, + * provided accept-intercepted-requests is enabled. + * + * "Elsewhere" currently only means "Host: header", + * but in the future we may ask the redirecting + * packet filter to look the destination up. + * + * If the destination stays unknown, an error + * response is send to the client and headers + * are freed so that chat() can return directly. + * + * Parameters : + * 1 : csp = Current client state (buffers, headers, etc...) + * 2 : headers = a header list + * + * Returns : JB_ERR_OK if the destination is now known, or + * JB_ERR_PARSE if it isn't. + * + *********************************************************************/ +static jb_err get_request_destination_elsewhere(struct client_state *csp, struct list *headers) +{ + char *req; - if ((gw = forward_url(http, csp)) == NULL) + if (!(csp->config->feature_flags & RUNTIME_FEATURE_ACCEPT_INTERCEPTED_REQUESTS)) { - log_error(LOG_LEVEL_FATAL, "gateway spec is NULL!?!? This can't happen!"); - /* Never get here - LOG_LEVEL_FATAL causes program exit */ - } + log_error(LOG_LEVEL_ERROR, "%s's request: \'%s\' is invalid." + " Privoxy isn't configured to accept intercepted requests.", + csp->ip_addr_str, csp->http->cmd); + /* XXX: Use correct size */ + log_error(LOG_LEVEL_CLF, "%s - - [%T] \"%s\" 400 0", + csp->ip_addr_str, csp->http->cmd); - /* build the http request to send to the server - * we have to do one of the following: - * - * create = use the original HTTP request to create a new - * HTTP request that has only the path component - * without the http://domainspec - * pass = pass the original HTTP request unchanged - * - * drop = drop the HTTP request - * - * here's the matrix: - * SSL - * 0 1 - * +--------+--------+ - * | | | - * 0 | create | drop | - * | | | - * Forwarding +--------+--------+ - * | | | - * 1 | pass | pass | - * | | | - * +--------+--------+ - * - */ + write_socket(csp->cfd, CHEADER, strlen(CHEADER)); + destroy_list(headers); - if (gw->forward_host) - { - /* if forwarding, just pass the request as is */ - enlist(csp->headers, http->cmd); + return JB_ERR_PARSE; } - else + else if (JB_ERR_OK == get_destination_from_headers(headers, csp->http)) { - if (http->ssl == 0) - { - /* otherwise elide the host information from the url */ - p = NULL; - p = strsav(p, http->gpc); - p = strsav(p, " "); - p = strsav(p, http->path); - p = strsav(p, " "); - p = strsav(p, http->ver); - enlist(csp->headers, p); - freez(p); - } - } + /* Split the domain we just got for pattern matching */ + init_domain_components(csp->http); - /* decide what we're to do with cookies */ - -#ifdef TOGGLE - if (!csp->toggled_on) - { - /* Most compatible set of permissions */ - csp->permissions = PERMIT_MOST_COMPATIBLE; + return JB_ERR_OK; } else -#endif /* ndef TOGGLE */ { - csp->permissions = url_permissions(http, csp); - } + /* We can't work without destination. Go spread the news.*/ + + req = list_to_text(headers); + chomp(req); + /* XXX: Use correct size */ + log_error(LOG_LEVEL_CLF, "%s - - [%T] \"%s\" 400 0", + csp->ip_addr_str, csp->http->cmd); + log_error(LOG_LEVEL_ERROR, + "Privoxy was unable to get the destination for %s's request:\n%s\n%s", + csp->ip_addr_str, csp->http->cmd, req); + freez(req); -#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 */ + write_socket(csp->cfd, MISSING_DESTINATION_RESPONSE, strlen(MISSING_DESTINATION_RESPONSE)); + destroy_list(headers); + + return JB_ERR_PARSE; + } + /* + * TODO: If available, use PF's ioctl DIOCNATLOOK as last resort + * to get the destination IP address, use it as host directly + * or do a reverse DNS lookup first. + */ +} - /* grab the rest of the client's headers */ +/********************************************************************* + * + * Function : get_server_headers + * + * Description : Parses server headers in iob and fills them + * into csp->headers so that they can later be + * handled by sed(). + * + * Parameters : + * 1 : csp = Current client state (buffers, headers, etc...) + * + * Returns : JB_ERR_OK if everything went fine, or + * JB_ERR_PARSE if the headers were incomplete. + * + *********************************************************************/ +static jb_err get_server_headers(struct client_state *csp) +{ + int continue_hack_in_da_house = 0; + char * header; - while (FOREVER) + while (((header = get_header(csp)) != NULL) || continue_hack_in_da_house) { - if ( ( p = get_header(csp) ) && ( *p == '\0' ) ) + if (header == NULL) { - n = read_socket(csp->cfd, buf, sizeof(buf)); - if (n <= 0) - { - log_error(LOG_LEVEL_ERROR, "read from client failed: %E"); - return; - } - add_to_iob(csp, buf, n); + /* + * continue hack in da house. Ignore the ending of + * this head and continue enlisting header lines. + * The reason is described below. + */ + enlist(csp->headers, ""); + continue_hack_in_da_house = 0; continue; } + else if (0 == strncmpic(header, "HTTP/1.1 100", 12)) + { + /* + * It's a bodyless continue response, don't + * stop header parsing after reaching it's end. + * + * As a result Privoxy will concatenate the + * next response's head and parse and deliver + * the headers as if they belonged to one request. + * + * The client will separate them because of the + * empty line between them. + * + * XXX: What we're doing here is clearly against + * the intended purpose of the continue header, + * and under some conditions (HTTP/1.0 client request) + * it's a standard violation. + * + * Anyway, "sort of against the spec" is preferable + * to "always getting confused by Continue responses" + * (Privoxy's behaviour before this hack was added) + */ + log_error(LOG_LEVEL_HEADER, "Continue hack in da house."); + continue_hack_in_da_house = 1; + } + else if (*header == '\0') + { + /* + * If the header is empty, but the Continue hack + * isn't active, we can assume that we reached the + * end of the buffer before we hit the end of the + * head. + * + * Inform the caller an let it decide how to handle it. + */ + return JB_ERR_PARSE; + } - if (p == NULL) break; - - enlist(csp->headers, p); - freez(p); + /* Enlist header */ + if (JB_ERR_MEMORY == enlist(csp->headers, header)) + { + /* + * XXX: Should we quit the request and return a + * out of memory error page instead? + */ + log_error(LOG_LEVEL_ERROR, + "Out of memory while enlisting server headers. %s lost.", + header); + } + freez(header); } - /* filter it as required */ + return JB_ERR_OK; +} - hdr = sed(client_patterns, add_client_headers, csp); - destroy_list(csp->headers); +/********************************************************************* + * + * Function : crunch_reason + * + * Description : Translates the crunch reason code into a string. + * + * Parameters : + * 1 : rsp = a http_response + * + * Returns : A string with the crunch reason or an error description. + * + *********************************************************************/ +static const char *crunch_reason(const struct http_response *rsp) +{ + char * reason = NULL; - /* Check the request against all rules, unless - * we're toggled off or in force mode. - */ - - if (intercept_url(http, csp)) + assert(rsp != NULL); + if (rsp == NULL) { - /* - * The interceptor will write out the data. - * We don't need to do anything else - */ - -#ifdef STATISTICS - csp->rejected = 1; -#endif /* def STATISTICS */ - - freez(hdr); - return; + return "Internal error while searching for crunch reason"; } -#ifdef FAST_REDIRECTS - else if (IS_ENABLED_AND - ((csp->permissions & PERMIT_FAST_REDIRECTS) != 0) && - (p = redirect_url(http, csp))) + switch (rsp->reason) { - /* This must be blocked as HTML */ -#ifdef STATISTICS - csp->rejected = 1; -#endif /* def STATISTICS */ - - log_error(LOG_LEVEL_GPC, "%s%s crunch!", http->hostport, http->path); - - log_error(LOG_LEVEL_CLF, "%s - - [%T] \"%s\" 200 3", - csp->ip_addr_str, http->cmd); - - /* Send HTML redirection result */ - write_socket(csp->cfd, p, strlen(p)); - - freez(p); - freez(hdr); - return; + case RSP_REASON_UNSUPPORTED: + reason = "Unsupported HTTP feature"; + break; + case RSP_REASON_BLOCKED: + reason = "Blocked"; + break; + case RSP_REASON_UNTRUSTED: + reason = "Untrusted"; + break; + case RSP_REASON_REDIRECTED: + reason = "Redirected"; + break; + case RSP_REASON_CGI_CALL: + reason = "CGI Call"; + break; + case RSP_REASON_NO_SUCH_DOMAIN: + reason = "DNS failure"; + break; + case RSP_REASON_FORWARDING_FAILED: + reason = "Forwarding failed"; + break; + case RSP_REASON_CONNECT_FAILED: + reason = "Connection failure"; + break; + case RSP_REASON_OUT_OF_MEMORY: + reason = "Out of memory (may mask other reasons)"; + break; + default: + reason = "No reason recorded"; + break; } -#endif /* def FAST_REDIRECTS */ - else if (IS_ENABLED_AND ( -#ifdef TRUST_FILES - (p = trust_url(http, csp)) || -#endif /* def TRUST_FILES */ - (p = block_url(http, csp)) )) - { - /* Block as HTML or image */ -#ifdef STATISTICS - csp->rejected = 1; -#endif /* def STATISTICS */ + return reason; +} - log_error(LOG_LEVEL_GPC, "%s%s crunch!", http->hostport, http->path); - log_error(LOG_LEVEL_CLF, "%s - - [%T] \"%s\" 200 1", - csp->ip_addr_str, http->cmd); +/********************************************************************* + * + * Function : send_crunch_response + * + * Description : Delivers already prepared response for + * intercepted requests, logs the interception + * and frees the response. + * + * Parameters : + * 1 : csp = Current client state (buffers, headers, etc...) + * 1 : rsp = Fully prepared response. Will be freed on exit. + * + * Returns : Nothing. + * + *********************************************************************/ +static void send_crunch_response(struct client_state *csp, struct http_response *rsp) +{ + const struct http_request *http = csp->http; + char status_code[4]; -#ifdef IMAGE_BLOCKING - /* Block as image? */ - if ( (csp->config->tinygif > 0) && block_imageurl(http, csp) ) + assert(rsp != NULL); + assert(rsp->head != NULL); + + if (rsp == NULL) { - /* Send "blocked" image */ - log_error(LOG_LEVEL_GPC, "%s%s image crunch!", - http->hostport, http->path); + /* + * Not supposed to happen. If it does + * anyway, treat it as an unknown error. + */ + cgi_error_unknown(csp, rsp, RSP_REASON_INTERNAL_ERROR); + /* return code doesn't matter */ + } - if (csp->config->tinygif == 1) - { - write_socket(csp->cfd, BLANKGIF, sizeof(BLANKGIF)-1); - } - else if (csp->config->tinygif == 2) - { - write_socket(csp->cfd, JBGIF, sizeof(JBGIF)-1); - } - else if ((csp->config->tinygif == 3) && (csp->config->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 - { - /* Should never happen */ - write_socket(csp->cfd, JBGIF, sizeof(JBGIF)-1); - } + if (rsp == NULL) + { + /* If rsp is still NULL, we have serious internal problems. */ + log_error(LOG_LEVEL_FATAL, + "NULL response in send_crunch_response and cgi_error_unknown failed as well."); } - else -#endif /* def IMAGE_BLOCKING */ - /* Block as HTML */ + + /* + * Extract the status code from the actual head + * that was send to the client. It is the only + * way to get it right for all requests, including + * the fixed ones for out-of-memory problems. + * + * A head starts like this: 'HTTP/1.1 200...' + * 0123456789|11 + * 10 + */ + status_code[0] = rsp->head[9]; + status_code[1] = rsp->head[10]; + status_code[2] = rsp->head[11]; + status_code[3] = '\0'; + + /* Write the answer to the client */ + if (write_socket(csp->cfd, rsp->head, rsp->head_length) + || write_socket(csp->cfd, rsp->body, rsp->content_length)) { - /* Send HTML "blocked" message, interception, or redirection result */ - write_socket(csp->cfd, p, strlen(p)); + /* There is nothing we can do about it. */ + log_error(LOG_LEVEL_ERROR, "write to: %s failed: %E", csp->http->host); } - freez(p); - freez(hdr); - return; - } + /* Log that the request was crunched and why. */ + log_error(LOG_LEVEL_GPC, "%s%s crunch! (%s)", + http->hostport, http->path, crunch_reason(rsp)); + log_error(LOG_LEVEL_CLF, "%s - - [%T] \"%s\" %s %d", + csp->ip_addr_str, http->ocmd, status_code, rsp->content_length); - log_error(LOG_LEVEL_GPC, "%s%s", http->hostport, http->path); + /* Clean up and return */ + if (cgi_error_memory() != rsp) + { + free_http_response(rsp); + } + return; +} - if (gw->forward_host) - { - log_error(LOG_LEVEL_CONNECT, "via %s:%d to: %s", - gw->forward_host, gw->forward_port, http->hostport); - } - else - { - log_error(LOG_LEVEL_CONNECT, "to %s", http->hostport); - } - /* here we connect to the server, gateway, or the forwarder */ +#if 0 +/********************************************************************* + * + * Function : request_contains_null_bytes + * + * Description : Checks for NULL bytes in the request and sends + * an error message to the client if any were found. + * + * XXX: currently not used, see comment in chat(). + * + * Parameters : + * 1 : csp = Current client state (buffers, headers, etc...) + * 2 : buf = Data from the client's request to check. + * 3 : len = The data length. + * + * Returns : TRUE if the request contained one or more NULL bytes, or + * FALSE otherwise. + * + *********************************************************************/ +static int request_contains_null_bytes(const struct client_state *csp, char *buf, int len) +{ + size_t c_len; /* Request lenght when treated as C string */ - csp->sfd = (gw->conn)(gw, http, csp); + c_len = strlen(buf); - if (csp->sfd < 0) + if (c_len < len) { - log_error(LOG_LEVEL_CONNECT, "connect to: %s failed: %E", - http->hostport); + /* + * Null byte(s) found. Log the request, + * return an error response and hang up. + */ + size_t tmp_len = c_len; - if (errno == EINVAL) + do { - err = zalloc(strlen(CNXDOM) + strlen(http->host)); - sprintf(err, CNXDOM, http->host); + /* + * Replace NULL byte(s) with '°' characters + * so the request can be logged as string. + * XXX: Is there a better replacement character? + */ + buf[tmp_len]='°'; + tmp_len += strlen(buf+tmp_len); + } while (tmp_len < len); + + log_error(LOG_LEVEL_ERROR, "%s\'s request contains at least one NULL byte " + "(length=%d, strlen=%d).", csp->ip_addr_str, len, c_len); + log_error(LOG_LEVEL_HEADER, + "Offending request data with NULL bytes turned into \'°\' characters: %s", buf); + + write_socket(csp->cfd, NULL_BYTE_RESPONSE, strlen(NULL_BYTE_RESPONSE)); + + /* XXX: Log correct size */ + log_error(LOG_LEVEL_CLF, "%s - - [%T] \"Invalid request\" 400 0", csp->ip_addr_str); + + return TRUE; + } - log_error(LOG_LEVEL_CLF, "%s - - [%T] \"%s\" 404 0", - csp->ip_addr_str, http->cmd); - } - else - { - eno = safe_strerror(errno); - err = zalloc(strlen(CFAIL) + strlen(http->hostport) + strlen(eno)); - sprintf(err, CFAIL, http->hostport, eno); + return FALSE; +} +#endif - log_error(LOG_LEVEL_CLF, "%s - - [%T] \"%s\" 503 0", - csp->ip_addr_str, http->cmd); - } - write_socket(csp->cfd, err, strlen(err)); +/********************************************************************* + * + * Function : crunch_response_triggered + * + * Description : Checks if the request has to be crunched, + * and delivers the crunch response if necessary. + * + * Parameters : + * 1 : csp = Current client state (buffers, headers, etc...) + * 2 : crunchers = list of cruncher functions to run + * + * Returns : TRUE if the request was answered with a crunch response + * FALSE otherwise. + * + *********************************************************************/ +static int crunch_response_triggered(struct client_state *csp, const struct cruncher crunchers[]) +{ + struct http_response *rsp = NULL; + const struct cruncher *c; - freez(err); - freez(hdr); - return; + /* + * If CGI request crunching is disabled, + * check the CGI dispatcher out of order to + * prevent unintentional blocks or redirects. + */ + if (!(csp->config->feature_flags & RUNTIME_FEATURE_CGI_CRUNCHING) + && (NULL != (rsp = dispatch_cgi(csp)))) + { + /* Deliver, log and free the interception response. */ + send_crunch_response(csp, rsp); + return TRUE; } - log_error(LOG_LEVEL_CONNECT, "OK"); - - if (gw->forward_host || (http->ssl == 0)) + for (c = crunchers; c->cruncher != NULL; c++) { - /* write the client's (modified) header to the server - * (along with anything else that may be in the buffer) + /* + * Check the cruncher if either Privoxy is toggled + * on and the request isn't forced, or if the cruncher + * applies to forced requests as well. */ + if (((csp->flags & CSP_FLAG_TOGGLED_ON) && + !(csp->flags & CSP_FLAG_FORCED)) || + (c->flags & CF_IGNORE_FORCE)) + { + rsp = c->cruncher(csp); + if (NULL != rsp) + { + /* Deliver, log and free the interception response. */ + send_crunch_response(csp, rsp); +#ifdef FEATURE_STATISTICS + if (c->flags & CF_COUNT_AS_REJECT) + { + csp->flags |= CSP_FLAG_REJECTED; + } +#endif /* def FEATURE_STATISTICS */ - n = strlen(hdr); + return TRUE; + } + } + } - if ((write_socket(csp->sfd, hdr, n) != n) - || (flush_socket(csp->sfd, csp ) < 0)) - { - log_error(LOG_LEVEL_CONNECT, "write header to: %s failed: %E", - http->hostport); + return FALSE; +} - eno = safe_strerror(errno); - err = zalloc(strlen(CFAIL) + strlen(http->hostport) + strlen(eno)); - sprintf(err, CFAIL, http->hostport, eno); - write_socket(csp->cfd, err, strlen(err)); - log_error(LOG_LEVEL_CLF, "%s - - [%T] \"%s\" 503 0", - csp->ip_addr_str, http->cmd); +/********************************************************************* + * + * Function : build_request_line + * + * Description : Builds the HTTP request line. + * + * If a HTTP forwarder is used it expects the whole URL, + * web servers only get the path. + * + * Parameters : + * 1 : csp = Current client state (buffers, headers, etc...) + * 2 : fwd = The forwarding spec used for the request + * XXX: Should use http->fwd instead. + * 3 : request_line = The old request line which will be replaced. + * + * Returns : Nothing. Terminates in case of memory problems. + * + *********************************************************************/ +static void build_request_line(struct client_state *csp, const struct forward_spec *fwd, char **request_line) +{ + struct http_request *http = csp->http; - freez(err); - freez(hdr); - return; - } - } - else + assert(http->ssl == 0); + + /* + * Downgrade http version from 1.1 to 1.0 + * if +downgrade action applies. + */ + if ( (csp->action->flags & ACTION_DOWNGRADE) + && (!strcmpic(http->ver, "HTTP/1.1"))) { - /* - * We're running an SSL tunnel and we're not forwarding, - * so just send the "connect succeeded" message to the - * client, flush the rest, and get out of the way. - */ - log_error(LOG_LEVEL_CLF, "%s - - [%T] \"%s\" 200 2\n", - csp->ip_addr_str, http->cmd); + freez(http->ver); + http->ver = strdup("HTTP/1.0"); - if (write_socket(csp->cfd, CSUCCEED, sizeof(CSUCCEED)-1) < 0) + if (http->ver == NULL) { - freez(hdr); - return; + log_error(LOG_LEVEL_FATAL, "Out of memory downgrading HTTP version"); } - IOB_RESET(csp); } - /* we're finished with the client's header */ - freez(hdr); + /* + * Rebuild the request line. + */ + freez(*request_line); + *request_line = strdup(http->gpc); + string_append(request_line, " "); - maxfd = ( csp->cfd > csp->sfd ) ? csp->cfd : csp->sfd; + if (fwd->forward_host) + { + string_append(request_line, http->url); + } + else + { + string_append(request_line, http->path); + } + string_append(request_line, " "); + string_append(request_line, http->ver); + + if (*request_line == NULL) + { + log_error(LOG_LEVEL_FATAL, "Out of memory writing HTTP command"); + } + log_error(LOG_LEVEL_HEADER, "New HTTP Request-Line: %s", *request_line); +} + + +/********************************************************************* + * + * Function : change_request_destination + * + * Description : Parse a (rewritten) request line and regenerate + * the http request data. + * + * Parameters : + * 1 : csp = Current client state (buffers, headers, etc...) + * + * Returns : Forwards the parse_http_request() return code. + * Terminates in case of memory problems. + * + *********************************************************************/ +static jb_err change_request_destination(struct client_state *csp) +{ + struct http_request *http = csp->http; + jb_err err; + + log_error(LOG_LEVEL_INFO, "Rewrite detected: %s", csp->headers->first->str); + free_http_request(http); + err = parse_http_request(csp->headers->first->str, http, csp); + if (JB_ERR_OK != err) + { + log_error(LOG_LEVEL_ERROR, "Couldn't parse rewritten request: %s.", + jb_err_to_string(err)); + } + http->ocmd = strdup(http->cmd); /* XXX: ocmd is a misleading name */ + if (http->ocmd == NULL) + { + log_error(LOG_LEVEL_FATAL, "Out of memory copying rewritten HTTP request line"); + } + + return err; +} + + +/********************************************************************* + * + * Function : chat + * + * Description : Once a connection to the client has been accepted, + * this function is called (via serve()) to handle the + * main business of the communication. When this + * function returns, the caller must close the client + * socket handle. + * + * FIXME: chat is nearly thousand lines long. + * Ridiculous. + * + * Parameters : + * 1 : csp = Current client state (buffers, headers, etc...) + * + * Returns : Nothing. + * + *********************************************************************/ +static void chat(struct client_state *csp) +{ + char buf[BUFFER_SIZE]; + char *hdr; + char *p; + char *req = NULL; + fd_set rfds; + int n; + jb_socket maxfd; + int server_body; + int ms_iis5_hack = 0; + size_t byte_count = 0; + int forwarded_connect_retries = 0; + int max_forwarded_connect_retries = csp->config->forwarded_connect_retries; + const struct forward_spec * fwd; + struct http_request *http; + int len; /* for buffer sizes (and negative error codes) */ + jb_err err; + + /* Function that does the content filtering for the current request */ + filter_function_ptr content_filter = NULL; + + /* Skeleton for HTTP response, if we should intercept the request */ + struct http_response *rsp; + + /* Temporary copy of the client's headers before they get enlisted in csp->headers */ + struct list header_list; + struct list *headers = &header_list; + + http = csp->http; + + memset(buf, 0, sizeof(buf)); + + /* + * Read the client's request. Note that since we're not using select() we + * could get blocked here if a client connected, then didn't say anything! + */ + + do + { + len = read_socket(csp->cfd, buf, sizeof(buf) - 1); + + if (len <= 0) break; /* error! */ + + /* + * 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); + + } while ((NULL != req) && ('\0' == *req)); + + if ((NULL != req) && ('\0' != *req)) + { + /* Request received. Validate and parse it. */ + +#if 0 + /* + * XXX: Temporary disabled to prevent problems + * with POST requests whose bodies are allowed to + * contain NULL bytes. BR#1730105. + * + * The main purpose of this check is to properly + * log stuff like BitTorrent traffic and other junk + * that hits public proxies. It's not required for + * Privoxy to functions as those requests are discarded + * later on anyway. + * + * It probably should be rewritten to only check + * the head of the request. Another option would + * be to let all POST requests pass, although that + * may not be good enough. + */ + if (request_contains_null_bytes(csp, buf, len)) + { + /* NULL bytes found and dealt with, just hang up. */ + return; + } +#endif + + /* Does the request line look invalid? */ + if (client_protocol_is_unsupported(csp, req)) + { + /* + * Yes. The request has already been + * answered with a error response, the buffers + * were freed and we're done with chatting. + */ + return; + } + +#ifdef FEATURE_FORCE_LOAD + /* + * If this request contains the FORCE_PREFIX and blocks + * aren't enforced, get rid of it and set the force flag. + */ + if (strstr(req, FORCE_PREFIX)) + { + if (csp->config->feature_flags & RUNTIME_FEATURE_ENFORCE_BLOCKS) + { + log_error(LOG_LEVEL_FORCE, + "Ignored force prefix in request: \"%s\".", req); + } + else + { + strclean(req, FORCE_PREFIX); + log_error(LOG_LEVEL_FORCE, "Enforcing request: \"%s\".", req); + csp->flags |= CSP_FLAG_FORCED; + } + } + +#endif /* def FEATURE_FORCE_LOAD */ + err = parse_http_request(req, http, csp); + if (JB_ERR_OK != err) + { + log_error(LOG_LEVEL_ERROR, "Couldn't parse request: %s.", jb_err_to_string(err)); + } + + freez(req); + } + + if (http->cmd == NULL) + { + write_socket(csp->cfd, CHEADER, strlen(CHEADER)); + /* XXX: Use correct size */ + log_error(LOG_LEVEL_CLF, "%s - - [%T] \"Invalid request\" 400 0", csp->ip_addr_str); + log_error(LOG_LEVEL_ERROR, "Invalid header received from %s.", csp->ip_addr_str); + + free_http_request(http); + return; + } + + /* grab the rest of the client's headers */ + init_list(headers); + for (;;) + { + if ( ( ( p = get_header(csp) ) != NULL) && ( *p == '\0' ) ) + { + len = read_socket(csp->cfd, buf, sizeof(buf) - 1); + if (len <= 0) + { + log_error(LOG_LEVEL_ERROR, "read from client failed: %E"); + destroy_list(headers); + return; + } + + /* + * 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)) + { + destroy_list(headers); + return; + } + continue; + } + + if (p == NULL) break; + + enlist(headers, p); + freez(p); + + } + + if (http->host == NULL) + { + /* + * If we still don't know the request destination, + * the request is invalid or the client uses + * Privoxy without its knowledge. + */ + if (JB_ERR_OK != get_request_destination_elsewhere(csp, headers)) + { + /* + * Our attempts to get the request destination + * elsewhere failed or Privoxy is configured + * to only accept proxy requests. + * + * An error response has already been send + * and we're done here. + */ + return; + } + } + + /* + * Determine the actions for this URL + */ +#ifdef FEATURE_TOGGLE + if (!(csp->flags & CSP_FLAG_TOGGLED_ON)) + { + /* Most compatible set of actions (i.e. none) */ + init_current_action(csp->action); + } + else +#endif /* ndef FEATURE_TOGGLE */ + { + get_url_actions(csp, http); + } + + /* + * Save a copy of the original request for logging + */ + http->ocmd = strdup(http->cmd); + + if (http->ocmd == NULL) + { + log_error(LOG_LEVEL_FATAL, "Out of memory copying HTTP request line"); + } + + enlist(csp->headers, http->cmd); + + /* Append the previously read headers */ + list_append_list_unique(csp->headers, headers); + destroy_list(headers); + + err = sed(client_patterns, add_client_headers, csp); + if (JB_ERR_OK != err) + { + assert(err == JB_ERR_PARSE); + log_error(LOG_LEVEL_FATAL, "Failed to parse client headers"); + } + csp->flags |= CSP_FLAG_CLIENT_HEADER_PARSING_DONE; + + /* Check request line for rewrites. */ + if ((NULL == csp->headers->first->str) + || (strcmp(http->cmd, csp->headers->first->str) && + (JB_ERR_OK != change_request_destination(csp)))) + { + /* + * A header filter broke the request line - bail out. + */ + write_socket(csp->cfd, MESSED_UP_REQUEST_RESPONSE, strlen(MESSED_UP_REQUEST_RESPONSE)); + /* XXX: Use correct size */ + log_error(LOG_LEVEL_CLF, "%s - - [%T] \"Invalid request generated\" 500 0", csp->ip_addr_str); + log_error(LOG_LEVEL_ERROR, "Invalid request line after applying header filters."); + + free_http_request(http); + return; + } + + /* decide how to route the HTTP request */ + fwd = forward_url(csp, http); + if (NULL == fwd) + { + 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 + * we have to do one of the following: + * + * create = use the original HTTP request to create a new + * HTTP request that has either the path component + * without the http://domainspec (w/path) or the + * full orininal URL (w/url) + * Note that the path and/or the HTTP version may + * have been altered by now. + * + * connect = Open a socket to the host:port of the server + * and short-circuit server and client socket. + * + * pass = Pass the request unchanged if forwarding a CONNECT + * request to a parent proxy. Note that we'll be sending + * the CFAIL message ourselves if connecting to the parent + * fails, but we won't send a CSUCCEED message if it works, + * since that would result in a double message (ours and the + * parent's). After sending the request to the parent, we simply + * tunnel. + * + * here's the matrix: + * SSL + * 0 1 + * +--------+--------+ + * | | | + * 0 | create | connect| + * | w/path | | + * Forwarding +--------+--------+ + * | | | + * 1 | create | pass | + * | w/url | | + * +--------+--------+ + * + */ + + if (http->ssl && connect_port_is_forbidden(csp)) + { + const char *acceptable_connect_ports = + csp->action->string[ACTION_STRING_LIMIT_CONNECT]; + assert(NULL != acceptable_connect_ports); + log_error(LOG_LEVEL_INFO, "Request from %s marked for blocking. " + "limit-connect{%s} doesn't allow CONNECT requests to port %d.", + csp->ip_addr_str, acceptable_connect_ports, csp->http->port); + csp->action->flags |= ACTION_BLOCK; + http->ssl = 0; + } + + if (http->ssl == 0) + { + freez(csp->headers->first->str); + build_request_line(csp, fwd, &csp->headers->first->str); + } + + hdr = list_to_text(csp->headers); + if (hdr == NULL) + { + /* FIXME Should handle error properly */ + log_error(LOG_LEVEL_FATAL, "Out of memory parsing client header"); + } + + /* + * We have a request. Check if one of the crunchers wants it. + */ + if (crunch_response_triggered(csp, crunchers_all)) + { + /* + * Yes. The client got the crunch response + * and we are done here after cleaning up. + */ + freez(hdr); + list_remove_all(csp->headers); + + return; + } + + /* + * The headers can't be removed earlier because + * they were still needed for the referrer check + * in case of CGI crunches. + * + * XXX: Would it be worth to move the referrer check + * into client_referrer() and set a flag if it's trusted? + */ + list_remove_all(csp->headers); + + log_error(LOG_LEVEL_GPC, "%s%s", http->hostport, http->path); + + if (fwd->forward_host) + { + log_error(LOG_LEVEL_CONNECT, "via %s:%d to: %s", + fwd->forward_host, fwd->forward_port, http->hostport); + } + else + { + log_error(LOG_LEVEL_CONNECT, "to %s", http->hostport); + } + + /* here we connect to the server, gateway, or the forwarder */ + + while ( (csp->sfd = forwarded_connect(fwd, http, csp)) + && (errno == EINVAL) && (forwarded_connect_retries++ < max_forwarded_connect_retries)) + { + log_error(LOG_LEVEL_ERROR, "failed request #%u to connect to %s. Trying again.", + forwarded_connect_retries, http->hostport); + } + + if (csp->sfd == JB_INVALID_SOCKET) + { + if (fwd->type != SOCKS_NONE) + { + /* Socks error. */ + rsp = error_response(csp, "forwarding-failed", errno); + } + else if (errno == EINVAL) + { + rsp = error_response(csp, "no-such-domain", errno); + } + else + { + rsp = error_response(csp, "connect-failed", errno); + log_error(LOG_LEVEL_CONNECT, "connect to: %s failed: %E", + http->hostport); + } + + + /* Write the answer to the client */ + if (rsp != NULL) + { + send_crunch_response(csp, rsp); + } + + freez(hdr); + return; + } + + if (fwd->forward_host || (http->ssl == 0)) + { + /* write the client's (modified) header to the server + * (along with anything else that may be in the buffer) + */ + + if (write_socket(csp->sfd, hdr, strlen(hdr)) + || (flush_socket(csp->sfd, csp->iob) < 0)) + { + log_error(LOG_LEVEL_CONNECT, "write header to: %s failed: %E", + http->hostport); + + rsp = error_response(csp, "connect-failed", errno); + + if(rsp) + { + send_crunch_response(csp, rsp); + } + + freez(hdr); + return; + } + } + else + { + /* + * We're running an SSL tunnel and we're not forwarding, + * so just send the "connect succeeded" message to the + * client, flush the rest, and get out of the way. + */ + if (write_socket(csp->cfd, CSUCCEED, strlen(CSUCCEED))) + { + freez(hdr); + return; + } + IOB_RESET(csp); + } + + log_error(LOG_LEVEL_CONNECT, "to %s successful", http->hostport); + + /* we're finished with the client's header */ + freez(hdr); + + maxfd = ( csp->cfd > csp->sfd ) ? csp->cfd : csp->sfd; + + /* pass data between the client and server + * until one or the other shuts down the connection. + */ + + server_body = 0; + + 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((int)maxfd+1, &rfds, NULL, NULL, NULL); + + if (n < 0) + { + log_error(LOG_LEVEL_ERROR, "select() failed!: %E"); + return; + } + + /* this is the body of the browser's request + * just read it and write it. + */ + + if (FD_ISSET(csp->cfd, &rfds)) + { + len = read_socket(csp->cfd, buf, sizeof(buf) - 1); + + if (len <= 0) + { + break; /* "game over, man" */ + } + + if (write_socket(csp->sfd, buf, (size_t)len)) + { + log_error(LOG_LEVEL_ERROR, "write to: %s failed: %E", http->host); + return; + } + continue; + } + + /* + * The server wants to talk. It could be the header or the body. + * If `hdr' is null, then it's the header otherwise it's the body. + * FIXME: Does `hdr' really mean `host'? No. + */ + + + if (FD_ISSET(csp->sfd, &rfds)) + { + fflush( 0 ); + len = read_socket(csp->sfd, buf, sizeof(buf) - 1); + + if (len < 0) + { + log_error(LOG_LEVEL_ERROR, "read from: %s failed: %E", http->host); + + if (http->ssl && (fwd->forward_host == NULL)) + { + /* + * Just hang up. We already confirmed the client's CONNECT + * request with status code 200 and unencrypted content is + * no longer welcome. + */ + log_error(LOG_LEVEL_ERROR, + "CONNECT already confirmed. Unable to tell the client about the problem."); + return; + } + else if (byte_count) + { + /* + * Just hang up. We already transmitted the original headers + * and parts of the original content and therefore missed the + * chance to send an error message (without risking data corruption). + * + * XXX: we could retry with a fancy range request here. + */ + log_error(LOG_LEVEL_ERROR, "Already forwarded the original headers. " + "Unable to tell the client about the problem."); + return; + } + + rsp = error_response(csp, "connect-failed", errno); + + if (rsp) + { + send_crunch_response(csp, rsp); + } + + return; + } + + /* Add a trailing zero. This lets filter_popups + * use string operations. + */ + buf[len] = '\0'; + + /* Normally, this would indicate that we've read + * as much as the server has sent us and we can + * close the client connection. However, Microsoft + * in its wisdom has released IIS/5 with a bug that + * prevents it from sending the trailing \r\n in + * a 302 redirect header (and possibly other headers). + * To work around this if we've haven't parsed + * a full header we'll append a trailing \r\n + * and see if this now generates a valid one. + * + * This hack shouldn't have any impacts. If we've + * already transmitted the header or if this is a + * SSL connection, then we won't bother with this + * hack. So we only work on partially received + * headers. If we append a \r\n and this still + * doesn't generate a valid header, then we won't + * transmit anything to the client. + */ + if (len == 0) + { + + if (server_body || http->ssl) + { + /* + * If we have been buffering up the document, + * now is the time to apply content modification + * and send the result to the client. + */ + if (content_filter) + { + p = execute_content_filter(csp, content_filter); + /* + * If the content filter fails, use the original + * buffer and length. + * (see p != NULL ? p : csp->iob->cur below) + */ + if (NULL == p) + { + csp->content_length = (size_t)(csp->iob->eod - csp->iob->cur); + } + + if (JB_ERR_OK != sed(server_patterns_light, NULL, csp)) + { + log_error(LOG_LEVEL_FATAL, "Failed to parse server headers."); + } + + hdr = list_to_text(csp->headers); + if (hdr == NULL) + { + /* FIXME Should handle error properly */ + log_error(LOG_LEVEL_FATAL, "Out of memory parsing server header"); + } + + /* + * Shouldn't happen because this was the second sed run + * and tags are only created for the first one. + */ + assert(!crunch_response_triggered(csp, crunchers_all)); + + 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"); + freez(hdr); + freez(p); + return; + } + + freez(hdr); + freez(p); + } + + break; /* "game over, man" */ + } + + /* + * This is NOT the body, so + * Let's pretend the server just sent us a blank line. + */ + log_error(LOG_LEVEL_INFO, + "Malformerd HTTP headers detected and MS IIS5 hack enabled. " + "Expect an invalid response or even no response at all."); + snprintf(buf, sizeof(buf), "\r\n"); + len = (int)strlen(buf); + + /* + * Now, let the normal header parsing algorithm below do its + * job. If it fails, we'll exit instead of continuing. + */ + + ms_iis5_hack = 1; + } + + /* + * If this is an SSL connection or we're in the body + * of the server document, just write it to the client, + * unless we need to buffer the body for later content-filtering + */ + + if (server_body || http->ssl) + { + if (content_filter) + { + /* + * 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 (add_to_iob(csp, buf, len)) + { + size_t hdrlen; + int flushed; + + log_error(LOG_LEVEL_INFO, "Flushing header and buffers. Stepping back from filtering."); + + hdr = list_to_text(csp->headers); + if (hdr == NULL) + { + /* + * 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(); + send_crunch_response(csp, rsp); + + return; + } + hdrlen = strlen(hdr); + + if (write_socket(csp->cfd, hdr, hdrlen) + || ((flushed = flush_socket(csp->cfd, csp->iob)) < 0) + || (write_socket(csp->cfd, buf, (size_t)len))) + { + log_error(LOG_LEVEL_CONNECT, "Flush header and buffers to client failed: %E"); + + freez(hdr); + return; + } + + /* + * Reset the byte_count to the amount of bytes + * we just flushed. len will be added a few lines below, + * hdrlen doesn't matter for LOG_LEVEL_CLF. + */ + byte_count = (size_t)flushed; + freez(hdr); + content_filter = NULL; + server_body = 1; + } + } + else + { + if (write_socket(csp->cfd, buf, (size_t)len)) + { + log_error(LOG_LEVEL_ERROR, "write to client failed: %E"); + return; + } + } + byte_count += (size_t)len; + continue; + } + else + { + /* we're still looking for the end of the + * server's header ... (does that make header + * parsing an "out of body experience" ? + */ + + /* + * 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(); + send_crunch_response(csp, rsp); + + return; + } + + /* Convert iob into something sed() can digest */ + if (JB_ERR_PARSE == get_server_headers(csp)) + { + if (ms_iis5_hack) + { + /* Well, we tried our MS IIS/5 + * hack and it didn't work. + * The header is incomplete + * and there isn't anything + * we can do about it. + */ + break; + } + else + { + /* Since we have to wait for + * more from the server before + * we can parse the headers + * we just continue here. + */ + continue; + } + } + + /* Did we actually get anything? */ + if (NULL == csp->headers->first) + { + log_error(LOG_LEVEL_ERROR, "Empty server or forwarder response."); + log_error(LOG_LEVEL_CLF, "%s - - [%T] \"%s\" 502 0", csp->ip_addr_str, http->cmd); + write_socket(csp->cfd, NO_SERVER_DATA_RESPONSE, strlen(NO_SERVER_DATA_RESPONSE)); + free_http_request(http); + return; + } + + assert(csp->headers->first->str); + assert(!http->ssl); + if (strncmpic(csp->headers->first->str, "HTTP", 4)) + { + /* + * It doesn't look like a HTTP response: + * tell the client and log the problem. + */ + if (strlen(csp->headers->first->str) > 30) + { + csp->headers->first->str[30] = '\0'; + } + log_error(LOG_LEVEL_ERROR, + "Invalid server or forwarder response. Starts with: %s", + csp->headers->first->str); + log_error(LOG_LEVEL_CLF, + "%s - - [%T] \"%s\" 502 0", csp->ip_addr_str, http->cmd); + write_socket(csp->cfd, INVALID_SERVER_HEADERS_RESPONSE, + strlen(INVALID_SERVER_HEADERS_RESPONSE)); + free_http_request(http); + return; + } + + /* we have now received the entire header. + * filter it and send the result to the client + */ + if (JB_ERR_OK != sed(server_patterns, add_server_headers, csp)) + { + log_error(LOG_LEVEL_FATAL, "Failed to parse server headers."); + } + hdr = list_to_text(csp->headers); + if (hdr == NULL) + { + /* FIXME Should handle error properly */ + log_error(LOG_LEVEL_FATAL, "Out of memory parsing server header"); + } + + if (crunch_response_triggered(csp, crunchers_light)) + { + /* + * One of the tags created by a server-header + * tagger triggered a crunch. We already + * delivered the crunch response to the client + * and are done here after cleaning up. + */ + freez(hdr); + return; + } + /* Buffer and pcrs filter this if appropriate. */ + + if (!http->ssl) /* We talk plaintext */ + { + content_filter = get_filter_function(csp); + } + /* + * Only write if we're not buffering for content modification + */ + if (!content_filter) + { + /* write the server's (modified) header to + * the client (along with anything else that + * may be in the buffer) + */ + + if (write_socket(csp->cfd, hdr, strlen(hdr)) + || ((len = flush_socket(csp->cfd, csp->iob)) < 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 += (size_t)len; + } + + /* we're finished with the server's header */ + + freez(hdr); + server_body = 1; + + /* If this was a MS IIS/5 hack then it means + * the server has already closed the + * connection. Nothing more to read. Time + * to bail. + */ + if (ms_iis5_hack) + { + break; + } + } + continue; + } + + return; /* huh? we should never get here */ + } + + if (csp->content_length == 0) + { + /* + * If Privoxy didn't recalculate the + * Content-Lenght, byte_count is still + * correct. + */ + csp->content_length = byte_count; + } + + log_error(LOG_LEVEL_CLF, "%s - - [%T] \"%s\" 200 %d", + csp->ip_addr_str, http->ocmd, csp->content_length); +} + + +/********************************************************************* + * + * Function : serve + * + * Description : This is little more than chat. We only "serve" to + * to close any socket that chat may have opened. + * + * Parameters : + * 1 : csp = Current client state (buffers, headers, etc...) + * + * 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); + + if (csp->sfd != JB_INVALID_SOCKET) + { + close_socket(csp->sfd); + } + + csp->flags &= ~CSP_FLAG_ACTIVE; + +} + + +#ifdef __BEOS__ +/********************************************************************* + * + * Function : server_thread + * + * Description : We only exist to call `serve' in a threaded environment. + * + * Parameters : + * 1 : data = Current client state (buffers, headers, etc...) + * + * Returns : Always 0. + * + *********************************************************************/ +static int32 server_thread(void *data) +{ + serve((struct client_state *) data); + return 0; + +} +#endif + + +#if !defined(_WIN32) || defined(_WIN_CONSOLE) +/********************************************************************* + * + * Function : usage + * + * Description : Print usage info & exit. + * + * Parameters : Pointer to argv[0] for identifying ourselves + * + * Returns : No. ,-) + * + *********************************************************************/ +static void usage(const char *myname) +{ + printf("Privoxy version " VERSION " (" HOME_PAGE_URL ")\n" + "Usage: %s " +#if defined(unix) + "[--chroot] " +#endif /* defined(unix) */ + "[--help] " +#if defined(unix) + "[--no-daemon] [--pidfile pidfile] [--pre-chroot-nslookup hostname] [--user user[.group]] " +#endif /* defined(unix) */ + "[--version] [configfile]\n" + "Aborting\n", myname); + + exit(2); + +} +#endif /* #if !defined(_WIN32) || defined(_WIN_CONSOLE) */ + + +/********************************************************************* + * + * Function : initialize_mutexes + * + * Description : Prepares mutexes if mutex support is available. + * + * Parameters : None + * + * Returns : Void, exits in case of errors. + * + *********************************************************************/ +static void initialize_mutexes(void) +{ + int err = 0; + +#ifdef FEATURE_PTHREAD + /* + * Prepare global mutex semaphores + */ + err = pthread_mutex_init(&log_mutex, 0); + + if (!err) err = pthread_mutex_init(&log_init_mutex, 0); + + /* + * XXX: The assumptions below are a bit naive + * and can cause locks that aren't necessary. + * + * For example older FreeBSD versions (< 6.x?) + * have no gethostbyname_r, but gethostbyname is + * thread safe. + */ +#if !defined(HAVE_GETHOSTBYADDR_R) || !defined(HAVE_GETHOSTBYNAME_R) + if (!err) err = pthread_mutex_init(&resolver_mutex, 0); +#endif /* !defined(HAVE_GETHOSTBYADDR_R) || !defined(HAVE_GETHOSTBYNAME_R) */ + /* + * XXX: should we use a single mutex for + * localtime() and gmtime() as well? + */ +#ifndef HAVE_GMTIME_R + if (!err) err = pthread_mutex_init(&gmtime_mutex, 0); +#endif /* ndef HAVE_GMTIME_R */ + +#ifndef HAVE_LOCALTIME_R + if (!err) err = pthread_mutex_init(&localtime_mutex, 0); +#endif /* ndef HAVE_GMTIME_R */ + +#ifndef HAVE_RANDOM + if (!err) err = pthread_mutex_init(&rand_mutex, 0); +#endif /* ndef HAVE_RANDOM */ +#endif /* FEATURE_PTHREAD */ + + /* + * TODO: mutex support for mingw32 would be swell. + */ + + if (err) + { + printf("Fatal error. Mutex initialization failed: %s.\n", + strerror(err)); + exit(1); + } + + return; +} + + +/********************************************************************* + * + * Function : main + * + * Description : Load the config file and start the listen loop. + * This function is a lot more *sane* with the `load_config' + * and `listen_loop' functions; although it stills does + * a *little* too much for my taste. + * + * Parameters : + * 1 : argc = Number of parameters (including $0). + * 2 : argv = Array of (char *)'s to the parameters. + * + * Returns : 1 if : can't open config file, unrecognized directive, + * stats requested in multi-thread mode, can't open the + * log file, can't open the jar file, listen port is invalid, + * any load fails, and can't bind port. + * + * Else main never returns, the process must be signaled + * to terminate execution. Or, on Windows, use the + * "File", "Exit" menu option. + * + *********************************************************************/ +#ifdef __MINGW32__ +int real_main(int argc, const char *argv[]) +#else +int main(int argc, const char *argv[]) +#endif +{ + int argc_pos = 0; + unsigned int random_seed; +#ifdef unix + struct passwd *pw = NULL; + struct group *grp = NULL; + char *p; + int do_chroot = 0; + char *pre_chroot_nslookup_to_load_resolver = NULL; +#endif - /* pass data between the client and server - * until one or the other shuts down the connection. - */ + Argc = argc; + Argv = argv; - server_body = 0; + configfile = +#if !defined(_WIN32) + "config" +#else + "config.txt" +#endif + ; - while (FOREVER) + /* + * Parse the command line arguments + * + * XXX: simply printing usage information in case of + * invalid arguments isn't particular user friendly. + */ + while (++argc_pos < argc) { - FD_ZERO(&rfds); +#ifdef _WIN32 + /* Check to see if the service must be installed or uninstalled */ + if (strncmp(argv[argc_pos], "--install", 9) == 0) + { + const char *pName = argv[argc_pos] + 9; + if (*pName == ':') + pName++; + exit( (install_service(pName)) ? 0 : 1 ); + } + else if (strncmp(argv[argc_pos], "--uninstall", + 11) == 0) + { + const char *pName = argv[argc_pos] + 11; + if (*pName == ':') + pName++; + exit((uninstall_service(pName)) ? 0 : 1); + } + else if (strcmp(argv[argc_pos], "--service" ) == 0) + { + bRunAsService = TRUE; + w32_set_service_cwd(); + atexit(w32_service_exit_notify); + } + else +#endif /* defined(_WIN32) */ - FD_SET(csp->cfd, &rfds); - FD_SET(csp->sfd, &rfds); - n = select(maxfd+1, &rfds, NULL, NULL, NULL); +#if !defined(_WIN32) || defined(_WIN_CONSOLE) - if (n < 0) + if (strcmp(argv[argc_pos], "--help") == 0) { - log_error(LOG_LEVEL_ERROR, "select() failed!: %E"); - return; + usage(argv[0]); } - /* this is the body of the browser's request - * just read it and write it. - */ - - if (FD_ISSET(csp->cfd, &rfds)) + else if(strcmp(argv[argc_pos], "--version") == 0) { - n = read_socket(csp->cfd, buf, sizeof(buf)); + printf("Privoxy version " VERSION " (" HOME_PAGE_URL ")\n"); + exit(0); + } - if (n <= 0) - { - break; /* "game over, man" */ - } +#if defined(unix) - if (write_socket(csp->sfd, buf, n) != n) - { - log_error(LOG_LEVEL_ERROR, "write to: %s failed: %E", http->host); - return; - } - continue; + else if (strcmp(argv[argc_pos], "--no-daemon" ) == 0) + { + no_daemon = 1; } - /* - * The server wants to talk. It could be the header or the body. - * If `hdr' is null, then it's the header otherwise it's the body. - * FIXME: Does `hdr' really mean `host'? - */ - + else if (strcmp(argv[argc_pos], "--pidfile" ) == 0) + { + if (++argc_pos == argc) usage(argv[0]); + pidfile = strdup(argv[argc_pos]); + } - if (FD_ISSET(csp->sfd, &rfds)) + else if (strcmp(argv[argc_pos], "--user" ) == 0) { - fflush( 0 ); - n = read_socket(csp->sfd, buf, sizeof(buf) - 1); + if (++argc_pos == argc) usage(argv[argc_pos]); - if (n < 0) + if ((NULL != (p = strchr(argv[argc_pos], '.'))) && *(p + 1) != '0') { - log_error(LOG_LEVEL_ERROR, "read from: %s failed: %E", http->host); - - eno = safe_strerror(errno); - sprintf(buf, CFAIL, http->hostport, eno); - freez(eno); - - log_error(LOG_LEVEL_CLF, "%s - - [%T] \"%s\" 503 0", - csp->ip_addr_str, http->cmd); - - write_socket(csp->cfd, buf, strlen(buf)); - return; + *p++ = '\0'; + if (NULL == (grp = getgrnam(p))) + { + log_error(LOG_LEVEL_FATAL, "Group %s not found.", p); + } } - /* Add a trailing zero. This lets filter_popups - * use string operations. - */ - buf[n] = '\0'; - -#ifdef KILLPOPUPS - /* Filter the popups on this read. */ - if (block_popups_now) + if (NULL == (pw = getpwnam(argv[argc_pos]))) { - filter_popups(buf, n); + log_error(LOG_LEVEL_FATAL, "User %s not found.", argv[argc_pos]); } -#endif /* def KILLPOPUPS */ - - /* Normally, this would indicate that we've read - * as much as the server has sent us and we can - * close the client connection. However, Microsoft - * in its wisdom has released IIS/5 with a bug that - * prevents it from sending the trailing \r\n in - * a 302 redirect header (and possibly other headers). - * To work around this if we've haven't parsed - * a full header we'll append a trailing \r\n - * and see if this now generates a valid one. - * - * This hack shouldn't have any impacts. If we've - * already transmitted the header or if this is a - * SSL connection, then we won't bother with this - * hack. So we only work on partially received - * headers. If we append a \r\n and this still - * doesn't generate a valid header, then we won't - * transmit anything to the client. - */ - if (n == 0) - { - /* This hack must only be enforced for headers. */ - if (server_body || http->ssl) - { -#ifdef PCRS - if (filtering) - { - p = re_process_buffer(csp); - hdr = sed(server_patterns, add_server_headers, csp); - n = strlen(hdr); - if ((write_socket(csp->cfd, hdr, n) != n) - || (write_socket(csp->cfd, p, csp->content_length) != csp->content_length)) - { - log_error(LOG_LEVEL_CONNECT, "write modified content to client failed: %E"); - return; - } - freez(hdr); - freez(p); - } -#endif /* def PCRS */ - break; /* "game over, man" */ - } - /* Let's pretend the server just sent us a blank line. */ - n = sprintf(buf, "\r\n"); + if (p != NULL) *--p = '\0'; + } - /* - * Now, let the normal header parsing algorithm below do its - * job. If it fails, we'll exit instead of continuing. - */ + else if (strcmp(argv[argc_pos], "--pre-chroot-nslookup" ) == 0) + { + if (++argc_pos == argc) usage(argv[0]); + pre_chroot_nslookup_to_load_resolver = strdup(argv[argc_pos]); + } - ms_iis5_hack = 1; - } + else if (strcmp(argv[argc_pos], "--chroot" ) == 0) + { + do_chroot = 1; + } +#endif /* defined(unix) */ + else if (argc_pos + 1 != argc) + { /* - * If this is an SSL connection or we're in the body - * of the server document, just write it to the client. + * This is neither the last command line + * option, nor was it recognized before, + * therefore it must be invalid. */ + usage(argv[0]); + } + else - if (server_body || http->ssl) - { -#ifdef PCRS - if (filtering) - { - add_to_iob(csp, buf, n); /* Buffer the body for filtering */ - } - else -#endif /* def PCRS */ - { - /* just write */ - if (write_socket(csp->cfd, buf, n) != n) - { - log_error(LOG_LEVEL_ERROR, "write to client failed: %E"); - return; - } - } - byte_count += n; - continue; - } - else - { - /* we're still looking for the end of the - * server's header ... (does that make header - * parsing an "out of body experience" ? - */ +#endif /* defined(_WIN32) && !defined(_WIN_CONSOLE) */ + { + configfile = argv[argc_pos]; + } - /* buffer up the data we just read */ - add_to_iob(csp, buf, n); + } /* -END- while (more arguments) */ - /* get header lines from the iob */ +#if defined(unix) + if ( *configfile != '/' ) + { + char cwd[BUFFER_SIZE]; + char *abs_file; + size_t abs_file_size; - while ((p = get_header(csp))) - { - if (*p == '\0') - { - /* see following note */ - break; - } - enlist(csp->headers, p); - freez(p); - } + /* make config-filename absolute here */ + if (NULL == getcwd(cwd, sizeof(cwd))) + { + perror("failed to get current working directory"); + exit( 1 ); + } - /* NOTE: there are no "empty" headers so - * if the pointer `p' is not NULL we must - * assume that we reached the end of the - * buffer before we hit the end of the header. - */ + /* XXX: why + 5? */ + abs_file_size = strlen(cwd) + strlen(configfile) + 5; + basedir = strdup(cwd); - if (p) - { - if (ms_iis5_hack) - { - /* Well, we tried our MS IIS/5 - * hack and it didn't work. - * The header is incomplete - * and there isn't anything - * we can do about it. - */ - break; - } - else - { - /* Since we have to wait for - * more from the server before - * we can parse the headers - * we just continue here. - */ - continue; - } - } + if (NULL == basedir || + NULL == (abs_file = malloc(abs_file_size))) + { + perror("malloc failed"); + exit( 1 ); + } + strlcpy(abs_file, basedir, abs_file_size); + strlcat(abs_file, "/", abs_file_size ); + strlcat(abs_file, configfile, abs_file_size); + configfile = abs_file; + } +#endif /* defined unix */ - /* we have now received the entire header. - * filter it and send the result to the client - */ - hdr = sed(server_patterns, add_server_headers, csp); - n = strlen(hdr); + files->next = NULL; + clients->next = NULL; - /* write the server's (modified) header to - * the client (along with anything else that - * may be in the buffer) - */ + /* XXX: factor out initialising after the next stable release. */ +#ifdef AMIGA + InitAmiga(); +#elif defined(_WIN32) + InitWin32(); +#endif -#ifdef KILLPOPUPS - /* Start blocking popups if appropriate. */ + /* Prepare mutexes if supported and necessary. */ + initialize_mutexes(); - if (csp->is_text && /* It's a text / * MIME-Type */ - !http->ssl && /* We talk plaintext */ - block_popups) /* Policy allows */ - { - block_popups_now = 1; - } + /* Enable logging until further notice. */ + init_log_module(Argv[0]); + + random_seed = (unsigned int)time(NULL); +#ifdef HAVE_RANDOM + srandom(random_seed); +#elif defined (_WIN32) + /* + * See pick_from_range() in miscutil.c for details. + */ + log_error(LOG_LEVEL_INFO, + "No thread-safe PRNG implemented for your platform. " + "Using weak \'randomization\' factor which will " + "limit the already questionable usefulness of " + "header-time-randomizing actions (disabled by default)."); +#else + srand(random_seed); +#endif /* ifdef HAVE_RANDOM */ -#endif /* def KILLPOPUPS */ + /* + * 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 signals (FIXME: Why?) + */ +#if !defined(_WIN32) && !defined(__OS2__) && !defined(AMIGA) +{ + int idx; + const int catched_signals[] = { SIGTERM, SIGINT, SIGHUP, 0 }; + const int ignored_signals[] = { SIGPIPE, 0 }; -#ifdef PCRS - /* Start re_filtering this if appropriate. */ + for (idx = 0; catched_signals[idx] != 0; idx++) + { +#ifdef sun /* FIXME: Is it safe to check for HAVE_SIGSET instead? */ + if (sigset(catched_signals[idx], sig_handler) == SIG_ERR) +#else + if (signal(catched_signals[idx], sig_handler) == SIG_ERR) +#endif /* ifdef sun */ + { + log_error(LOG_LEVEL_FATAL, "Can't set signal-handler for signal %d: %E", catched_signals[idx]); + } + } - if (csp->is_text && /* It's a text / * MIME-Type */ - !http->ssl && /* We talk plaintext */ - pcrs_filter) /* Policy allows */ - { - filtering = 1; - } + for (idx = 0; ignored_signals[idx] != 0; idx++) + { + 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]); + } + } -/* This next line is a little ugly, but it simplifies the if statement below. */ -/* Basically if using PCRS, we want the OR condition to require "!filtering" */ -#define NOT_FILTERING_AND !filtering && +} +#else /* ifdef _WIN32 */ +# ifdef _WIN_CONSOLE + /* + * We *are* in a windows console app. + * Print a verbose messages about FAQ's and such + */ + printf("%s", win32_blurb); +# endif /* def _WIN_CONSOLE */ +#endif /* def _WIN32 */ -#else /* not def PCRS */ -#define NOT_FILTERING_AND + /* Initialize the CGI subsystem */ + cgi_init_error_messages(); -#endif /* def PCRS */ + /* + * 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; +#if 0 + int fd; +#endif - if (NOT_FILTERING_AND ((write_socket(csp->cfd, hdr, n) != n) - || (n = flush_socket(csp->cfd, csp) < 0))) - { - log_error(LOG_LEVEL_CONNECT, "write header to client failed: %E"); + if (!no_daemon) + { + pid = fork(); - /* the write failed, so don't bother - * mentioning it to the client... - * it probably can't hear us anyway. - */ - freez(hdr); - return; - } + if ( pid < 0 ) /* error */ + { + perror("fork"); + exit( 3 ); + } + 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(); +#else /* !1 */ +#ifdef __FreeBSD__ + setpgrp(0,0); +#else /* ndef __FreeBSD__ */ + setpgrp(); +#endif /* ndef __FreeBSD__ */ + fd = open("/dev/tty", O_RDONLY); + if ( fd ) + { + /* no error check here */ + ioctl( fd, TIOCNOTTY,0 ); + close ( fd ); + } +#endif /* 1 */ + /* + * stderr (fd 2) will be closed later on, when the + * log file has been parsed. + */ - NOT_FILTERING_AND (byte_count += n); + close( 0 ); + close( 1 ); + chdir("/"); - /* we're finished with the server's header */ + } /* -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 (setgid((NULL != grp) ? grp->gr_gid : pw->pw_gid)) + { + 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); + } + /* Read the time zone file from /etc before doing chroot. */ + tzset(); + if (NULL != pre_chroot_nslookup_to_load_resolver + && '\0' != pre_chroot_nslookup_to_load_resolver[0]) + { + /* Initialize resolver library. */ + (void) resolve_hostname_to_ip(pre_chroot_nslookup_to_load_resolver); + } + 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]; - freez(hdr); - server_body = 1; + strlcpy(putenv_dummy, "HOME=/", sizeof(putenv_dummy)); + if (putenv(putenv_dummy) != 0) + { + log_error(LOG_LEVEL_FATAL, "Cannot putenv(): HOME"); + } - /* If this was a MS IIS/5 hack then it means - * the server has already closed the - * connection. Nothing more to read. Time - * to bail. - */ - if (ms_iis5_hack) - { - break; - } + snprintf(putenv_dummy, sizeof(putenv_dummy), "USER=%s", pw->pw_name); + if (putenv(putenv_dummy) != 0) + { + log_error(LOG_LEVEL_FATAL, "Cannot putenv(): USER"); } - continue; } - - return; /* huh? we should never get here */ } - - log_error(LOG_LEVEL_CLF, "%s - - [%T] \"%s\" 200 %d", - csp->ip_addr_str, http->cmd, byte_count); -} - - -/********************************************************************* - * - * Function : serve - * - * Description : This is little more than chat. We only "serve" to - * to close any socket that chat may have opened. - * - * Parameters : - * 1 : csp = Current client state (buffers, headers, etc...) - * - * 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); - - if (csp->sfd >= 0) + else if (do_chroot) { - close_socket(csp->sfd); + log_error(LOG_LEVEL_FATAL, "Cannot chroot without --user argument."); } +} +#endif /* defined unix */ - csp->active = 0; +#ifdef _WIN32 + /* This will be FALSE unless the command line specified --service + */ + if (bRunAsService) + { + /* Yup, so now we must attempt to establish a connection + * with the service dispatcher. This will only work if this + * process was launched by the service control manager to + * actually run as a service. If this isn't the case, i've + * known it take around 30 seconds or so for the call to return. + */ -} + /* The StartServiceCtrlDispatcher won't return until the service is stopping */ + if (w32_start_service_ctrl_dispatcher(w32ServiceDispatchTable)) + { + /* Service has run, and at this point is now being stopped, so just return */ + return 0; + } +#ifdef _WIN_CONSOLE + printf("Warning: Failed to connect to Service Control Dispatcher\nwhen starting as a service!\n"); +#endif + /* An error occurred. Usually it's because --service was wrongly specified + * and we were unable to connect to the Service Control Dispatcher because + * it wasn't expecting us and is therefore not listening. + * + * For now, just continue below to call the listen_loop function. + */ + } +#endif /* def _WIN32 */ -#ifdef __BEOS__ + listen_loop(); -/********************************************************************* - * - * Function : server_thread - * - * Description : We only exist to call `serve' in a threaded environment. - * - * Parameters : - * 1 : data = Current client state (buffers, headers, etc...) - * - * Returns : Always 0. - * - *********************************************************************/ -static int32 server_thread(void *data) -{ - serve((struct client_state *) data); - return 0; + /* NOTREACHED */ + return(-1); } -#endif - /********************************************************************* * - * Function : main + * Function : bind_port_helper * - * Description : Load the config file and start the listen loop. - * This function is a lot more *sane* with the `load_config' - * and `listen_loop' functions; although it stills does - * a *little* too much for my taste. + * Description : Bind the listen port. Handles logging, and aborts + * on failure. * * Parameters : - * 1 : argc = Number of parameters (including $0). - * 2 : argv = Array of (char *)'s to the parameters. - * - * Returns : 1 if : can't open config file, unrecognized directive, - * stats requested in multi-thread mode, can't open the - * log file, can't open the jar file, listen port is invalid, - * any load fails, and can't bind port. + * 1 : config = Privoxy configuration. Specifies port + * to bind to. * - * Else main never returns, the process must be signaled - * to terminate execution. Or, on Windows, use the - * "File", "Exit" menu option. + * Returns : Port that was opened. * *********************************************************************/ -#ifdef __MINGW32__ -int _main(int argc, const char *argv[]) -#else -int main(int argc, const char *argv[]) -#endif +static jb_socket bind_port_helper(struct configuration_spec * config) { - configfile = -#ifdef AMIGA - "AmiTCP:db/junkbuster/config" -#elif !defined(_WIN32) - "config" -#else - "junkbstr.txt" -#endif - ; + int result; + jb_socket bfd; -#if !defined(_WIN32) || defined(_WIN_CONSOLE) - if ((argc >= 2) && (strcmp(argv[1], "--help")==0)) + if (config->haddr == NULL) { - 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); + log_error(LOG_LEVEL_INFO, "Listening on port %d on all IP addresses", + config->hport); } - if ((argc >= 2) && (strcmp(argv[1], "--version")==0)) + else { - printf(VERSION "\n"); - exit(2); + log_error(LOG_LEVEL_INFO, "Listening on port %d on IP address %s", + config->hport, config->haddr); } -#endif /* !defined(_WIN32) || defined(_WIN_CONSOLE) */ - Argc = argc; - Argv = argv; + result = bind_port(config->haddr, config->hport, &bfd); - if (argc > 1) + if (result < 0) { - configfile = argv[1]; - } - - files->next = NULL; - -#ifdef AMIGA - InitAmiga(); -#elif defined(_WIN32) - InitWin32(); -#endif + 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; + } -#ifndef _WIN32 - signal(SIGPIPE, SIG_IGN); - signal(SIGCHLD, SIG_IGN); + config->need_bind = 0; -#else /* ifdef _WIN32 */ -# ifdef _WIN_CONSOLE - /* - * We *are* in a windows console app. - * Print a verbose messages about FAQ's and such - */ - printf(win32_blurb); -# endif /* def _WIN_CONSOLE */ -#endif /* def _WIN32 */ + return bfd; +} +#ifdef _WIN32 +/* Without this simple workaround we get this compiler warning from _beginthread + * warning C4028: formal parameter 1 different from declaration + */ +void w32_service_listen_loop(void *p) +{ listen_loop(); - - /* NOTREACHED */ - return(-1); - } +#endif /* def _WIN32 */ /********************************************************************* @@ -1138,51 +3479,67 @@ 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(_WIN32) && !defined(__BEOS__) && !defined(AMIGA) +#if !defined(FEATURE_PTHREAD) && !defined(_WIN32) && !defined(__BEOS__) && !defined(AMIGA) && !defined(__OS2__) while (waitpid(-1, NULL, WNOHANG) > 0) { /* zombie children */ } -#endif /* !defined(_WIN32) && !defined(__BEOS__) && !defined(AMIGA) */ +#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); + 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)); continue; } - memset(csp, '\0', sizeof(*csp)); - - csp->active = 1; - csp->sfd = -1; + csp->flags |= CSP_FLAG_ACTIVE; + csp->sfd = JB_INVALID_SOCKET; csp->config = config = load_config(); @@ -1203,26 +3560,10 @@ 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 ... "); + log_error(LOG_LEVEL_CONNECT, "Listening for new connections ... "); if (!accept_connection(csp, bfd)) { @@ -1231,7 +3572,7 @@ static void listen_loop(void) #ifdef AMIGA if(!childs) { - exit(1); + exit(1); } #endif freez(csp); @@ -1239,13 +3580,15 @@ static void listen_loop(void) } else { - log_error(LOG_LEVEL_CONNECT, "OK"); + log_error(LOG_LEVEL_CONNECT, "accepted connection from %s", csp->ip_addr_str); } -#if defined(TOGGLE) - /* by haroon - most of credit to srt19170 */ - csp->toggled_on = g_bToggleIJB; -#endif +#ifdef FEATURE_TOGGLE + if (global_toggle_state) +#endif /* def FEATURE_TOGGLE */ + { + csp->flags |= CSP_FLAG_TOGGLED_ON; + } if (run_loader(csp)) { @@ -1253,13 +3596,15 @@ static void listen_loop(void) /* Never get here - LOG_LEVEL_FATAL causes program exit */ } +#ifdef FEATURE_ACL if (block_acl(NULL,csp)) { - log_error(LOG_LEVEL_CONNECT, "Connection dropped due to ACL"); + log_error(LOG_LEVEL_CONNECT, "Connection from %s dropped due to ACL", csp->ip_addr_str); close_socket(csp->cfd); freez(csp); continue; } +#endif /* def FEATURE_ACL */ /* add it to the list of clients */ csp->next = clients->next; @@ -1272,10 +3617,35 @@ static void listen_loop(void) /* this is a switch () statment in the C preprocessor - ugh */ #undef SELECTED_ONE_OPTION +/* Use Pthreads in preference to native code */ +#if defined(FEATURE_PTHREAD) && !defined(SELECTED_ONE_OPTION) +#define SELECTED_ONE_OPTION + { + pthread_t the_thread; + pthread_attr_t attrs; + + pthread_attr_init(&attrs); + pthread_attr_setdetachstate(&attrs, PTHREAD_CREATE_DETACHED); + errno = pthread_create(&the_thread, &attrs, + (void * (*)(void *))serve, csp); + child_id = errno ? -1 : 0; + pthread_attr_destroy(&attrs); + } +#endif + #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 + +#if defined(__OS2__) && !defined(SELECTED_ONE_OPTION) +#define SELECTED_ONE_OPTION + child_id = _beginthread( + (void(* _Optlink)(void*))serve, + NULL, 64 * 1024, csp); #endif @@ -1300,13 +3670,23 @@ 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(), - NP_CloseOutput, FALSE, - NP_Name, (ULONG)"junkbuster child", - NP_StackSize, 200*1024, - TAG_DONE))) + +#ifdef __amigaos4__ + child_id = (int)CreateNewProcTags(NP_Entry, (ULONG)server_thread, + NP_Output, Output(), + NP_CloseOutput, FALSE, + NP_Name, (ULONG)"privoxy child", + NP_Child, TRUE, + TAG_DONE); +#else + child_id = (int)CreateNewProcTags(NP_Entry, (ULONG)server_thread, + NP_Output, Output(), + NP_CloseOutput, FALSE, + NP_Name, (ULONG)"privoxy child", + NP_StackSize, 200*1024, + TAG_DONE); +#endif + if(0 != child_id) { childs++; ((struct Task *)child_id)->tc_UserData = csp; @@ -1317,58 +3697,152 @@ static void listen_loop(void) #if !defined(SELECTED_ONE_OPTION) child_id = fork(); -#endif - -#undef SELECTED_ONE_OPTION -/* end of cpp switch () */ - - if (child_id < 0) /* failed */ - { - char buf[BUFSIZ]; - - log_error(LOG_LEVEL_ERROR, "can't fork: %E"); - - sprintf(buf , "JunkBuster: can't fork: errno = %d", errno); - - write_socket(csp->cfd, buf, strlen(buf)); - close_socket(csp->cfd); - csp->active = 0; - sleep(5); - continue; - } -#if !defined(_WIN32) && !defined(__BEOS__) && !defined(AMIGA) /* This block is only needed when using fork(). * When using threads, the server thread was * created and run by the call to _beginthread(). */ 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 /* parent */ + else if (child_id > 0) /* parent */ { /* in a fork()'d environment, the parent's * 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->active = 0; + csp->flags &= ~CSP_FLAG_ACTIVE; + } +#endif + +#undef SELECTED_ONE_OPTION +/* end of cpp switch () */ + + if (child_id < 0) /* failed */ + { + char buf[BUFFER_SIZE]; + + log_error(LOG_LEVEL_ERROR, "can't fork: %E"); + + snprintf(buf , sizeof(buf), "Privoxy: can't fork: errno = %d", errno); + + write_socket(csp->cfd, buf, strlen(buf)); + close_socket(csp->cfd); + csp->flags &= ~CSP_FLAG_ACTIVE; + sleep(5); + continue; } -#endif /* !defined(_WIN32) && !defined(__BEOS__) && !defined(AMIGA) */ } else { 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) + 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(); +#endif + + exit(0); +#endif /* FEATURE_GRACEFUL_TERMINATION */ }