X-Git-Url: http://www.privoxy.org/gitweb/?a=blobdiff_plain;f=jcc.c;h=0a06e62d8704b1e72bcf313976d1f6f29bbf50f5;hb=27e7ab19921a75f023658b07d314719875be2062;hp=1b0cb5505a867f64b6a7c500e06032d0bbf106ce;hpb=d9ff96f6158dc9e9e64c216253ae35e75c13295c;p=privoxy.git diff --git a/jcc.c b/jcc.c index 1b0cb550..0a06e62d 100644 --- a/jcc.c +++ b/jcc.c @@ -1,19 +1,19 @@ -const char jcc_rcs[] = "$Id: jcc.c,v 1.44 2001/10/02 18:13:57 oes Exp $"; +const char jcc_rcs[] = "$Id: jcc.c,v 1.52 2001/10/26 20:11:20 jongfoster 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 * * 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,51 @@ const char jcc_rcs[] = "$Id: jcc.c,v 1.44 2001/10/02 18:13:57 oes Exp $"; * * Revisions : * $Log: jcc.c,v $ + * 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 * @@ -331,10 +376,18 @@ const char jcc_rcs[] = "$Id: jcc.c,v 1.44 2001/10/02 18:13:57 oes Exp $"; #else /* ifndef _WIN32 */ +# if !defined (__OS2__) # include -# include # include +# endif /* ndef __OS2__ */ +# include # include +# include + +#ifdef sun +#include +#endif /* sun */ + # include # ifdef __BEOS__ @@ -342,9 +395,14 @@ const char jcc_rcs[] = "$Id: jcc.c,v 1.44 2001/10/02 18:13:57 oes Exp $"; # include /* declarations for threads and stuff. */ # endif -# ifdef __EMX__ +# 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 @@ -352,6 +410,10 @@ const char jcc_rcs[] = "$Id: jcc.c,v 1.44 2001/10/02 18:13:57 oes Exp $"; #endif +#ifdef _DEBUG +int ldebug = 0; +#endif + #include "project.h" #include "list.h" #include "jcc.h" @@ -395,6 +457,13 @@ static int32 server_thread(void *data); #define sleep(N) Sleep(((N) * 1000)) #endif +#ifdef __OS2__ +#define sleep(N) DosSleep(((N) * 100)) +#endif + +#if defined(unix) +const char *basedir; +#endif /* defined unix */ /* The vanilla wafer. */ static const char VANILLA_WAFER[] = @@ -413,7 +482,7 @@ static const char VANILLA_WAFER[] = * * 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 + * main business of the communication. When this * function returns, the caller must close the client * socket handle. * @@ -432,7 +501,7 @@ static void chat(struct client_state *csp) { /* * This next lines are a little ugly, but they simplifies the if statements - * below. Basically if TOGGLE, then we want the if to test if the + * below. Basically if TOGGLE, then we want the if to test if the * CSP_FLAG_TOGGLED_ON flag ist set, else we don't. And if FEATURE_FORCE_LOAD, * then we want the if to test for CSP_FLAG_FORCED , else we don't */ @@ -442,7 +511,7 @@ static void chat(struct client_state *csp) # define IS_TOGGLED_ON_AND #endif /* ndef FEATURE_TOGGLE */ #ifdef FEATURE_FORCE_LOAD -# define IS_NOT_FORCED_AND !(csp->flags & CSP_FLAG_FORCED) && +# define IS_NOT_FORCED_AND !(csp->flags & CSP_FLAG_FORCED) && #else /* ifndef FEATURE_FORCE_LOAD */ # define IS_NOT_FORCED_AND #endif /* def FEATURE_FORCE_LOAD */ @@ -466,7 +535,7 @@ static void chat(struct client_state *csp) int gif_deanimate; /* bool, 1==will deanimate gifs */ /* Function that does the content filtering for the current request */ - char *(*content_filter)() = NULL; + char *(*content_filter)() = NULL; /* Skeleton for HTTP response, if we should intercept the request */ struct http_response *rsp; @@ -497,7 +566,7 @@ static void chat(struct client_state *csp) { continue; /* more to come! */ } - + #ifdef FEATURE_FORCE_LOAD /* If this request contains the FORCE_PREFIX, * better get rid of it now and set the force flag --oes @@ -508,7 +577,7 @@ static void chat(struct client_state *csp) strclean(req, FORCE_PREFIX); log_error(LOG_LEVEL_FORCE, "Enforcing request \"%s\".\n", req); csp->flags |= CSP_FLAG_FORCED; - } + } #endif /* def FEATURE_FORCE_LOAD */ @@ -539,28 +608,39 @@ static void chat(struct client_state *csp) * 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 + * 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. * - * drop = drop the HTTP request + * 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 | drop | - * | | | + * 0 | create | connect| + * | w/path | | * Forwarding +--------+--------+ * | | | - * 1 | pass | pass | - * | | | + * 1 | create | pass | + * | w/url | | * +--------+--------+ * */ - /* + /* * Determine the actions for this URL */ #ifdef FEATURE_TOGGLE @@ -575,7 +655,28 @@ static void chat(struct client_state *csp) url_actions(http, csp); } -#ifdef FEATURE_COOKIE_JAR + + /* + * Check if a CONNECT request is allowable: + * In the absence of a +limit-connect action, allow only port 443. + * If there is an action, allow whatever matches the specificaton. + */ + if(http->ssl) + { + if( ( !(csp->action->flags & ACTION_LIMIT_CONNECT) && csp->http->port != 443) + || (csp->action->flags & ACTION_LIMIT_CONNECT + && !match_portlist(csp->action->string[ACTION_STRING_LIMIT_CONNECT], csp->http->port)) ) + { + strcpy(buf, CFORBIDDEN); + write_socket(csp->cfd, buf, strlen(buf)); + + log_error(LOG_LEVEL_CONNECT, "Denying suspicious CONNECT request from %s", csp->ip_addr_str); + log_error(LOG_LEVEL_CLF, "%s - - [%T] \" \" 403 0", csp->ip_addr_str); + + return; + } + } + /* * Downgrade http version from 1.1 to 1.0 if +downgrade @@ -588,11 +689,11 @@ static void chat(struct client_state *csp) } /* - * (Re)build the HTTP request. If forwarding, use the whole URL, - * else, use only the path. + * (Re)build the HTTP request for non-SSL requests. + * If forwarding, use the whole URL, else, use only the path. */ if (http->ssl == 0) - { + { freez(http->cmd); http->cmd = strsav(http->cmd, http->gpc); @@ -610,10 +711,11 @@ static void chat(struct client_state *csp) http->cmd = strsav(http->cmd, " "); http->cmd = strsav(http->cmd, http->ver); - enlist(csp->headers, http->cmd); } + enlist(csp->headers, http->cmd); +#ifdef FEATURE_COOKIE_JAR /* * If we're logging cookies in a cookie jar, and the user has not * supplied any wafers, and the user has not told us to suppress the @@ -627,6 +729,7 @@ static void chat(struct client_state *csp) } #endif /* def FEATURE_COOKIE_JAR */ + #ifdef FEATURE_KILL_POPUPS block_popups = ((csp->action->flags & ACTION_NO_POPUPS) != 0); #endif /* def FEATURE_KILL_POPUPS */ @@ -657,17 +760,14 @@ static void chat(struct client_state *csp) enlist(csp->headers, p); freez(p); } - - /* We have a request. */ - - /* - * Now, check to see if we need to intercept it, i.e. - * If + /* + * We have a request. Now, check to see if we need to + * intercept it, i.e. If .. */ - + if ( /* a CGI call was detected and answered */ - (NULL != (rsp = dispatch_cgi(csp))) + (NULL != (rsp = dispatch_cgi(csp))) /* or we are enabled and... */ || (IS_ENABLED_AND ( @@ -682,7 +782,7 @@ static void chat(struct client_state *csp) /* ..or a fast redirect kicked in */ #ifdef FEATURE_FAST_REDIRECTS - || (((csp->action->flags & ACTION_FAST_REDIRECTS) != 0) && + || (((csp->action->flags & ACTION_FAST_REDIRECTS) != 0) && (NULL != (rsp = redirect_url(csp)))) #endif /* def FEATURE_FAST_REDIRECTS */ )) @@ -691,7 +791,7 @@ static void chat(struct client_state *csp) /* Write the answer to the client */ if ((write_socket(csp->cfd, rsp->head, rsp->head_length) != rsp->head_length) || (write_socket(csp->cfd, rsp->body, rsp->content_length) != rsp->content_length)) - { + { log_error(LOG_LEVEL_ERROR, "write to: %s failed: %E", http->host); } @@ -702,7 +802,7 @@ static void chat(struct client_state *csp) /* Log (FIXME: All intercept reasons apprear as "crunch" with Status 200) */ 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); + log_error(LOG_LEVEL_CLF, "%s - - [%T] \"%s\" 200 3", csp->ip_addr_str, http->cmd); /* Clean up and return */ free_http_response(rsp); @@ -734,14 +834,14 @@ static void chat(struct client_state *csp) { rsp = error_response(csp, "no-such-domain", errno); - log_error(LOG_LEVEL_CLF, "%s - - [%T] \"%s\" 404 0", + log_error(LOG_LEVEL_CLF, "%s - - [%T] \"%s\" 404 0", csp->ip_addr_str, http->cmd); } else { rsp = error_response(csp, "connect-failed", errno); - log_error(LOG_LEVEL_CLF, "%s - - [%T] \"%s\" 503 0", + log_error(LOG_LEVEL_CLF, "%s - - [%T] \"%s\" 503 0", csp->ip_addr_str, http->cmd); } @@ -750,7 +850,7 @@ static void chat(struct client_state *csp) { if ((write_socket(csp->cfd, rsp->head, rsp->head_length) != rsp->head_length) || (write_socket(csp->cfd, rsp->body, rsp->content_length) != rsp->content_length)) - { + { log_error(LOG_LEVEL_ERROR, "write to: %s failed: %E", http->host); } } @@ -778,8 +878,8 @@ static void chat(struct client_state *csp) log_error(LOG_LEVEL_CONNECT, "write header to: %s failed: %E", http->hostport); - log_error(LOG_LEVEL_CLF, "%s - - [%T] \"%s\" 503 0", - csp->ip_addr_str, http->cmd); + log_error(LOG_LEVEL_CLF, "%s - - [%T] \"%s\" 503 0", + csp->ip_addr_str, http->cmd); rsp = error_response(csp, "connect-failed", errno); @@ -787,7 +887,7 @@ static void chat(struct client_state *csp) { if ((write_socket(csp->cfd, rsp->head, n) != n) || (write_socket(csp->cfd, rsp->body, rsp->content_length) != rsp->content_length)) - { + { log_error(LOG_LEVEL_ERROR, "write to: %s failed: %E", http->host); } } @@ -804,8 +904,8 @@ static void chat(struct client_state *csp) * 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); + log_error(LOG_LEVEL_CLF, "%s - - [%T] \"%s\" 200 2\n", + csp->ip_addr_str, http->cmd); if (write_socket(csp->cfd, CSUCCEED, sizeof(CSUCCEED)-1) < 0) { @@ -878,8 +978,8 @@ static void chat(struct client_state *csp) { log_error(LOG_LEVEL_ERROR, "read from: %s failed: %E", http->host); - log_error(LOG_LEVEL_CLF, "%s - - [%T] \"%s\" 503 0", - csp->ip_addr_str, http->cmd); + log_error(LOG_LEVEL_CLF, "%s - - [%T] \"%s\" 503 0", + csp->ip_addr_str, http->cmd); rsp = error_response(csp, "connect-failed", errno); @@ -887,7 +987,7 @@ static void chat(struct client_state *csp) { if ((write_socket(csp->cfd, rsp->head, rsp->head_length) != rsp->head_length) || (write_socket(csp->cfd, rsp->body, rsp->content_length) != rsp->content_length)) - { + { log_error(LOG_LEVEL_ERROR, "write to: %s failed: %E", http->host); } } @@ -929,7 +1029,7 @@ static void chat(struct client_state *csp) */ if (n == 0) { - + if (server_body || http->ssl) { /* @@ -969,7 +1069,7 @@ static void chat(struct client_state *csp) } /* - * This is NOT the body, so + * This is NOT the body, so * Let's pretend the server just sent us a blank line. */ n = sprintf(buf, "\r\n"); @@ -992,17 +1092,17 @@ static void chat(struct client_state *csp) { if (content_filter) { - add_to_iob(csp, buf, n); + add_to_iob(csp, buf, n); /* * If the buffer limit will be reached on the next read, * switch to non-filtering mode, i.e. make & write the * header, flush the socket and get out of the way. */ - if (csp->iob->eod - csp->iob->buf + BUFFER_SIZE > csp->config->buffer_limit) + if (((size_t)(csp->iob->eod - csp->iob->buf)) + (size_t)BUFFER_SIZE > csp->config->buffer_limit) { log_error(LOG_LEVEL_ERROR, "Buffer size limit reached! Flushing and stepping back."); - + hdr = sed(server_patterns, add_server_headers, csp); n = strlen(hdr); byte_count += n; @@ -1174,8 +1274,8 @@ static void chat(struct client_state *csp) 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); + log_error(LOG_LEVEL_CLF, "%s - - [%T] \"%s\" 200 %d", + csp->ip_addr_str, http->cmd, byte_count); } @@ -1252,7 +1352,7 @@ static int32 server_thread(void *data) * 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 + * to terminate execution. Or, on Windows, use the * "File", "Exit" menu option. * *********************************************************************/ @@ -1262,6 +1362,8 @@ int real_main(int argc, const char *argv[]) int main(int argc, const char *argv[]) #endif { + int argc_pos = 1; + configfile = #ifdef AMIGA "AmiTCP:db/junkbuster/config" @@ -1287,16 +1389,51 @@ int main(int argc, const char *argv[]) printf(VERSION "\n"); exit(2); } +#ifdef _DEBUG + if ((argc >= 2) && (strcmp(argv[1], "-d")==0)) + { + ldebug++; + argc_pos++; + fprintf(stderr,"debugging enabled..\n"); + } +#endif /* _DEBUG */ #endif /* !defined(_WIN32) || defined(_WIN_CONSOLE) */ Argc = argc; Argv = argv; - if (argc > 1) + if (argc > argc_pos ) { - configfile = argv[1]; + configfile = argv[argc_pos]; } +#if defined(unix) + if ( *configfile != '/' ) + { + char *abs_file; + + DBG(1, ("configfile before '%s'\n",configfile) ); + + /* make config-filename absolute here */ + if ( !(basedir = getcwd( NULL, 1024 ))) + { + perror("get working dir"); + } + DBG(1, ("working dir '%s'\n",basedir) ); + if ( !(abs_file = malloc( strlen( basedir ) + strlen( configfile ) + 5 ))) + { + perror("malloc failed"); + exit( 1 ); + } + strcpy( abs_file, basedir ); + strcat( abs_file, "/" ); + strcat( abs_file, configfile ); + configfile = abs_file; + DBG(1, ("configfile after '%s'\n",configfile) ); + } +#endif /* defined unix */ + + files->next = NULL; #ifdef AMIGA @@ -1306,7 +1443,7 @@ int main(int argc, const char *argv[]) #endif -#ifndef _WIN32 +#if !defined(_WIN32) && !defined(__OS2__) signal(SIGPIPE, SIG_IGN); signal(SIGCHLD, SIG_IGN); @@ -1321,6 +1458,55 @@ int main(int argc, const char *argv[]) #endif /* def _WIN32 */ + /* Initialize the CGI subsystem */ + cgi_init_error_messages(); + +#if defined(unix) +{ + pid_t pid = 0; + int fd; + + /* + ** we make us a real daemon + */ +#ifdef _DEBUG + if ( !ldebug) +#endif + pid = fork(); + if ( pid < 0 ) /* error */ + { + perror("fork"); + exit( 3 ); + } + else if ( pid != 0 ) /* parent */ + { + exit( 0 ); + } + /* child */ + setpgrp(); + fd = open("/dev/tty", O_RDONLY); + if ( fd ) + { + /* no error check here */ + ioctl( fd, TIOCNOTTY,0 ); + close ( fd ); + } + /* should close stderr (fd 2) here too, but the test for existence + ** and load config file is done in listen_loop() and puts + ** some messages on stderr there. + */ +#ifdef _DEBUG + if ( !ldebug ) + close( 0 ); close( 1 ); +#else + close( 0 ); close( 1 ); +#endif /* _DEBUG */ + chdir("/"); + +} +#endif /* defined unix */ + + DBG(1, ("call listen_loop() \n") ); listen_loop(); /* NOTREACHED */ @@ -1357,8 +1543,8 @@ static void listen_loop(void) { 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", + "proxy running on port %d", + (NULL != config->haddr) ? config->haddr : "INADDR_ANY", config->hport, config->hport ); /* shouldn't get here */ @@ -1370,7 +1556,7 @@ static void listen_loop(void) while (FOREVER) { -#if !defined(FEATURE_PTHREAD) && !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 */ @@ -1414,8 +1600,8 @@ static void listen_loop(void) { 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", + "proxy running on port %d", + (NULL != config->haddr) ? config->haddr : "INADDR_ANY", config->hport, config->hport ); /* shouldn't get here */ @@ -1434,7 +1620,7 @@ static void listen_loop(void) #ifdef AMIGA if(!childs) { - exit(1); + exit(1); } #endif freez(csp); @@ -1502,6 +1688,15 @@ static void listen_loop(void) csp); #endif +#if defined(__OS2__) && !defined(SELECTED_ONE_OPTION) +#define SELECTED_ONE_OPTION + child_id = _beginthread( + serve, + NULL, + 64 * 1024, + csp); +#endif + #if defined(__BEOS__) && !defined(SELECTED_ONE_OPTION) #define SELECTED_ONE_OPTION {