--- parser3/src/targets/cgi/parser3.C 2020/12/06 22:36:10 1.320 +++ parser3/src/targets/cgi/parser3.C 2020/12/07 23:30:16 1.324 @@ -5,7 +5,7 @@ Author: Alexandr Petrosian (http://paf.design.ru) */ -volatile const char * IDENT_PARSER3_C="$Id: parser3.C,v 1.320 2020/12/06 22:36:10 moko Exp $"; +volatile const char * IDENT_PARSER3_C="$Id: parser3.C,v 1.324 2020/12/07 23:30:16 moko Exp $"; #include "pa_config_includes.h" @@ -42,6 +42,7 @@ static const char* filespec_to_process = 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* parser3_filespec = 0; // argv[0] static char** argv_extra = NULL; // for signal handlers @@ -49,7 +50,7 @@ Request *request=0; // for error logging static Request_info request_info; // global for correct log() reporting -static const char* filespec_4log = NULL; // never null +static const char* filespec_4log = NULL; // null only if system-wide auto.p used // SAPI @@ -122,7 +123,7 @@ static void log(const char* fmt, ...) { } #endif -// appends to parser3.log located next to the executable if openable, to stderr otherwize +// appends to parser3.log located next to the config file if openable, to stderr otherwize void SAPI::log(SAPI_Info&, const char* fmt, ...) { va_list args; va_start(args,fmt); @@ -217,6 +218,31 @@ static void SIGPIPE_handler(int /*sig*/) } #endif +// requires pa_thread_request() in entry_exists() under Windows +static const char *locate_config(const char *config_filespec_option, const char *executable_path){ + filespec_4log=config_filespec_option; + if(!filespec_4log) + 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 filespec_4log; +#ifdef SYSTEM_CONFIG_FILE + if(entry_exists(SYSTEM_CONFIG_FILE)){ + filespec_4log=NULL; + return SYSTEM_CONFIG_FILE; + } +#endif + return NULL; + } + return filespec_4log; +} + #ifdef WIN32 const char* maybe_reconstruct_IIS_status_in_qs(const char* original) { // 404;http://servername/page[?param=value...] @@ -275,12 +301,14 @@ static void config_handler(SAPI_Info &in request_info.argv = argv_extra; // prepare to process request - Request request(info, request_info, String::Language(String::L_HTML|String::L_OPTIMIZE_BIT)); + Request r(info, request_info, String::Language(String::L_HTML|String::L_OPTIMIZE_BIT)); { // initing ::request ptr for signal handlers - RequestController rc(&request); + RequestController rc(&r); + // only once + config_filespec = locate_config(config_filespec, parser3_filespec); // process main auto.p only - request.core(config_filespec, false, String::Empty); + r.core(config_filespec, false, String::Empty); // clearing ::request in RequestController desctructor to prevent signal handlers from accessing invalid memory } } @@ -299,18 +327,18 @@ static void connection_handler(SAPI_Info request_info.query_string = connection.query(); request_info.uri = request_info.strip_absolute_uri(connection.uri()); request_info.content_type = connection.content_type(); - request_info.content_length = connection.content_length(); + request_info.content_length = (size_t)connection.content_length(); request_info.cookie = info.get_env("HTTP_COOKIE"); request_info.mail_received = false; request_info.argv = argv_extra; // prepare to process request - Request request(info, request_info, String::Language(String::L_HTML|String::L_OPTIMIZE_BIT)); + Request r(info, request_info, String::Language(String::L_HTML|String::L_OPTIMIZE_BIT)); { // initing ::request ptr for signal handlers - RequestController rc(&request); + RequestController rc(&r); // process the request - request.core(config_filespec, strcasecmp(request_info.method, "HEAD")==0, String("httpd-main")); + r.core(config_filespec, strcasecmp(request_info.method, "HEAD")==0, String("httpd-main")); // clearing ::request in RequestController desctructor to prevent signal handlers from accessing invalid memory } } @@ -414,7 +442,7 @@ static void real_parser_handler(bool cgi } request_info.content_type = getenv("CONTENT_TYPE"); - request_info.content_length = pa_atoul(getenv("CONTENT_LENGTH")); + request_info.content_length = (size_t)pa_atoul(getenv("CONTENT_LENGTH")); request_info.cookie = getenv("HTTP_COOKIE"); request_info.mail_received = mail_received; @@ -425,12 +453,12 @@ static void real_parser_handler(bool cgi #endif // prepare to process request - Request request(*sapiInfo, request_info, cgi ? String::Language(String::L_HTML|String::L_OPTIMIZE_BIT) : String::L_AS_IS); + Request r(*sapiInfo, request_info, cgi ? String::Language(String::L_HTML|String::L_OPTIMIZE_BIT) : String::L_AS_IS); { // initing ::request ptr for signal handlers - RequestController rc(&request); + RequestController rc(&r); // process the request - request.core(config_filespec, strcasecmp(request_info.method, "HEAD")==0); + r.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 } @@ -493,29 +521,13 @@ static void usage(const char* program) { exit(EINVAL); } -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; -} - 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? @@ -618,8 +630,6 @@ int main(int argc, char *argv[]) { filespec_to_process=filespec_to_process_buf; } - config_filespec = locate_config(config_filespec, argv[0]); - REAL_PARSER_HANDLER(cgi); } catch(const Exception& e) { // exception in unhandled exception SAPI::die("%s", e.comment());