--- parser3/src/targets/cgi/parser3.C 2024/12/11 18:35:31 1.366 +++ parser3/src/targets/cgi/parser3.C 2026/09/30 16:44:20 1.373 @@ -1,11 +1,11 @@ /** @file Parser: scripting and CGI main. - Copyright (c) 2001-2024 Art. Lebedev Studio (http://www.artlebedev.com) + Copyright (c) 2001-2026 Art. Lebedev Studio (https://www.artlebedev.com) Authors: Konstantin Morshnev , Alexandr Petrosian */ -volatile const char * IDENT_PARSER3_C="$Id: parser3.C,v 1.366 2024/12/11 18:35:31 moko Exp $"; +volatile const char * IDENT_PARSER3_C="$Id: parser3.C,v 1.373 2026/09/30 16:44:20 moko Exp $"; #include "pa_config_includes.h" @@ -65,15 +65,6 @@ static char** argv_extra = NULL; static THREAD_LOCAL Request_info *request_info_4log = NULL; // global for correct log() reporting static const char* filespec_4log = NULL; // null only if system-wide auto.p used -template static T *dir_pos(T *fname){ - T *result=NULL; - while (fname=strpbrk(fname, "/\\")){ - result=fname; - fname++; - } - return result; -} - const char *parser3_log_filespec() { // $status:log-filename const char* slog=log_filespec; @@ -85,7 +76,7 @@ const char *parser3_log_filespec() { // static char log_spec[MAX_STRING + 12 /* '/parser3.log' */]; pa_strncpy(log_spec, filespec_4log, MAX_STRING); - if(char* log_dir_pos=dir_pos(log_spec)){ + if(char* log_dir_pos=strrpbrk(log_spec, "/\\")){ strcpy(log_dir_pos, "/parser3.log"); } else { // no path, just filename @@ -203,21 +194,10 @@ size_t SAPI::send_body(SAPI_Info& info, } static const char* full_disk_path(const char* file_name = "") { - char* result; - if(file_name[0]=='/' -#ifdef WIN32 - || file_name[0] && file_name[1]==':' -#endif - ){ - result=pa_strdup(file_name); - } else { - char cwd[MAX_STRING]; - result=pa_strcat(getcwd(cwd, MAX_STRING) ? cwd : "", "/", file_name); - } -#ifdef WIN32 - back_slashes_to_slashes(result); -#endif - return result; + if(file_name[0]=='/' || is_os_absolute_path(file_name)) + return backslashes_to_slashes(file_name); + char cwd[MAX_STRING]; + return backslashes_to_slashes(pa_strcat(getcwd(cwd, MAX_STRING) ? cwd : "", "/", file_name)); } static void log_signal(const char* signal_name) { @@ -247,7 +227,7 @@ static const char* locate_config(const c if(!filespec_4log) filespec_4log=getenv(REDIRECT_PREFIX PARSER_CONFIG_ENV_NAME); if(!filespec_4log){ - const char* exec_dir_pos = dir_pos(executable_path); + const char* exec_dir_pos = strrchr(executable_path, '/'); #ifdef SYSTEM_CONFIG_FILE if(exec_dir_pos){ #endif @@ -305,19 +285,11 @@ static const char* maybe_reconstruct_IIS return original; } -static const char* maybe_back_slashes_to_slashes(const char* original){ - char *result=pa_strdup(original); - back_slashes_to_slashes(result); - return result; -} - #define MAYBE_RECONSTRUCT_IIS_STATUS_IN_QS(s) maybe_reconstruct_IIS_status_in_qs(s) -#define MAYBE_BACK_SLASHES_TO_SLASHES(s) maybe_back_slashes_to_slashes(s) #else #define MAYBE_RECONSTRUCT_IIS_STATUS_IN_QS(s) s -#define MAYBE_BACK_SLASHES_TO_SLASHES(s) s #endif @@ -350,7 +322,7 @@ static void config_handler(SAPI_Info &in Request_info request_info; RequestInfoController ric(&request_info, &info); - request_info.document_root = full_disk_path(); + request_info.set_document_root(full_disk_path()); request_info.uri = ""; request_info.argv = argv_extra; @@ -371,7 +343,7 @@ static void connection_handler(SAPI_Info return; // ignore "void" connections info.populate_env(); - request_info.document_root = full_disk_path(); + request_info.set_document_root(full_disk_path()); request_info.path_translated = filespec_to_process; request_info.method = connection.method(); request_info.query_string = connection.query(); @@ -487,9 +459,11 @@ static void real_parser_handler(bool cgi const char* request_method=getenv("REQUEST_METHOD"); - if(!filespec_to_process) - SAPI::die("Parser/%s", PARSER_VERSION); - + if(!filespec_to_process){ + SAPI::send_error(*sapi_info, "Parser/" PARSER_VERSION); + exit(1); + } + // global request info Request_info request_info; RequestInfoController ric(&request_info, sapi_info); @@ -504,17 +478,16 @@ static void real_parser_handler(bool cgi if(!path_info) SAPI::die("parser3: illegal CGI call (missing PATH_INFO)"); - request_info.document_root = getenv("DOCUMENT_ROOT"); - if(!request_info.document_root) { + const char* document_root = getenv("DOCUMENT_ROOT"); + if(!document_root) { // IIS or fcgiwrap minimalistic setup ssize_t prefix_len = strlen(filespec_to_process) - strlen(path_info); if(prefix_len < 0 || strcmp(filespec_to_process + prefix_len, path_info) != 0) SAPI::die("parser3: illegal CGI call (invalid PATH_INFO in reinventing DOCUMENT_ROOT)"); - char* document_root = new(PointerFreeGC) char[prefix_len + 1/*0*/]; - memcpy(document_root, filespec_to_process, prefix_len); document_root[prefix_len] = 0; - request_info.document_root = document_root; + document_root = pa_strdup(filespec_to_process, prefix_len); } + request_info.set_document_root(document_root); request_info.uri = request_info.strip_absolute_uri(getenv("REQUEST_URI")); if(request_info.uri) { // apache & others stuck to standards @@ -543,7 +516,7 @@ static void real_parser_handler(bool cgi request_info.uri = request_info.query_string && *request_info.query_string ? pa_strcat(path_info, "?", request_info.query_string) : path_info; } } else{ - request_info.document_root = full_disk_path(); + request_info.set_document_root(full_disk_path()); request_info.uri = ""; } @@ -592,7 +565,7 @@ static void call_real_parser_handler__su } __except ( (system_exception=GetExceptionInformation()), EXCEPTION_EXECUTE_HANDLER) { if(system_exception) if(_EXCEPTION_RECORD *er=system_exception->ExceptionRecord) - throw Exception("system", 0, "0x%08X at 0x%08X", er->ExceptionCode, er->ExceptionAddress); + throw Exception("system", 0, "0x%08X at %p", er->ExceptionCode, er->ExceptionAddress); else throw Exception("system", 0, ""); else @@ -615,7 +588,7 @@ static void usage(const char* message=NU printf( "Parser/%s\n" - "Copyright (c) 2001-2024 Art. Lebedev Studio (http://www.artlebedev.com)\n" + "Copyright (c) 2001-2026 Art. Lebedev Studio (https://www.artlebedev.com)\n" "Authors: Konstantin Morshnev , Alexandr Petrosian \n" "\n" "Usage: %s [options] [file]\n" @@ -645,7 +618,7 @@ int main(int argc, char *argv[]) { if(!argc || !argv[0]) usage(); - parser3_filespec = MAYBE_BACK_SLASHES_TO_SLASHES(argv[0]); + parser3_filespec = backslashes_to_slashes(argv[0]); umask(2);