--- parser3/src/targets/cgi/parser3.C 2009/08/27 10:21:28 1.252 +++ parser3/src/targets/cgi/parser3.C 2013/07/22 15:33:31 1.263 @@ -1,16 +1,16 @@ /** @file Parser: scripting and CGI main. - Copyright(c) 2001-2009 ArtLebedev Group (http://www.artlebedev.com) + Copyright (c) 2001-2012 Art. Lebedev Studio (http://www.artlebedev.com) Author: Alexandr Petrosian (http://paf.design.ru) */ -static const char * const IDENT_PARSER3_C="$Date: 2009/08/27 10:21:28 $"; +volatile const char * IDENT_PARSER3_C="$Id: parser3.C,v 1.263 2013/07/22 15:33:31 moko Exp $"; #include "pa_config_includes.h" -#if _MSC_VER -# include +#ifdef _MSC_VER +#include #endif #include "pa_sapi.h" @@ -20,8 +20,9 @@ static const char * const IDENT_PARSER3_ #include "pa_socks.h" #include "pa_version.h" -#ifdef WIN32 -# include +#ifdef _MSC_VER +#include +#include #endif // defines @@ -106,7 +107,7 @@ 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() ); } @@ -118,7 +119,7 @@ static void log(const char* fmt, va_list 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 +152,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 +159,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, HTTP_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); @@ -194,17 +190,29 @@ 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) { @@ -239,7 +247,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 +275,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; @@ -355,6 +363,18 @@ const char* maybe_reconstruct_IIS_status } #endif + +class RequestController { +public: + RequestController(Request* r){ + ::request=r; + } + ~RequestController(){ + ::request=0; + } +}; + + /** main workhorse @@ -496,45 +516,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(); @@ -598,7 +618,7 @@ static void call_real_parser_handler__su static void usage(const char* program) { printf( "Parser/%s\n" - "Copyright(c) 2001-2009 ArtLebedev Group (http://www.artlebedev.com)\n" + "Copyright (c) 2001-2013 Art. Lebedev Studio (http://www.artlebedev.com)\n" "Author: Alexandr Petrosian (http://paf.design.ru)\n" "\n" "Usage: %s [options] file\n" @@ -664,10 +684,13 @@ int main(int argc, char *argv[]) { // 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) { @@ -764,10 +787,12 @@ int main(int argc, char *argv[]) { int content_length=strlen(buf); // prepare header - SAPI::add_header_attribute(SAPI_info, HTTP_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);