--- parser3/src/targets/cgi/parser3.C 2002/12/05 11:07:09 1.210 +++ parser3/src/targets/cgi/parser3.C 2003/02/26 11:29:59 1.216.2.17 @@ -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/12/05 11:07:09 $"; +static const char* IDENT_PARSER3_C="$Date: 2003/02/26 11:29:59 $"; #include "pa_config_includes.h" #if _MSC_VER -# include # include #endif @@ -21,8 +20,6 @@ static const char* IDENT_PARSER3_C="$Dat #include "pa_socks.h" #include "pa_version.h" -#include "pool_storage.h" - #ifdef WIN32 # include # include "getopt.h" @@ -31,17 +28,8 @@ static const char* IDENT_PARSER3_C="$Dat #endif //#define DEBUG_POOL_MALLOC -//#define DEBUG_STRING_APPENDS_VS_EXPANDS //#define DEBUG_MAILRECEIVE "mailreceive.eml" -#ifdef DEBUG_STRING_APPENDS_VS_EXPANDS -extern ulong - string_piece_appends, - wcontext_result_size, - total_alloc_size, - string_string_shortcut_economy; -#endif - // consts #define REDIRECT_PREFIX "REDIRECT_" @@ -50,12 +38,11 @@ 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_storage global_pool_storage; ///< global pool storage -static Pool global_pool(&global_pool_storage); ///< global pool +static bool force_header_output=false; 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] @@ -64,7 +51,9 @@ 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; @@ -93,7 +82,7 @@ static void log(const char *fmt, va_list // 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); } @@ -114,17 +103,18 @@ 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, ...) { + //_asm int 3; #ifdef DEBUG_POOL_MALLOC extern void log_pool_stats(Pool& pool); - log_pool_stats(global_pool); + log_pool_stats(SAPI_info); #endif va_list args; @@ -145,26 +135,36 @@ 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(global_pool, "status", "500"); - SAPI::add_header_attribute(global_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(global_pool, "content-length", content_length_cstr); + SAPI::add_header_attribute(SAPI_info, "content-length", content_length_cstr); // send header - SAPI::send_header(global_pool); + SAPI::send_header(SAPI_info); // body - SAPI::send_body(global_pool, body, content_length); + SAPI::send_body(SAPI_info, body, content_length); +#ifdef WIN32 + //_asm int 3; + // 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); +char* SAPI::get_env(Pool& pool, SAPI_Info& , const char* name) { + if(char *local=getenv(name)) + return pool.copy(local); + else + return 0; } -const char *const *SAPI::environment(Pool&) { +const char* const *SAPI::environment(SAPI_Info&, Pool&) { #ifdef _MSC_VER extern char **_environ; return _environ; @@ -174,7 +174,7 @@ 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 { ssize_t chunk_size=read(fileno(stdin), @@ -187,14 +187,14 @@ size_t SAPI::read_post(Pool& , char *buf return read_size; } -void SAPI::add_header_attribute(Pool& , const char *key, const char *value) { - if(cgi) - printf("%s: %s\n", key, value); +void SAPI::add_header_attribute(SAPI_Info& , const char* dont_store_key, const char* dont_store_value) { + if(cgi || force_header_output) + printf("%s: %s\n", dont_store_key, dont_store_value); } /// @todo intelligent cache-control -void SAPI::send_header(Pool& ) { - if(cgi) { +void SAPI::send_header(SAPI_Info& ) { + if(cgi || force_header_output) { // puts("expires: Fri, 23 Mar 2001 09:32:23 GMT"); // header | body delimiter @@ -202,13 +202,13 @@ 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 @@ -227,12 +227,12 @@ static void full_file_spec(const char *f #endif } -static void log_signal(const char *signal_name) { - SAPI::log(global_pool, request? "%s received. uri=%s, qs=%s" +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->info.uri?request->info.uri:"-", - request && request->info.query_string?request->info.query_string:"-"); + request && request->request_info.uri?request->request_info.uri:"-", + request && request->request_info.query_string?request->request_info.query_string:"-"); } #ifdef SIGUSR1 @@ -259,36 +259,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(global_pool); + pa_init_socks(); - // init global classes - init_methoded_array(global_pool); // init global variables - pa_globals_init(global_pool); + pa_globals_init(); // request pool, must be different ptr from global [used in VStateless_class.add_method] - Pool request_pool(&global_pool_storage); + 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(request_pool, "DOCUMENT_ROOT")) + if(const char* env_document_root=getenv("DOCUMENT_ROOT")) request_info.document_root=env_document_root; - else if(const char *path_info=SAPI::get_env(request_pool, "PATH_INFO")) { + else if(const char* path_info=getenv("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)); @@ -296,47 +294,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(request_pool, "QUERY_STRING"); + const char* query_string=getenv("QUERY_STRING"); request_info.query_string=query_string; if(cgi) { - if(const char *env_request_uri=SAPI::get_env(request_pool, "REQUEST_URI")) + // few absolute obligatory + const char* path_info=getenv("PATH_INFO"); + if(!path_info) + SAPI::die("CGI: illegal call (missing PATH_INFO)"); + const char* script_name=getenv("SCRIPT_NAME"); + if(!script_name) + SAPI::die("CGI: illegal call (missing SCRIPT_NAME)"); + + const char* env_request_uri=getenv("REQUEST_URI"); + if(env_request_uri) request_info.uri=env_request_uri; - else if(const char *path_info=SAPI::get_env(request_pool, "PATH_INFO")) + else if(query_string) { - char *reconstructed_uri=(char *)request_pool.malloc( + CharPtr reconstructed_uri(new 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)"); - - // they've changed this under IIS5. - 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"); - } + + 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(request_pool, "CONTENT_TYPE"); - const char *content_length=SAPI::get_env(request_pool, "CONTENT_LENGTH"); + request_info.content_type=getenv("CONTENT_TYPE"); + const char* content_length=getenv("CONTENT_LENGTH"); request_info.content_length=(content_length?atoi(content_length):0); - request_info.cookie=SAPI::get_env(request_pool, "HTTP_COOKIE"); + request_info.cookie=getenv("HTTP_COOKIE"); request_info.mail_received=mail_received; // prepare to process request - Request request(request_pool, + Request request(request_pool, SAPI_info, request_info, /*#ifdef _DEBUG String::UL_HTML|String::UL_OPTIMIZE_BIT @@ -351,7 +382,7 @@ static void real_parser_handler( 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) @@ -384,69 +415,80 @@ static void real_parser_handler( ::request=0; // - done_socks(); + pa_done_socks(); #ifdef DEBUG_POOL_MALLOC extern void log_pool_stats(Pool& pool); log_pool_stats(request_pool); #endif - -#ifdef DEBUG_STRING_APPENDS_VS_EXPANDS - 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, - 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) { #if _MSC_VER && !defined(_DEBUG) - LPEXCEPTION_POINTERS system_exception=0; +# define PA_USE___TRY +struct Parser_executed { + bool with_system_exception; + LPEXCEPTION_POINTERS system_exception; +}; +#endif + +static +#ifdef PA_USE___TRY +Parser_executed +#else +void +#endif +call_real_parser_handler__do_SEH_return_it( + const char* filespec_to_process, + const char* request_method, bool header_only) { +#ifdef PA_USE___TRY + Parser_executed result={false}; __try { #endif real_parser_handler( filespec_to_process, request_method, header_only); -#if _MSC_VER && !defined(_DEBUG) +#ifdef PA_USE___TRY } __except ( - (system_exception=GetExceptionInformation()), + (result.system_exception=GetExceptionInformation()), EXCEPTION_EXECUTE_HANDLER) { - - if(system_exception) - if(_EXCEPTION_RECORD *er=system_exception->ExceptionRecord) - throw Exception(0, - 0, - "Exception 0x%08X at 0x%08X", er->ExceptionCode, er->ExceptionAddress); - else - throw Exception(0, 0, "Exception "); - else - throw Exception(0, 0, "Exception "); + //_asm int 3; + result.with_system_exception=true; } + return result; #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 -} +static void call_real_parser_handler__do_SEH( + const char* filespec_to_process, + const char* request_method, bool header_only) { +#ifdef PA_USE___TRY + Parser_executed executed= #endif + call_real_parser_handler__do_SEH_return_it(filespec_to_process, + request_method, header_only); -#ifdef HAVE_SET_NEW_HANDLER -static void failed_new() { - SAPI::die("out of memory in 'new'"); -} +#ifdef PA_USE___TRY + if(executed.with_system_exception) + if(executed.system_exception) + if(_EXCEPTION_RECORD *er=executed.system_exception->ExceptionRecord) + throw Exception(Exception::undefined_type, + Exception::undefined_source, + "Exception 0x%08X at 0x%08X", er->ExceptionCode, er->ExceptionAddress); + else + throw Exception(Exception::undefined_type, + Exception::undefined_source, + "Exception "); + else + throw Exception(Exception::undefined_type, + Exception::undefined_source, + "Exception "); #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" @@ -455,6 +497,7 @@ static void usage(const char *program) { " -m Parse mail, put received letter to $mail:received\n" #endif " -f config_file Use this config file (/path/to/auto.p)\n" + " -H Output CGI header\n" " -h Display usage information (this message)\n" , PARSER_VERSION, program); @@ -479,9 +522,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); @@ -502,7 +545,7 @@ int main(int argc, char *argv[]) { optind = 1; opterr = 0; int c; - while((c = getopt(argc, argv, "hf:" + while((c = getopt(argc, argv, "hHf:" #ifdef WITH_MAILRECEIVE "m" #endif @@ -511,6 +554,9 @@ int main(int argc, char *argv[]) { case 'h': usage(argv[0]); break; + case 'H': + force_header_output=true; + break; case 'f': config_filespec_cstr=optarg; break; @@ -540,14 +586,13 @@ int main(int argc, char *argv[]) { #endif #if _MSC_VER - _set_new_handler(failed_new); #ifdef _DEBUG // Get current flag int tmpFlag = _CrtSetDbgFlag( _CRTDBG_REPORT_FLAG ); // Turn on leak-checking bit - tmpFlag |= _CRTDBG_LEAK_CHECK_DF; +// tmpFlag |= _CRTDBG_LEAK_CHECK_DF; // Set flag to the new value _CrtSetDbgFlag( tmpFlag ); @@ -557,14 +602,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 @@ -577,19 +618,8 @@ int main(int argc, char *argv[]) { // and there could be out-of-memory exception SAPI::die("exception in request exception handler: %s", e.comment()); -#ifndef _DEBUG - } catch(...) { - SAPI::die(""); -#endif } - - -#ifndef WIN32 - // - if(!cgi) - SAPI::send_body(global_pool, "\n", 1); -#endif - //_asm int 3; +// _asm int 3; return 0; }