--- parser3/src/targets/cgi/parser3.C 2020/11/13 23:34:10 1.313 +++ parser3/src/targets/cgi/parser3.C 2020/12/06 22:47:06 1.321 @@ -5,7 +5,7 @@ Author: Alexandr Petrosian (http://paf.design.ru) */ -volatile const char * IDENT_PARSER3_C="$Id: parser3.C,v 1.313 2020/11/13 23:34:10 moko Exp $"; +volatile const char * IDENT_PARSER3_C="$Id: parser3.C,v 1.321 2020/12/06 22:47:06 moko Exp $"; #include "pa_config_includes.h" @@ -38,20 +38,19 @@ volatile const char * IDENT_PARSER3_C="$ #define PARSER_CONFIG_ENV_NAME "CGI_PARSER_CONFIG" #define PARSER_LOG_ENV_NAME "CGI_PARSER_LOG" -static const char* filespec_to_process=0; // [file] -static const char* config_filespec=0; // -f option or next to the executable -static const char* httpd_host_port=0; // -p option -static bool mail_received=false; // -m option? [asked to parse incoming message to $mail:received] - -static char** argv_all = NULL; - -static bool cgi; ///< we were started as CGI? +static const char* filespec_to_process = 0; // [file] +static const char* httpd_host_port = 0; // -p option +static const char* config_filespec = 0; // -f option or from env or next to the executable if exists +static bool mail_received = false; // -m option? [asked to parse incoming message to $mail:received] +static char** argv_extra = NULL; +static char* parser3_filespec = 0; // argv[0] // for signal handlers Request *request=0; -// for die error logging -static Request_info request_info; +// for error logging +static Request_info request_info; // global for correct log() reporting +static const char* filespec_4log = NULL; // never null // SAPI @@ -71,12 +70,12 @@ static void log(const char* fmt, va_list opened=f!=0; #endif - if(!opened && config_filespec) { + if(!opened && filespec_4log) { char beside_config_path[MAX_STRING]; - strncpy(beside_config_path, config_filespec, MAX_STRING-1); beside_config_path[MAX_STRING-1]=0; + strncpy(beside_config_path, filespec_4log, MAX_STRING-1); beside_config_path[MAX_STRING-1]=0; if(!(rsplit(beside_config_path, '/') || rsplit(beside_config_path, '\\'))) { // strip filename // no path, just filename - beside_config_path[0]='.'; beside_config_path[1]=0; + strcpy(beside_config_path, "."); } char file_spec[MAX_STRING]; @@ -178,7 +177,7 @@ size_t SAPI::send_body(SAPI_Info& info, return info.send_body(buf, size); } -static void full_file_spec(const char* file_name, char *buf, size_t buf_size) { +static void full_disk_path(const char* file_name, char *buf, size_t buf_size) { if(file_name[0]=='/' #ifdef WIN32 || file_name[0] && file_name[1]==':' @@ -219,6 +218,24 @@ static void SIGPIPE_handler(int /*sig*/) } #endif +// requires pa_thread_request() under Windows in pa_stat() +static const char *locate_config(const char *config_filespec_option, const char *executable_path){ + if(!(filespec_4log = config_filespec_option)) { + filespec_4log=getenv(PARSER_CONFIG_ENV_NAME); + if(!filespec_4log) + filespec_4log=getenv(REDIRECT_PREFIX PARSER_CONFIG_ENV_NAME); + if(!filespec_4log){ + // next to the executable + char *beside_executable_path = pa_strdup(executable_path); + bool stripped_filename = rsplit(beside_executable_path, '/') || rsplit(beside_executable_path, '\\'); + filespec_4log = pa_strcat(stripped_filename ? beside_executable_path : "." /* no path, just filename */ , "/" AUTO_FILE_NAME); + if(!entry_exists(filespec_4log)) + return NULL; + } + } + return filespec_4log; +} + #ifdef WIN32 const char* maybe_reconstruct_IIS_status_in_qs(const char* original) { // 404;http://servername/page[?param=value...] @@ -268,15 +285,35 @@ public: } }; -static void connection_handler(SAPI_Info_HTTPD &info, HTTPD_Connection &connection){ +static void config_handler(SAPI_Info &info) { + char document_root_buf[MAX_STRING]; + full_disk_path("", document_root_buf, sizeof(document_root_buf)); + + request_info.document_root = document_root_buf; + request_info.uri = ""; + request_info.argv = argv_extra; + + // prepare to process request + Request request(info, request_info, String::Language(String::L_HTML|String::L_OPTIMIZE_BIT)); + { + // initing ::request ptr for signal handlers + RequestController rc(&request); + // only once + config_filespec = locate_config(config_filespec, parser3_filespec); + // process main auto.p only + request.core(config_filespec, false, String::Empty); + // clearing ::request in RequestController desctructor to prevent signal handlers from accessing invalid memory + } +} + +static void connection_handler(SAPI_Info_HTTPD &info, HTTPD_Connection &connection) { connection.read_header(); info.populate_env(); - // connection request info, still global for correct log() reporting - memset(&request_info, 0, sizeof(request_info)); - char document_root_buf[MAX_STRING]; - full_file_spec("", document_root_buf, sizeof(document_root_buf)); + full_disk_path("", document_root_buf, sizeof(document_root_buf)); + + memset(&request_info, 0, sizeof(request_info)); request_info.document_root = document_root_buf; request_info.path_translated = filespec_to_process; request_info.method = connection.method(); @@ -286,7 +323,7 @@ static void connection_handler(SAPI_Info request_info.content_length = connection.content_length(); request_info.cookie = info.get_env("HTTP_COOKIE"); request_info.mail_received = false; - request_info.argv = argv_all; + request_info.argv = argv_extra; // prepare to process request Request request(info, request_info, String::Language(String::L_HTML|String::L_OPTIMIZE_BIT)); @@ -299,9 +336,11 @@ static void connection_handler(SAPI_Info } } -static void httpd_mode(){ +static void httpd_mode() { int sock = HTTPD_Server::bind(httpd_host_port); + config_handler(*sapiInfo); + while(1){ try { HTTPD_Connection connection; @@ -325,7 +364,7 @@ static void httpd_mode(){ /** main workhorse */ -static void real_parser_handler() { +static void real_parser_handler(bool cgi) { // init libraries pa_globals_init(); @@ -387,18 +426,10 @@ static void real_parser_handler() { 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 (1)"); } else { // fcgiwrap minimalistic setup - - if(request_info.query_string && *request_info.query_string) { - char* reconstructed_uri = new(PointerFreeGC) char[strlen(path_info) + 1/*'?'*/+ strlen(request_info.query_string) + 1/*0*/]; - strcpy(reconstructed_uri, path_info); - strcat(reconstructed_uri, "?"); - strcat(reconstructed_uri, request_info.query_string); - request_info.uri = reconstructed_uri; - } else - request_info.uri = path_info; + request_info.uri = request_info.query_string && *request_info.query_string ? pa_strcat(path_info, "?", request_info.query_string) : path_info; } } else{ - full_file_spec("", document_root_buf, sizeof(document_root_buf)); + full_disk_path("", document_root_buf, sizeof(document_root_buf)); request_info.document_root = document_root_buf; request_info.uri = ""; } @@ -408,17 +439,10 @@ static void real_parser_handler() { request_info.cookie = getenv("HTTP_COOKIE"); request_info.mail_received = mail_received; - request_info.argv = argv_all; + request_info.argv = argv_extra; #ifdef PA_DEBUG_CGI_ENTRY_EXIT - log("request_info: method=%s, uri=%s, q=%s, dr=%s, pt=%s, cookies=%s, cl=%u", - request_info.method, - request_info.uri, - request_info.query_string, - request_info.document_root, - request_info.path_translated, - request_info.cookie, - request_info.content_length); + log("request_info: method=%s, uri=%s, q=%s, dr=%s, pt=%s", request_info.method, request_info.uri, request_info.query_string, request_info.document_root, request_info.path_translated); #endif // prepare to process request @@ -427,7 +451,7 @@ static void real_parser_handler() { // initing ::request ptr for signal handlers RequestController rc(&request); // process the request - request.core(config_filespec, strcasecmp(request_info.method, "HEAD")==0); + request.core(locate_config(config_filespec, parser3_filespec), strcasecmp(request_info.method, "HEAD")==0); // clearing ::request in RequestController destructor to prevent signal handlers from accessing invalid memory } @@ -436,9 +460,9 @@ static void real_parser_handler() { } #ifdef PA_SUPPRESS_SYSTEM_EXCEPTION -static const Exception call_real_parser_handler__do_PEH_return_it() { +static const Exception call_real_parser_handler__do_PEH_return_it(bool cgi) { try { - real_parser_handler(); + real_parser_handler(cgi); } catch(const Exception& e) { return e; } @@ -446,12 +470,12 @@ static const Exception call_real_parser_ return Exception(); } -static void call_real_parser_handler__supress_system_exception() { +static void call_real_parser_handler__supress_system_exception(bool cgi) { Exception parser_exception; LPEXCEPTION_POINTERS system_exception=0; __try { - parser_exception=call_real_parser_handler__do_PEH_return_it(); + parser_exception=call_real_parser_handler__do_PEH_return_it(cgi); } __except ( (system_exception=GetExceptionInformation()), EXCEPTION_EXECUTE_HANDLER) { if(system_exception) if(_EXCEPTION_RECORD *er=system_exception->ExceptionRecord) @@ -490,38 +514,17 @@ static void usage(const char* program) { exit(EINVAL); } -static void locate_config(const char *executable_path){ - if(!config_filespec) { - config_filespec=getenv(PARSER_CONFIG_ENV_NAME); - if(!config_filespec) - config_filespec=getenv(REDIRECT_PREFIX PARSER_CONFIG_ENV_NAME); - if(!config_filespec){ - // next to the executable - char beside_executable_path[MAX_STRING]; - strncpy(beside_executable_path, executable_path, MAX_STRING-1); beside_executable_path[MAX_STRING-1]=0; - if(!(rsplit(beside_executable_path, '/') || rsplit(beside_executable_path, '\\'))) { // strip filename - // no path, just filename - // @todo full path, not ./! - beside_executable_path[0]='.'; beside_executable_path[1]=0; - } - char config_filespec_buf[MAX_STRING]; - snprintf(config_filespec_buf, MAX_STRING, "%s/%s", beside_executable_path, AUTO_FILE_NAME); - if(entry_exists(config_filespec_buf)) - config_filespec=pa_strdup(config_filespec_buf); - } - } -} - int main(int argc, char *argv[]) { #ifdef PA_DEBUG_CGI_ENTRY_EXIT log("main: entry"); #endif + parser3_filespec = argv[0]; umask(2); // were we started as CGI? - cgi=(getenv("SERVER_SOFTWARE") || getenv("SERVER_NAME") || getenv("GATEWAY_INTERFACE") || getenv("REQUEST_METHOD")) && !getenv("PARSER_VERSION"); + bool cgi=(getenv("SERVER_SOFTWARE") || getenv("SERVER_NAME") || getenv("GATEWAY_INTERFACE") || getenv("REQUEST_METHOD")) && !getenv("PARSER_VERSION"); sapiInfo = cgi ? new SAPI_Info_CGI() : new SAPI_Info(); #ifdef SIGUSR1 @@ -536,7 +539,7 @@ int main(int argc, char *argv[]) { char *raw_filespec_to_process = NULL; if(cgi) { raw_filespec_to_process=getenv("PATH_TRANSLATED"); - argv_all=argv + 1; + argv_extra=argv + 1; } else { int optind=1; while(optind < argc){ @@ -590,7 +593,7 @@ int main(int argc, char *argv[]) { usage(argv[0]); } - argv_all=argv + optind; + argv_extra=argv + optind; } #ifdef _MSC_VER @@ -613,16 +616,14 @@ int main(int argc, char *argv[]) { _CrtSetReportFile( _CRT_WARN, _CRTDBG_FILE_STDERR ); #endif - char filespec_to_process_buf[MAX_STRING]; - if(raw_filespec_to_process && *raw_filespec_to_process){ - full_file_spec(raw_filespec_to_process, filespec_to_process_buf, sizeof(filespec_to_process_buf)); - filespec_to_process=filespec_to_process_buf; - } - - locate_config(argv[0]); - try { // global try - REAL_PARSER_HANDLER(); + char filespec_to_process_buf[MAX_STRING]; + if(raw_filespec_to_process && *raw_filespec_to_process){ + full_disk_path(raw_filespec_to_process, filespec_to_process_buf, sizeof(filespec_to_process_buf)); + filespec_to_process=filespec_to_process_buf; + } + + REAL_PARSER_HANDLER(cgi); } catch(const Exception& e) { // exception in unhandled exception SAPI::die("%s", e.comment()); }