--- parser3/src/targets/cgi/parser3.C 2002/12/09 13:02:36 1.211 +++ parser3/src/targets/cgi/parser3.C 2003/01/31 16:05:59 1.216.2.2 @@ -1,11 +1,11 @@ /** @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/09 13:02:36 $"; +static const char* IDENT_PARSER3_C="$Date: 2003/01/31 16:05:59 $"; #include "pa_config_includes.h" @@ -50,8 +50,8 @@ 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 @@ -64,7 +64,7 @@ Request *request=0; // SAPI -static void log(const char *fmt, va_list args) { +static void log(const char* fmt, va_list args) { bool opened=false; FILE *f=0; @@ -93,7 +93,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,14 +114,14 @@ 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(Pool& , 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(global_pool); @@ -157,15 +157,20 @@ void SAPI::die(const char *fmt, ...) { // body SAPI::send_body(global_pool, 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) { +const char* SAPI::get_env(Pool& , const char* name) { return getenv(name); } -const char *const *SAPI::environment(Pool&) { +const char* const *SAPI::environment(Pool&) { #ifdef _MSC_VER extern char **_environ; return _environ; @@ -188,9 +193,9 @@ 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(Pool& , 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 @@ -209,7 +214,7 @@ void SAPI::send_body(Pool& , const void // -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 @@ -228,7 +233,7 @@ static void full_file_spec(const char *f #endif } -static void log_signal(const char *signal_name) { +static void log_signal(const char* signal_name) { SAPI::log(global_pool, request? "%s received. uri=%s, qs=%s" :"%s received. no request being processed", signal_name, @@ -260,8 +265,8 @@ 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); @@ -280,9 +285,9 @@ static void real_parser_handler( 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=SAPI::get_env(request_pool, "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=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; @@ -297,12 +302,21 @@ 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=SAPI::get_env(request_pool, "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=SAPI::get_env(request_pool, "PATH_INFO"); + if(!path_info) + SAPI::die("CGI: illegal call (missing PATH_INFO)"); + const char* script_name=SAPI::get_env(request_pool, "SCRIPT_NAME"); + if(!script_name) + SAPI::die("CGI: illegal call (missing SCRIPT_NAME)"); + + const char* env_request_uri=SAPI::get_env(request_pool, "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( strlen(path_info)+1/*'?'*/+ @@ -313,24 +327,48 @@ static void real_parser_handler( 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"); + 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(request_pool, "HTTP_COOKIE"); request_info.mail_received=mail_received; @@ -352,7 +390,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) @@ -404,8 +442,8 @@ static void real_parser_handler( } 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 { @@ -445,9 +483,9 @@ static void failed_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" @@ -565,7 +603,7 @@ int main(int argc, char *argv[]) { 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 @@ -583,13 +621,6 @@ int main(int argc, char *argv[]) { SAPI::die(""); #endif } - - -#ifndef WIN32 - // - if(!cgi) - SAPI::send_body(global_pool, "\n", 1); -#endif //_asm int 3; return 0;