--- parser3/src/targets/cgi/parser3.C 2007/08/17 08:16:11 1.243 +++ parser3/src/targets/cgi/parser3.C 2016/11/25 23:35:45 1.271 @@ -1,30 +1,26 @@ /** @file Parser: scripting and CGI main. - Copyright(c) 2001-2005 ArtLebedev Group (http://www.artlebedev.com) + Copyright (c) 2001-2015 Art. Lebedev Studio (http://www.artlebedev.com) Author: Alexandr Petrosian (http://paf.design.ru) */ -static const char * const IDENT_PARSER3_C="$Date: 2007/08/17 08:16:11 $"; +volatile const char * IDENT_PARSER3_C="$Id: parser3.C,v 1.271 2016/11/25 23:35:45 moko Exp $"; #include "pa_config_includes.h" -#if _MSC_VER -# include -#endif - #include "pa_sapi.h" #include "classes.h" #include "pa_common.h" #include "pa_request.h" #include "pa_socks.h" #include "pa_version.h" +#include "pa_vconsole.h" -#ifdef WIN32 -# include -# include "getopt.h" -#else -# include +#ifdef _MSC_VER +#include +#include +#include #endif // defines @@ -45,12 +41,15 @@ static const char * const IDENT_PARSER3_ #define PARSER_LOG_ENV_NAME "CGI_PARSER_LOG" /// IIS refuses to read bigger chunks -const size_t READ_POST_CHUNK_SIZE=0x400*0x400; // 1M +const size_t READ_POST_CHUNK_SIZE=0x400*0x400; // 1M static const char* argv0; static const char* config_filespec_cstr=0; static bool fail_on_config_read_problem=true; +static int args_skip=1; +static char** argv_all = NULL; + 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] @@ -106,19 +105,19 @@ static void log(const char* fmt, va_list time_t t=time(0); if(const char* stamp=ctime(&t)) { // never saw that if(size_t len=strlen(stamp)) // saw once stamp being ="" - fprintf(f, "[%.*s] [%u] ", len-1, stamp, + fprintf(f, "[%.*s] [%u] ", (int)len-1, stamp, (unsigned int)getpid() ); } // message - char buf[MAX_STRING]; - size_t size=vsnprintf(buf, MAX_STRING, fmt, args); - remove_crlf(buf, buf+size); + char buf[MAX_LOG_STRING]; + size_t size=vsnprintf(buf, MAX_LOG_STRING, fmt, args); + size=remove_crlf(buf, buf+size); fwrite(buf, size, 1, f); if(request_info) - fprintf(f, " [uri=%s, method=%s, cl=%u]", + fprintf(f, " [uri=%s, method=%s, cl=%lu]", request_info->uri? request_info->uri: "", request_info->method? request_info->method: "", request_info->content_length); @@ -151,13 +150,6 @@ void SAPI::log(SAPI_Info&, const char* f } static void die_or_abort(const char* fmt, va_list args, bool write_core) { - // log - - // logging is more important than user - // she can cancel download, we'd get SIGPIPE, - // nothing would be logged then - ::log(fmt, args); - // inform user char body[MAX_STRING]; @@ -165,11 +157,13 @@ static void die_or_abort(const char* fmt // prepare header // let's be honest, that's bad we couldn't produce valid output - SAPI::add_header_attribute(SAPI_info, "status", "500"); - SAPI::add_header_attribute(SAPI_info, "content-type", "text/plain"); + // capitalized headers passed for preventing malloc during capitalization + SAPI::add_header_attribute(SAPI_info, HTTP_STATUS_CAPITALIZED, "500"); + SAPI::add_header_attribute(SAPI_info, HTTP_CONTENT_TYPE_CAPITALIZED, "text/plain"); + // don't use 'format' function because it calls malloc char content_length_cstr[MAX_NUMBER]; snprintf(content_length_cstr, sizeof(content_length_cstr), "%u", content_length); - SAPI::add_header_attribute(SAPI_info, "content-length", content_length_cstr); + SAPI::add_header_attribute(SAPI_info, HTTP_CONTENT_LENGTH_CAPITALIZED, content_length_cstr); // send header SAPI::send_header(SAPI_info); @@ -179,13 +173,10 @@ static void die_or_abort(const char* fmt // exit & try to produce core dump[unix] or invoke debugger[Win32 Debug version] if(write_core) { -#if defined(WIN32) && !defined(_DEBUG) +#ifdef WIN32 // IIS with abort failes to show STDOUT, it just barks "abnormal program termination" exit(1); #else -#if _MSC_VER - _asm int 3; -#endif abort(); #endif } @@ -194,27 +185,39 @@ static void die_or_abort(const char* fmt } void SAPI::die(const char* fmt, ...) { - va_list args; + va_list args; + + // logging first, can't log inside die_or_abort due to vsnprintf (bug #106) + va_start(args,fmt); + ::log(fmt, args); + va_end(args); + va_start(args, fmt); - die_or_abort(fmt, args, false/*write core?*/); -//unreachable anyway va_end(args); + die_or_abort(fmt, args, false /*write core?*/); +// va_end(args); } void SAPI::abort(const char* fmt, ...) { - va_list args; + va_list args; + + // logging first, can't log inside die_or_abort due to vsnprintf (bug #106) + va_start(args,fmt); + ::log(fmt, args); + va_end(args); + va_start(args, fmt); - die_or_abort(fmt, args, true/*write core?*/); -//unreachable anyway va_end(args); + die_or_abort(fmt, args, true /*write core?*/); +// va_end(args); } -char* SAPI::get_env(SAPI_Info& , const char* name) { +char* SAPI::Env::get(SAPI_Info& , const char* name) { if(char *local=getenv(name)) return pa_strdup(local); else return 0; } -const char* const *SAPI::environment(SAPI_Info&) { +const char* const *SAPI::Env::get(SAPI_Info&) { #ifdef _MSC_VER extern char **_environ; return _environ; @@ -239,7 +242,7 @@ size_t SAPI::read_post(SAPI_Info& , char void SAPI::add_header_attribute(SAPI_Info& , const char* dont_store_key, const char* dont_store_value) { if( cgi && (!request || !request->console.was_used()) ) - printf("%s: %s\n", dont_store_key, dont_store_value); + printf("%s: %s\n", capitalize(dont_store_key), dont_store_value); } /// @todo intelligent cache-control @@ -267,8 +270,8 @@ static void full_file_spec(const char* f ) strncpy(buf, file_name, buf_size); else { - char cwd[MAX_STRING]; getcwd(cwd, MAX_STRING); - snprintf(buf, buf_size, "%s/%s", cwd, file_name); + char cwd[MAX_STRING]; + snprintf(buf, buf_size, "%s/%s", getcwd(cwd, MAX_STRING) ? cwd : "", file_name); } else buf[0]=0; @@ -302,9 +305,9 @@ static const String sigpipe_name(SIGPIPE static void SIGPIPE_handler(int /*sig*/){ Value* sigpipe=0; if(request) - sigpipe=request->main_class.get_element(sigpipe_name, request->main_class, false); + sigpipe=request->main_class.get_element(sigpipe_name); if(sigpipe && sigpipe->as_bool()) - log_signal("SIGPIPE"); + log_signal(SIGPIPE_NAME); execution_canceled=true; if(request) @@ -355,6 +358,18 @@ const char* maybe_reconstruct_IIS_status } #endif + +class RequestController { +public: + RequestController(Request* r){ + ::request=r; + } + ~RequestController(){ + ::request=0; + } +}; + + /** main workhorse @@ -415,7 +430,7 @@ static void real_parser_handler(const ch if(!script_name) SAPI::die("CGI: illegal call (missing SCRIPT_NAME)"); - const char* env_request_uri=getenv("REQUEST_URI"); + const char* env_request_uri=request_info.strip_absolute_uri(getenv("REQUEST_URI")); if(env_request_uri) request_info.uri=env_request_uri; else @@ -475,6 +490,9 @@ static void real_parser_handler(const ch request_info.cookie=getenv("HTTP_COOKIE"); request_info.mail_received=mail_received; + request_info.argv=argv_all; + request_info.args_skip=args_skip; + // get request_info ptr for signal handlers ::request_info=&request_info; if(execution_canceled) @@ -493,45 +511,45 @@ static void real_parser_handler(const ch // prepare to process request Request request(SAPI_info, request_info, - cgi ? String::Language(String::L_HTML|String::L_OPTIMIZE_BIT) : String::L_AS_IS, - true /* status_allowed */); + cgi ? String::Language(String::L_HTML|String::L_OPTIMIZE_BIT) : String::L_AS_IS); - // get request ptr for signal handlers - ::request=&request; + { + // get ::request ptr for signal handlers + RequestController rc(&request); - char config_filespec_buf[MAX_STRING]; - 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; + char config_filespec_buf[MAX_STRING]; + 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; - fail_on_config_read_problem=entry_exists(config_filespec_cstr); } - } - - // process the request - request.core( - config_filespec_cstr, fail_on_config_read_problem, - header_only); + + // process the request + request.core( + config_filespec_cstr, fail_on_config_read_problem, + header_only); - // no request [prevent signal handlers from accessing invalid memory] - ::request=0; + // ::request cleared in RequestController desctructor to prevent signal handlers from accessing invalid memory + } // finalize global variables pa_globals_done(); @@ -595,7 +613,7 @@ static void call_real_parser_handler__su static void usage(const char* program) { printf( "Parser/%s\n" - "Copyright(c) 2001-2007 ArtLebedev Group (http://www.artlebedev.com)\n" + "Copyright (c) 2001-2015 Art. Lebedev Studio (http://www.artlebedev.com)\n" "Author: Alexandr Petrosian (http://paf.design.ru)\n" "\n" "Usage: %s [options] file\n" @@ -614,26 +632,14 @@ int main(int argc, char *argv[]) { #ifdef PA_DEBUG_CGI_ENTRY_EXIT log("main: entry"); #endif - //_asm int 3; - GC_java_finalization=0; #ifndef PA_DEBUG_DISABLE_GC + GC_java_finalization=0; // Dont collect unless explicitly requested // this is quicker (~30% ), but less memory-efficient(~8%) // so deciding for speed GC_dont_gc=1; #endif -/* - - Array test; - test+=3; - test+=4; -// int a=test.count(); - int i=0; - scanf("%d", &i); - int b=test.get(i); -// int b=test.get(10); - printf("%d", b);//test.count());*/ #ifdef SIGUSR1 if(signal(SIGUSR1, SIGUSR1_handler)==SIG_ERR) @@ -651,19 +657,20 @@ int main(int argc, char *argv[]) { } #endif -#ifdef _DEBUG - //_crtBreakAlloc=46; -#endif + argv_all=argv; argv0=argv[0]; umask(2); // were we started as CGI? cgi= - getenv("SERVER_SOFTWARE") || - getenv("SERVER_NAME") || - getenv("GATEWAY_INTERFACE") || - getenv("REQUEST_METHOD"); + ( + getenv("SERVER_SOFTWARE") || + getenv("SERVER_NAME") || + getenv("GATEWAY_INTERFACE") || + getenv("REQUEST_METHOD") + ) + && !getenv("PARSER_VERSION"); char *raw_filespec_to_process; if(cgi) { @@ -671,41 +678,47 @@ int main(int argc, char *argv[]) { if(raw_filespec_to_process && !*raw_filespec_to_process) raw_filespec_to_process=0; } else { - optind = 1; - opterr = 0; - int c; - while((c = getopt(argc, argv, "hf:" -#ifdef WITH_MAILRECEIVE - "m" -#endif - )) > 0) { - switch (c) { - case 'h': - usage(argv[0]); - break; - case 'f': - config_filespec_cstr=optarg; + int optind=1; + while(optind < argc){ + char *carg = argv[optind]; + if(carg[0] != '-') break; + + for(size_t k = 1; k < strlen(carg); k++){ + char c = carg[k]; + switch (c) { + case 'h': + usage(argv[0]); + break; + case 'f': + if(optind < argc - 1){ + optind++; + config_filespec_cstr=argv[optind]; + } + break; #ifdef WITH_MAILRECEIVE - case 'm': - mail_received=true; - break; -#endif - default: - fprintf(stderr, "%s: invalid option '%c'\n", argv[0], optopt); - usage(argv[0]); - break; + case 'm': + mail_received=true; + break; +#endif + default: + fprintf(stderr, "%s: invalid option '%c'\n", argv[0], c); + usage(argv[0]); + break; + } } + optind++; } - if (optind != argc - 1) { + + if (optind > argc - 1) { fprintf(stderr, "%s: file not specified\n", argv[0]); usage(argv[0]); } - - raw_filespec_to_process=argv[optind++]; + raw_filespec_to_process=argv[optind]; + args_skip=optind; } -#ifdef WIN32 +#ifdef _MSC_VER setmode(fileno(stdin), _O_BINARY); setmode(fileno(stdout), _O_BINARY); setmode(fileno(stderr), _O_BINARY); @@ -720,7 +733,6 @@ int main(int argc, char *argv[]) { // Set flag to the new value _CrtSetDbgFlag( tmpFlag ); -// _CrtSetBreakAlloc(61); _CrtSetReportMode( _CRT_WARN, _CRTDBG_MODE_FILE ); _CrtSetReportFile( _CRT_WARN, _CRTDBG_FILE_STDERR ); @@ -754,10 +766,12 @@ int main(int argc, char *argv[]) { int content_length=strlen(buf); // prepare header - SAPI::add_header_attribute(SAPI_info, "content-type", "text/plain"); + // capitalized headers are used for preventing malloc during capitalization + SAPI::add_header_attribute(SAPI_info, HTTP_CONTENT_TYPE_CAPITALIZED, "text/plain"); + // don't use 'format' function because it calls malloc char content_length_cstr[MAX_NUMBER]; snprintf(content_length_cstr, MAX_NUMBER, "%u", content_length); - SAPI::add_header_attribute(SAPI_info, "content-length", content_length_cstr); + SAPI::add_header_attribute(SAPI_info, HTTP_CONTENT_LENGTH_CAPITALIZED, content_length_cstr); // send header SAPI::send_header(SAPI_info);