--- parser3/src/targets/cgi/parser3.C 2002/06/24 14:47:53 1.185 +++ parser3/src/targets/cgi/parser3.C 2002/11/20 13:37:23 1.201 @@ -3,10 +3,10 @@ Copyright(c) 2001, 2002 ArtLebedev Group (http://www.artlebedev.com) Author: Alexandr Petrosian (http://paf.design.ru) - - $Id: parser3.C,v 1.185 2002/06/24 14:47:53 paf Exp $ */ +static const char* IDENT_PARSER3_C="$Date: 2002/11/20 13:37:23 $"; + #include "pa_config_includes.h" #if _MSC_VER @@ -31,7 +31,7 @@ //#define DEBUG_POOL_MALLOC //#define DEBUG_STRING_APPENDS_VS_EXPANDS -//#define DEBUG_MAILRECEIVE "test2.eml" +//#define DEBUG_MAILRECEIVE "mailreceive.eml" #ifdef DEBUG_STRING_APPENDS_VS_EXPANDS extern ulong @@ -43,28 +43,6 @@ extern ulong // consts -#ifndef _PROFILE -extern const char *main_RCSIds[]; -#ifdef USE_SMTP -extern const char *smtp_RCSIds[]; -#endif -extern const char *gd_RCSIds[]; -extern const char *classes_RCSIds[]; -extern const char *types_RCSIds[]; -extern const char *parser3_RCSIds[]; -const char **RCSIds[]={ - main_RCSIds, -#ifdef USE_SMTP - smtp_RCSIds, -#endif - gd_RCSIds, - classes_RCSIds, - types_RCSIds, - parser3_RCSIds, - 0 -}; -#endif - #define REDIRECT_PREFIX "REDIRECT_" #define PARSER_CONFIG_ENV_NAME "CGI_PARSER_CONFIG" @@ -72,25 +50,40 @@ const char **RCSIds[]={ const size_t READ_POST_CHUNK_SIZE=0x400*0x400; // 1M static const char *argv0; -static Pool *pool; // global pool [dont describe to doxygen: it confuses it with param names] +static const char *config_filespec_cstr=0; +static bool fail_on_config_read_problem=true; + +static Pool_storage global_pool_storage; ///< global pool storage +static Pool global_pool(&global_pool_storage); ///< global pool static bool cgi; ///< we were started as CGI? static bool mail_received=false; ///< we were started with -m option? [asked to parse incoming message to $mail:received] +// for signal handlers +Request *request=0; + // SAPI static void log(const char *fmt, va_list args) { - bool opened; + bool opened=false; FILE *f=0; - if(argv0) { - // beside by binary + if(config_filespec_cstr) { + char beside_config_path[MAX_STRING]; + strncpy(beside_config_path, config_filespec_cstr, MAX_STRING-1); beside_config_path[MAX_STRING-1]=0; + if(!( + rsplit(beside_config_path, '/') || + rsplit(beside_config_path, '\\'))) { // strip filename + // no path, just filename + beside_config_path[0]='.'; beside_config_path[1]=0; + } + char file_spec[MAX_STRING]; - strncpy(file_spec, argv0, MAX_STRING-1); file_spec[MAX_STRING-1]=0; // filespec of my binary - rsplit(file_spec, '/'); rsplit(file_spec, '\\');// strip filename - strcat(file_spec, "/parser3.log"); + snprintf(file_spec, MAX_STRING, + "%s/parser3.log", beside_config_path); f=fopen(file_spec, "at"); + opened=f!=0; } - opened=f!=0; + // fallback to stderr if(!opened) f=stderr; @@ -127,7 +120,7 @@ void SAPI::log(Pool& , const char *fmt, void SAPI::die(const char *fmt, ...) { #ifdef DEBUG_POOL_MALLOC extern void log_pool_stats(Pool& pool); - log_pool_stats(*pool); + log_pool_stats(global_pool); #endif va_list args; @@ -148,17 +141,17 @@ void SAPI::die(const char *fmt, ...) { // prepare header // let's be honest, that's bad we couldn't produce valid output - SAPI::add_header_attribute(*pool, "status", "500"); - SAPI::add_header_attribute(*pool, "content-type", "text/plain"); + SAPI::add_header_attribute(global_pool, "status", "500"); + SAPI::add_header_attribute(global_pool, "content-type", "text/plain"); char content_length_cstr[MAX_NUMBER]; snprintf(content_length_cstr, sizeof(content_length_cstr), "%u", content_length); - SAPI::add_header_attribute(*pool, "content-length", content_length_cstr); + SAPI::add_header_attribute(global_pool, "content-length", content_length_cstr); // send header - SAPI::send_header(*pool); + SAPI::send_header(global_pool); // body - SAPI::send_body(*pool, body, content_length); + SAPI::send_body(global_pool, body, content_length); exit(1); } @@ -180,7 +173,7 @@ const char *const *SAPI::environment(Poo size_t SAPI::read_post(Pool& , char *buf, size_t max_bytes) { size_t read_size=0; do { - int chunk_size=read(fileno(stdin), + ssize_t chunk_size=read(fileno(stdin), buf+read_size, min(READ_POST_CHUNK_SIZE, max_bytes-read_size)); if(chunk_size<=0) break; @@ -230,6 +223,20 @@ static void full_file_spec(const char *f #endif } +#ifdef SIGUSR1 +void SIGUSR1_Handler(int /*sig*/){ + SAPI::log(global_pool, "SIGUSR1 received. url=", request?request->info.uri:""); +} +#endif + +#ifdef SIGPIPE +void SIGPIPE_Handler(int /*sig*/){ + SAPI::log(global_pool, "SIGPIPE received. url=", request?request->info.uri:""); + if(request) + request->interrupt(); +} +#endif + /** main workhorse @@ -243,23 +250,26 @@ static void real_parser_handler( const char *filespec_to_process, const char *request_method, bool header_only) { // init socks - init_socks(*pool); + init_socks(global_pool); // init global classes - init_methoded_array(*pool); + init_methoded_array(global_pool); // init global variables - pa_globals_init(*pool); + pa_globals_init(global_pool); - if(!filespec_to_process) + // request pool, must be different ptr from global [used in VStateless_class.add_method] + Pool request_pool(&global_pool_storage); + + if(!filespec_to_process || !*filespec_to_process) SAPI::die("Parser/%s", PARSER_VERSION); // Request info Request::Info request_info; char document_root_buf[MAX_STRING]; if(cgi) { - if(const char *env_document_root=SAPI::get_env(*pool, "DOCUMENT_ROOT")) + if(const char *env_document_root=SAPI::get_env(request_pool, "DOCUMENT_ROOT")) request_info.document_root=env_document_root; - else if(const char *path_info=SAPI::get_env(*pool, "PATH_INFO")) { + else if(const char *path_info=SAPI::get_env(request_pool, "PATH_INFO")) { // IIS size_t len=min(sizeof(document_root_buf)-1, strlen(filespec_to_process)-strlen(path_info)); memcpy(document_root_buf, filespec_to_process, len); document_root_buf[len]=0; @@ -274,14 +284,14 @@ static void real_parser_handler( } request_info.path_translated=filespec_to_process; request_info.method=request_method ? request_method : "GET"; - const char *query_string=SAPI::get_env(*pool, "QUERY_STRING"); + const char *query_string=SAPI::get_env(request_pool, "QUERY_STRING"); request_info.query_string=query_string; if(cgi) { - if(const char *env_request_uri=SAPI::get_env(*pool, "REQUEST_URI")) + if(const char *env_request_uri=SAPI::get_env(request_pool, "REQUEST_URI")) request_info.uri=env_request_uri; - else if(const char *path_info=SAPI::get_env(*pool, "PATH_INFO")) + else if(const char *path_info=SAPI::get_env(request_pool, "PATH_INFO")) if(query_string) { - char *reconstructed_uri=(char *)pool->malloc( + char *reconstructed_uri=(char *)request_pool.malloc( strlen(path_info)+1/*'?'*/+ strlen(query_string)+1/*0*/); strcpy(reconstructed_uri, path_info); @@ -295,27 +305,26 @@ static void real_parser_handler( 0, "CGI: no PATH_INFO defined(in reinventing REQUEST_URI)"); -#ifndef WIN32 // they've changed this under IIS5. - if(const char *script_name=SAPI::get_env(*pool, "SCRIPT_NAME")) { + if(const char *script_name=SAPI::get_env(request_pool, "SCRIPT_NAME")) { size_t script_name_len=strlen(script_name); size_t uri_len=strlen(request_info.uri); if(strncmp(request_info.uri,script_name, script_name_len)==0 && script_name_len != uri_len) // under IIS they are the same SAPI::die("CGI: illegal call"); } -#endif } else request_info.uri=""; - request_info.content_type=SAPI::get_env(*pool, "CONTENT_TYPE"); - const char *content_length=SAPI::get_env(*pool, "CONTENT_LENGTH"); + request_info.content_type=SAPI::get_env(request_pool, "CONTENT_TYPE"); + const char *content_length=SAPI::get_env(request_pool, "CONTENT_LENGTH"); request_info.content_length=(content_length?atoi(content_length):0); - request_info.cookie=SAPI::get_env(*pool, "HTTP_COOKIE"); + request_info.cookie=SAPI::get_env(request_pool, "HTTP_COOKIE"); request_info.mail_received=mail_received; + // prepare to process request - Request request(*pool, + Request request(request_pool, request_info, /*#ifdef _DEBUG String::UL_HTML|String::UL_OPTIMIZE_BIT @@ -324,46 +333,62 @@ static void real_parser_handler( /*#endif*/ , true /* status_allowed */); - - const char *config_filespec_cstr; + + // get request ptr for signal handlers + ::request=&request; +#ifdef SIGUSR1 + if(signal(SIGUSR1, SIGUSR1_Handler)==SIG_ERR) + SAPI::die("Can not set handler for SIGUSR1"); +#endif +#ifdef SIGPIPE + if(signal(SIGPIPE, SIGPIPE_Handler)==SIG_ERR) + SAPI::die("Can not set handler for SIGPIPE"); +#endif + char config_filespec_buf[MAX_STRING]; - const char *config_by_env=getenv(PARSER_CONFIG_ENV_NAME); - if(!config_by_env) - config_by_env=getenv(REDIRECT_PREFIX PARSER_CONFIG_ENV_NAME); - if(config_by_env) - config_filespec_cstr=config_by_env; - else { - // beside by binary - // @todo full path, not ./! - char beside_binary_path[MAX_STRING]; - strncpy(beside_binary_path, argv0, MAX_STRING-1); beside_binary_path[MAX_STRING-1]=0; // filespec of my binary - if(!( - rsplit(beside_binary_path, '/') || - rsplit(beside_binary_path, '\\'))) { // strip filename - // no path, just filename - beside_binary_path[0]='.'; beside_binary_path[1]=0; + if(!config_filespec_cstr) { + const char *config_by_env=getenv(PARSER_CONFIG_ENV_NAME); + if(!config_by_env) + config_by_env=getenv(REDIRECT_PREFIX PARSER_CONFIG_ENV_NAME); + if(config_by_env) + config_filespec_cstr=config_by_env; + else { + // beside by binary + char beside_binary_path[MAX_STRING]; + strncpy(beside_binary_path, argv0, MAX_STRING-1); beside_binary_path[MAX_STRING-1]=0; // filespec of my binary + if(!( + rsplit(beside_binary_path, '/') || + rsplit(beside_binary_path, '\\'))) { // strip filename + // no path, just filename + // @todo full path, not ./! + beside_binary_path[0]='.'; beside_binary_path[1]=0; + } + snprintf(config_filespec_buf, MAX_STRING, + "%s/%s", + beside_binary_path, AUTO_FILE_NAME); + config_filespec_cstr=config_filespec_buf; + fail_on_config_read_problem=entry_exists(config_filespec_cstr); } - snprintf(config_filespec_buf, MAX_STRING, - "%s/%s", - beside_binary_path, AUTO_FILE_NAME); - config_filespec_cstr=config_filespec_buf; } // process the request request.core( - config_filespec_cstr, false /*fail_on_read_problem*/, + config_filespec_cstr, fail_on_config_read_problem, header_only); + + // no request [prevent signal handlers from accessing invalid memory] + ::request=0; // done_socks(); #ifdef DEBUG_POOL_MALLOC extern void log_pool_stats(Pool& pool); - log_pool_stats(*pool); + log_pool_stats(request_pool); #endif #ifdef DEBUG_STRING_APPENDS_VS_EXPANDS - SAPI::log(*pool, + SAPI::log(global_pool, "string piece appends=%lu, wcontext_result_size=%lu, string_string_shortcut_economy_closer=%lu, total_alloc_size=%lu", string_piece_appends, wcontext_result_size, @@ -416,26 +441,23 @@ static void failed_new() { #endif static void usage(const char *program) { - fprintf(stderr, + printf( "Parser/%s Copyright(c) 2001, 2002 ArtLebedev Group (http://www.artlebedev.com)\n" "Author: Alexandr Petrosian (http://paf.design.ru)\n" "\n" "Usage: %s [options] file\n" "Options are:\n" #ifdef WITH_MAILRECEIVE - " -m Parse mail, put received letter to $mail:received\n" + " -m Parse mail, put received letter to $mail:received\n" #endif - " -h Display usage information (this message)\n" + " -f config_file Use this config file (/path/to/auto.p)\n" + " -h Display usage information (this message)\n" , PARSER_VERSION, program); exit(EINVAL); } int main(int argc, char *argv[]) { - Pool_storage global_pool_storage; - Pool global_pool(&global_pool_storage); - pool=&global_pool; - #ifdef DEBUG_MAILRECEIVE if(FILE *fake_in=fopen(DEBUG_MAILRECEIVE, "rt")) { dup2(fake_in->_file, 0/*STDIN_FILENO*/); @@ -464,7 +486,7 @@ int main(int argc, char *argv[]) { optind = 1; opterr = 0; int c; - while((c = getopt(argc, argv, "h" + while((c = getopt(argc, argv, "hf:" #ifdef WITH_MAILRECEIVE "m" #endif @@ -473,6 +495,9 @@ int main(int argc, char *argv[]) { case 'h': usage(argv[0]); break; + case 'f': + config_filespec_cstr=optarg; + break; #ifdef WITH_MAILRECEIVE case 'm': mail_received=true; @@ -546,7 +571,7 @@ int main(int argc, char *argv[]) { #ifndef WIN32 // if(!cgi) - SAPI::send_body(*pool, "\n", 1); + SAPI::send_body(global_pool, "\n", 1); #endif //_asm int 3; return 0;