--- parser3/src/targets/cgi/parser3.C 2026/09/27 19:40:38 1.371 +++ parser3/src/targets/cgi/parser3.C 2026/09/30 23:20:52 1.374 @@ -5,7 +5,7 @@ Authors: Konstantin Morshnev , Alexandr Petrosian */ -volatile const char * IDENT_PARSER3_C="$Id: parser3.C,v 1.371 2026/09/27 19:40:38 moko Exp $"; +volatile const char * IDENT_PARSER3_C="$Id: parser3.C,v 1.374 2026/09/30 23:20:52 moko Exp $"; #include "pa_config_includes.h" @@ -56,30 +56,26 @@ const char* parser3_mode = "cgi"; // $st 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 const char* log_filespec = 0; // -l option +static const char* log_filespec = 0; // -l option or from env, full disk path static bool mail_received = false; // -m option? [asked to parse incoming message to $mail:received] static const char* parser3_filespec = 0; // argv[0] static char** argv_extra = NULL; // for error logging 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 +static const char* filespec_4log = NULL; // null only if system-wide auto.p used; full disk path, parser3.log goes next to it const char *parser3_log_filespec() { // $status:log-filename const char* slog=log_filespec; - if(!slog) - slog=getenv(PARSER_LOG_ENV_NAME); - if(!slog) - slog=getenv(REDIRECT_PREFIX PARSER_LOG_ENV_NAME); if(!slog) { static char log_spec[MAX_STRING + 12 /* '/parser3.log' */]; pa_strncpy(log_spec, filespec_4log, MAX_STRING); - if(char* log_dir_pos=strrpbrk(log_spec, "/\\")){ + if(char* log_dir_pos=strrchr(log_spec, '/')){ strcpy(log_dir_pos, "/parser3.log"); } else { - // no path, just filename + // system-wide auto.p used: the current directory strcpy(log_spec, "./parser3.log"); } slog=log_spec; @@ -194,17 +190,11 @@ size_t SAPI::send_body(SAPI_Info& info, } static const char* full_disk_path(const char* file_name = "") { - char* result; - if(file_name[0]=='/' || is_os_absolute_path(file_name)){ - 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; + const char* path=backslashes_to_slashes(file_name); + if(path[0]=='/' || is_os_absolute_path(path)) // '/' includes the UNC path //server, as there are no web paths here; C: is left for is_os_absolute_path + return path; + char cwd[MAX_STRING]; + return pa_strcat(backslashes_to_slashes(getcwd(cwd, MAX_STRING) ? cwd : ""), "/", path); } static void log_signal(const char* signal_name) { @@ -234,17 +224,14 @@ 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 = strrpbrk(executable_path, "/\\"); + const char* exec_dir_pos = strrchr(executable_path, '/'); #ifdef SYSTEM_CONFIG_FILE if(exec_dir_pos){ #endif - // next to the executable - if(!exec_dir_pos || (exec_dir_pos==executable_path+1 && *executable_path=='.')){ - // when just parser3 or ./parser3 full path should be used to avoid "parser already configured" - filespec_4log=full_disk_path(AUTO_FILE_NAME); - } else { - filespec_4log=pa_strcat(pa_strdup(executable_path, exec_dir_pos - executable_path), "/" AUTO_FILE_NAME); - } + // next to the executable; full path should be used to avoid "parser already configured" + filespec_4log=full_disk_path(!exec_dir_pos || (exec_dir_pos==executable_path+1 && *executable_path=='.') + ? AUTO_FILE_NAME // parser3 or ./parser3 + : pa_strcat(pa_strdup(executable_path, exec_dir_pos - executable_path), "/" AUTO_FILE_NAME)); if(entry_exists(filespec_4log)) return filespec_4log; #ifdef SYSTEM_CONFIG_FILE @@ -256,7 +243,8 @@ static const char* locate_config(const c #endif return NULL; } - return filespec_4log; + // when -f auto.p full path should be used to avoid "parser already configured" + return filespec_4log=full_disk_path(filespec_4log); } #ifdef WIN32 @@ -292,19 +280,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 @@ -337,7 +317,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; @@ -358,7 +338,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(); @@ -493,17 +473,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 @@ -532,7 +511,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 = ""; } @@ -634,7 +613,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); @@ -703,6 +682,14 @@ int main(int argc, char *argv[]) { argv_extra=carg; } + // prepare full disk path log_filespec here, as logging must not allocate + if(!log_filespec) + log_filespec=getenv(PARSER_LOG_ENV_NAME); + if(!log_filespec) + log_filespec=getenv(REDIRECT_PREFIX PARSER_LOG_ENV_NAME); + if(log_filespec) + log_filespec=full_disk_path(log_filespec); + #ifdef _MSC_VER setmode(fileno(stdin), _O_BINARY); setmode(fileno(stdout), _O_BINARY);