--- parser3/src/targets/cgi/parser3.C 2002/08/14 10:52:28 1.193 +++ parser3/src/targets/cgi/parser3.C 2003/02/20 14:00:57 1.216.2.10 @@ -1,16 +1,15 @@ /** @file Parser: scripting and CGI main. - Copyright(c) 2001, 2002 ArtLebedev Group (http://www.artlebedev.com) + Copyright(c) 2001-2003 ArtLebedev Group (http://www.artlebedev.com) Author: Alexandr Petrosian (http://paf.design.ru) */ -static const char* IDENT_PARSER3_C="$Date: 2002/08/14 10:52:28 $"; +static const char* IDENT_PARSER3_C="$Date: 2003/02/20 14:00:57 $"; #include "pa_config_includes.h" #if _MSC_VER -# include # include #endif @@ -20,7 +19,6 @@ static const char* IDENT_PARSER3_C="$Dat #include "pa_request.h" #include "pa_socks.h" #include "pa_version.h" -#include "pool_storage.h" #ifdef WIN32 # include @@ -30,16 +28,7 @@ static const char* IDENT_PARSER3_C="$Dat #endif //#define DEBUG_POOL_MALLOC -//#define DEBUG_STRING_APPENDS_VS_EXPANDS -//#define DEBUG_MAILRECEIVE "test.eml" - -#ifdef DEBUG_STRING_APPENDS_VS_EXPANDS -extern ulong - string_piece_appends, - wcontext_result_size, - total_alloc_size, - string_string_shortcut_economy; -#endif +//#define DEBUG_MAILRECEIVE "mailreceive.eml" // consts @@ -49,17 +38,21 @@ extern ulong /// IIS refuses to read bigger chunks const size_t READ_POST_CHUNK_SIZE=0x400*0x400; // 1M -static const char *argv0; -static const char *config_filespec_cstr=0; +static const char* argv0; +static const char* config_filespec_cstr=0; static bool fail_on_config_read_problem=true; -static Pool *pool; // global pool [dont describe to doxygen: it confuses it with param names] 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) { +class SAPI_Info{} SAPI_info; + +static void log(const char* fmt, va_list args) { bool opened=false; FILE *f=0; @@ -83,9 +76,12 @@ static void log(const char *fmt, va_list if(!opened) f=stderr; + // use no memory [so that we could log out-of-memory error] + setbuf(f, 0); // stderr stream is unbuffered by default, but still... + // prefix time_t t=time(0); - if(const char *stamp=ctime(&t)) { // never saw that + if(const char* stamp=ctime(&t)) { // never saw that if(size_t len=strlen(stamp)) // saw once stamp being ="" fprintf(f, "[%.*s] ", len-1, stamp); } @@ -106,17 +102,17 @@ static void log(const char *fmt, va_list } // appends to parser3.log located beside my binary if openable, to stderr otherwize -void SAPI::log(Pool& , const char *fmt, ...) { +void SAPI::log(SAPI_Info&, const char* fmt, ...) { va_list args; va_start(args,fmt); ::log(fmt, args); va_end(args); } -void SAPI::die(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(SAPI_info); #endif va_list args; @@ -124,7 +120,7 @@ void SAPI::die(const char *fmt, ...) { // log // logging is more important than user - // she can cancel download, we'd get SIG_PIPE, + // she can cancel download, we'd get SIGPIPE, // nothing would be logged then ::log(fmt, args); @@ -137,26 +133,39 @@ 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(SAPI_info, "status", "500"); + SAPI::add_header_attribute(SAPI_info, "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(SAPI_info, "content-length", content_length_cstr); // send header - SAPI::send_header(*pool); + SAPI::send_header(SAPI_info); // body - SAPI::send_body(*pool, body, content_length); + SAPI::send_body(SAPI_info, body, content_length); +#ifdef WIN32 + // IIS with abort failes to show STDOUT, it just barks "abnormal program termination" exit(1); +#else + // exit & try to produce core dump + abort(); +#endif } -const char *SAPI::get_env(Pool& , const char *name) { - return getenv(name); +CharPtr SAPI::get_env(SAPI_Info& , const char* name) { + if(char *local=getenv(name)) { + size_t size=strlen(local)+1; + char *heap=new char[size]; + memcpy(heap, local, size); + return CharPtr(heap); + } + else + return CharPtr(0); } -const char *const *SAPI::environment(Pool&) { +const char* const *SAPI::environment(SAPI_Info&, Pool&) { #ifdef _MSC_VER extern char **_environ; return _environ; @@ -166,10 +175,10 @@ const char *const *SAPI::environment(Poo #endif } -size_t SAPI::read_post(Pool& , char *buf, size_t max_bytes) { +size_t SAPI::read_post(SAPI_Info& , 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; @@ -179,13 +188,13 @@ size_t SAPI::read_post(Pool& , char *buf return read_size; } -void SAPI::add_header_attribute(Pool& , const char *key, const char *value) { +void SAPI::add_header_attribute(SAPI_Info& , const char* dont_store_key, const char* dont_store_value) { if(cgi) - printf("%s: %s\n", key, value); + printf("%s: %s\n", dont_store_key, dont_store_value); } /// @todo intelligent cache-control -void SAPI::send_header(Pool& ) { +void SAPI::send_header(SAPI_Info& ) { if(cgi) { // puts("expires: Fri, 23 Mar 2001 09:32:23 GMT"); @@ -194,19 +203,19 @@ void SAPI::send_header(Pool& ) { } } -void SAPI::send_body(Pool& , const void *buf, size_t size) { +void SAPI::send_body(SAPI_Info& , const void *buf, size_t size) { stdout_write(buf, size); } // -static void full_file_spec(const char *file_name, char *buf, size_t buf_size) { +static void full_file_spec(const char* file_name, char *buf, size_t buf_size) { if(file_name) if(file_name[0]=='/' #ifdef WIN32 - || (file_name[0] && file_name[1]==':') + || file_name[0] && file_name[1]==':' #endif - ) + ) strncpy(buf, file_name, buf_size); else { char cwd[MAX_STRING]; getcwd(cwd, MAX_STRING); @@ -219,6 +228,28 @@ static void full_file_spec(const char *f #endif } +static void log_signal(const char* signal_name) { + SAPI::log(SAPI_info, request? "%s received. uri=%s, qs=%s" + :"%s received. no request being processed", + signal_name, + request && request->request_info.uri?request->request_info.uri:"-", + request && request->request_info.query_string?request->request_info.query_string:"-"); +} + +#ifdef SIGUSR1 +static void SIGUSR1_handler(int /*sig*/){ + log_signal("SIGUSR1"); +} +#endif + +#ifdef SIGPIPE +static void SIGPIPE_handler(int /*sig*/){ + log_signal("SIGPIPE"); + if(request) + request->interrupt(); +} +#endif + /** main workhorse @@ -229,33 +260,34 @@ main workhorse IIS5 todo find out proper 'illegal call' check */ static void real_parser_handler( - const char *filespec_to_process, - const char *request_method, bool header_only) { + const char* filespec_to_process, + const char* request_method, bool header_only) { // init socks - init_socks(*pool); + pa_init_socks(); - // init global classes - init_methoded_array(*pool); // init global variables - pa_globals_init(*pool); + pa_globals_init(); + // request pool, must be different ptr from global [used in VStateless_class.add_method] + Pool request_pool; + if(!filespec_to_process || !*filespec_to_process) SAPI::die("Parser/%s", PARSER_VERSION); // Request info - Request::Info 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(CharPtr env_document_root=SAPI::get_env(SAPI_info, "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(SAPI_info, "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; request_info.document_root=document_root_buf; } else throw Exception("parser.runtime", - 0, + Exception::undefined_source, "CGI: no PATH_INFO defined(in reinventing DOCUMENT_ROOT)"); } else { full_file_spec("", document_root_buf, sizeof(document_root_buf)); @@ -263,48 +295,80 @@ 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"); + CharPtr query_string=SAPI::get_env(SAPI_info, "QUERY_STRING"); request_info.query_string=query_string; if(cgi) { - if(const char *env_request_uri=SAPI::get_env(*pool, "REQUEST_URI")) + // few absolute obligatory + const char* path_info=SAPI::get_env(SAPI_info, "PATH_INFO"); + if(!path_info) + SAPI::die("CGI: illegal call (missing PATH_INFO)"); + const char* script_name=SAPI::get_env(SAPI_info, "SCRIPT_NAME"); + if(!script_name) + SAPI::die("CGI: illegal call (missing SCRIPT_NAME)"); + + const char* env_request_uri=SAPI::get_env(SAPI_info, "REQUEST_URI"); + if(env_request_uri) request_info.uri=env_request_uri; - else if(const char *path_info=SAPI::get_env(*pool, "PATH_INFO")) + else if(query_string) { - char *reconstructed_uri=(char *)pool->malloc( + char *reconstructed_uri=new(request_pool) char[ strlen(path_info)+1/*'?'*/+ - strlen(query_string)+1/*0*/); + strlen(query_string)+1/*0*/]; strcpy(reconstructed_uri, path_info); strcat(reconstructed_uri, "?"); strcat(reconstructed_uri, query_string); request_info.uri=reconstructed_uri; } else request_info.uri=path_info; - else - throw Exception("parser.runtime", - 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")) { - 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 + + if(env_request_uri) { // apache & others stuck to standards + /* + http://parser3/env.html?123 =OK + $request:uri=/env.html?123 + REQUEST_URI='/env.html?123' + SCRIPT_NAME='/cgi-bin/parser3' + PATH_INFO='/env.html' + + http://parser3/cgi-bin/parser3/env.html?123 =ERROR + $request:uri=/cgi-bin/parser3/env.html?123 + REQUEST_URI='/cgi-bin/parser3/env.html?123' + SCRIPT_NAME='/cgi-bin/parser3' + PATH_INFO='/env.html' + */ + size_t script_name_len=strlen(script_name); + size_t uri_len=strlen(env_request_uri); + if(strncmp(env_request_uri, script_name, script_name_len)==0 && + script_name_len != uri_len) // under IIS they are the same + SAPI::die("CGI: illegal call (1)"); + } else { // seen on IIS5 + /* + http://nestle/env.html?123 =OK + $request:uri=/env.html?123 + REQUEST_URI='' + SCRIPT_NAME='/env.html' + PATH_INFO='/env.html' + + http://nestle/cgi-bin/parser3.exe/env.html =ERROR + $request:uri=/env.html + REQUEST_URI='' + SCRIPT_NAME='/cgi-bin/parser3.exe' + PATH_INFO='/env.html' + */ + if(strcmp(script_name, path_info)!=0) + SAPI::die("CGI: illegal call (2)"); + } } 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(SAPI_info, "CONTENT_TYPE"); + const char* content_length=SAPI::get_env(SAPI_info, "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(SAPI_info, "HTTP_COOKIE"); request_info.mail_received=mail_received; + // prepare to process request - Request request(*pool, + Request request(request_pool, SAPI_info, request_info, /*#ifdef _DEBUG String::UL_HTML|String::UL_OPTIMIZE_BIT @@ -313,10 +377,13 @@ static void real_parser_handler( /*#endif*/ , true /* status_allowed */); - + + // get request ptr for signal handlers + ::request=&request; + char config_filespec_buf[MAX_STRING]; if(!config_filespec_cstr) { - const char *config_by_env=getenv(PARSER_CONFIG_ENV_NAME); + 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) @@ -336,7 +403,7 @@ static void real_parser_handler( "%s/%s", beside_binary_path, AUTO_FILE_NAME); config_filespec_cstr=config_filespec_buf; - fail_on_config_read_problem=false; + fail_on_config_read_problem=entry_exists(config_filespec_cstr); } } @@ -344,29 +411,22 @@ static void real_parser_handler( request.core( config_filespec_cstr, fail_on_config_read_problem, header_only); + + // no request [prevent signal handlers from accessing invalid memory] + ::request=0; // - done_socks(); + pa_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, - "string piece appends=%lu, wcontext_result_size=%lu, string_string_shortcut_economy_closer=%lu, total_alloc_size=%lu", - string_piece_appends, - wcontext_result_size, - string_string_shortcut_economy, - total_alloc_size); -#endif - } static void call_real_parser_handler__do_SEH( - const char *filespec_to_process, - const char *request_method, bool header_only) { + const char* filespec_to_process, + const char* request_method, bool header_only) { #if _MSC_VER && !defined(_DEBUG) LPEXCEPTION_POINTERS system_exception=0; __try { @@ -393,22 +453,9 @@ static void call_real_parser_handler__do #endif } -#if _MSC_VER -int failed_new(size_t size) { - SAPI::die("out of memory in 'new', failed to allocated %u bytes", size); - return 0; // not reached -} -#endif - -#ifdef HAVE_SET_NEW_HANDLER -static void failed_new() { - SAPI::die("out of memory in 'new'"); -} -#endif - -static void usage(const char *program) { +static void usage(const char* program) { printf( - "Parser/%s Copyright(c) 2001, 2002 ArtLebedev Group (http://www.artlebedev.com)\n" + "Parser/%s Copyright(c) 2001-2003 ArtLebedev Group (http://www.artlebedev.com)\n" "Author: Alexandr Petrosian (http://paf.design.ru)\n" "\n" "Usage: %s [options] file\n" @@ -424,9 +471,15 @@ static void usage(const char *program) { } int main(int argc, char *argv[]) { - Pool_storage global_pool_storage; - Pool global_pool(&global_pool_storage); - pool=&global_pool; +#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 + #ifdef DEBUG_MAILRECEIVE if(FILE *fake_in=fopen(DEBUG_MAILRECEIVE, "rt")) { @@ -435,9 +488,9 @@ int main(int argc, char *argv[]) { #endif #ifdef _DEBUG -// _crtBreakAlloc=33112; + //_crtBreakAlloc=4042; #endif -// _asm int 3; + //_asm int 3; argv0=argv[0]; umask(2); @@ -450,9 +503,11 @@ int main(int argc, char *argv[]) { getenv("REQUEST_METHOD"); char *raw_filespec_to_process; - if(cgi) + if(cgi) { raw_filespec_to_process=getenv("PATH_TRANSLATED"); - else { + if(raw_filespec_to_process && !*raw_filespec_to_process) + raw_filespec_to_process=0; + } else { optind = 1; opterr = 0; int c; @@ -494,7 +549,6 @@ int main(int argc, char *argv[]) { #endif #if _MSC_VER - _set_new_handler(failed_new); #ifdef _DEBUG // Get current flag @@ -511,14 +565,10 @@ int main(int argc, char *argv[]) { #endif -#ifdef HAVE_SET_NEW_HANDLER - std::set_new_handler(failed_new); -#endif - char filespec_to_process[MAX_STRING]; full_file_spec(raw_filespec_to_process, filespec_to_process, sizeof(filespec_to_process)); - const char *request_method=getenv("REQUEST_METHOD"); + const char* request_method=getenv("REQUEST_METHOD"); bool header_only=request_method && strcasecmp(request_method, "HEAD")==0; try { // global try @@ -536,13 +586,7 @@ int main(int argc, char *argv[]) { SAPI::die(""); #endif } - -#ifndef WIN32 - // - if(!cgi) - SAPI::send_body(*pool, "\n", 1); -#endif -//_asm int 3; + //_asm int 3; return 0; }