--- parser3/src/targets/cgi/parser3.C 2020/12/25 14:32:44 1.341 +++ parser3/src/targets/cgi/parser3.C 2024/08/25 16:24:03 1.352 @@ -1,11 +1,11 @@ /** @file Parser: scripting and CGI main. - Copyright (c) 2001-2020 Art. Lebedev Studio (http://www.artlebedev.com) - Author: Alexandr Petrosian (http://paf.design.ru) + Copyright (c) 2001-2023 Art. Lebedev Studio (http://www.artlebedev.com) + Authors: Konstantin Morshnev , Alexandr Petrosian */ -volatile const char * IDENT_PARSER3_C="$Id: parser3.C,v 1.341 2020/12/25 14:32:44 moko Exp $"; +volatile const char * IDENT_PARSER3_C="$Id: parser3.C,v 1.352 2024/08/25 16:24:03 moko Exp $"; #include "pa_config_includes.h" @@ -50,13 +50,23 @@ 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 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 +template static T *dir_pos(T *fname){ + T *pos=fname; + T *result=NULL; + while (pos=strpbrk(pos, "/\\")){ + result=pos; + pos++; + } + return !result || (result==fname+1 && *fname=='.') ? NULL : result; +} + // SAPI static void pa_log(const char* fmt, va_list args) { @@ -76,16 +86,17 @@ static void pa_log(const char* fmt, va_l #endif if(!opened && filespec_4log) { - char beside_config_path[MAX_STRING]; - 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 + 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)){ + strcpy(log_dir_pos, "/parser3.log"); + } else { // no path, just filename - strcpy(beside_config_path, "."); + strcpy(log_spec, "./parser3.log"); } - char file_spec[MAX_STRING]; - snprintf(file_spec, MAX_STRING, "%s/parser3.log", beside_config_path); - f=fopen(file_spec, "at"); + f=fopen(log_spec, "at"); opened=f!=0; } // fallback to stderr @@ -180,20 +191,22 @@ size_t SAPI::send_body(SAPI_Info& info, return info.send_body(buf, size); } -static void full_disk_path(const char* file_name, char *buf, size_t buf_size) { - if(file_name[0]=='/' +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 ){ - strncpy(buf, file_name, buf_size-1); buf[buf_size-1]=0; + result=pa_strdup(file_name); } else { char cwd[MAX_STRING]; - snprintf(buf, buf_size, "%s/%s", getcwd(cwd, MAX_STRING) ? cwd : "", file_name); + result=pa_strcat(getcwd(cwd, MAX_STRING) ? cwd : "", "/", file_name); } #ifdef WIN32 - back_slashes_to_slashes(buf); + back_slashes_to_slashes(result); #endif + return result; } static void log_signal(const char* signal_name) { @@ -224,9 +237,8 @@ static const char *locate_config(const c 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); + const char *exec_dir_pos = dir_pos(executable_path); + filespec_4log = exec_dir_pos ? pa_strcat(pa_strdup(executable_path, exec_dir_pos - executable_path), "/" AUTO_FILE_NAME) : full_disk_path(AUTO_FILE_NAME); if(entry_exists(filespec_4log)) return filespec_4log; #ifdef SYSTEM_CONFIG_FILE @@ -274,11 +286,10 @@ const char* maybe_reconstruct_IIS_status } #define MAYBE_RECONSTRUCT_IIS_STATUS_IN_QS(s) maybe_reconstruct_IIS_status_in_qs(s) -#else +#else #define MAYBE_RECONSTRUCT_IIS_STATUS_IN_QS(s) s #endif - class RequestController { public: RequestController(Request* r){ @@ -299,14 +310,14 @@ public: } }; -static void config_handler(SAPI_Info &info) { - char document_root_buf[MAX_STRING]; - full_disk_path("", document_root_buf, sizeof(document_root_buf)); +/** httpd support */ +static const String httpd_class_name("httpd"); +static void config_handler(SAPI_Info &info) { Request_info request_info; RequestInfoController ric(&request_info); - request_info.document_root = document_root_buf; + request_info.document_root = full_disk_path(); request_info.uri = ""; request_info.argv = argv_extra; @@ -327,10 +338,7 @@ static void connection_handler(SAPI_Info return; // ignore "void" connections info.populate_env(); - 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.document_root = full_disk_path(); request_info.path_translated = filespec_to_process; request_info.method = connection.method(); request_info.query_string = connection.query(); @@ -344,7 +352,7 @@ static void connection_handler(SAPI_Info // prepare to process request Request r(info, request_info, String::Language(String::L_HTML|String::L_OPTIMIZE_BIT)); // process the request - r.core(config_filespec, strcasecmp(request_info.method, "HEAD")==0, String("httpd-main")); + r.core(config_filespec, strcasecmp(request_info.method, "HEAD")==0, main_method_name, &httpd_class_name); } catch(const Exception& e) { // exception in connection handling or unhandled exception SAPI::log(info, "%s", e.comment()); const char *status = info.exception_http_status(e.type()); @@ -376,11 +384,8 @@ static void *connection_thread(void *arg static void httpd_mode() { config_handler(*sapiInfo); - int sock = HTTPD_Server::bind(httpd_host_port); + SOCKET sock = HTTPD_Server::bind(httpd_host_port); -#ifdef SIGCHLD - signal(SIGCHLD, SIG_IGN); -#endif #ifdef SIGPIPE signal(SIGPIPE, SIG_IGN); #endif @@ -388,10 +393,12 @@ static void httpd_mode() { while(1){ #ifndef _MSC_VER pid_t pid=1; + if(HTTPD_Server::mode == HTTPD_Server::PARALLEL) + while (waitpid((pid_t)(-1), 0, WNOHANG) > 0); #endif try { HTTPD_Connection connection; - if(!connection.accept(sock, 5)) + if(!connection.accept(sock, 500)) continue; switch (HTTPD_Server::mode) { @@ -399,7 +406,7 @@ static void httpd_mode() { #ifdef _MSC_VER if (!GC_CreateThread(0, 0, connection_thread, new HTTPD_Connection(connection), 0, 0)) throw Exception("httpd.fork", 0, "thread creation failed"); - connection.sock = -1; + connection.sock=INVALID_SOCKET; break; #else #ifdef HAVE_TLS @@ -410,7 +417,7 @@ static void httpd_mode() { if(int result=GC_pthread_create(&thread, &attr, connection_thread, new HTTPD_Connection(connection))) throw Exception("httpd.fork", 0, "thread creation failed (%d)", result); - connection.sock=-1; + connection.sock=INVALID_SOCKET; break; #endif case HTTPD_Server::PARALLEL: @@ -466,14 +473,14 @@ static void real_parser_handler(bool cgi // obligatory const char* path_info=getenv("PATH_INFO"); if(!path_info) - SAPI::die("CGI: illegal call (missing PATH_INFO)"); + SAPI::die("parser3: illegal CGI call (missing PATH_INFO)"); request_info.document_root = getenv("DOCUMENT_ROOT"); if(!request_info.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("CGI: illegal call (invalid PATH_INFO in reinventing DOCUMENT_ROOT)"); + 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; @@ -485,7 +492,7 @@ static void real_parser_handler(bool cgi // another obligatory const char* script_name = getenv("SCRIPT_NAME"); if(!script_name) - SAPI::die("CGI: illegal call (missing SCRIPT_NAME)"); + SAPI::die("parser3: illegal CGI call (missing SCRIPT_NAME)"); /* http://parser3/env.html?123 =OK $request:uri=/env.html?123 @@ -502,18 +509,17 @@ static void real_parser_handler(bool cgi size_t script_name_len = strlen(script_name); size_t uri_len = strlen(request_info.uri); 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)"); + SAPI::die("parser3: illegal CGI call (REQUEST_URI starts with SCRIPT_NAME)"); } else { // fcgiwrap minimalistic setup request_info.uri = request_info.query_string && *request_info.query_string ? pa_strcat(path_info, "?", request_info.query_string) : path_info; } } else{ - full_disk_path("", document_root_buf, sizeof(document_root_buf)); - request_info.document_root = document_root_buf; + request_info.document_root = full_disk_path(); request_info.uri = ""; } request_info.content_type = getenv("CONTENT_TYPE"); - request_info.content_length = (size_t)pa_atoul(getenv("CONTENT_LENGTH")); + request_info.content_length = cgi ? (size_t)pa_atoul(getenv("CONTENT_LENGTH")) : 0; // only SAPI_Info_CGI can read POST request_info.cookie = getenv("HTTP_COOKIE"); request_info.mail_received = mail_received; @@ -576,8 +582,8 @@ static void call_real_parser_handler__su static void usage(const char* program) { printf( "Parser/%s\n" - "Copyright (c) 2001-2020 Art. Lebedev Studio (http://www.artlebedev.com)\n" - "Author: Alexandr Petrosian (http://paf.design.ru)\n" + "Copyright (c) 2001-2023 Art. Lebedev Studio (http://www.artlebedev.com)\n" + "Authors: Konstantin Morshnev , Alexandr Petrosian \n" "\n" "Usage: %s [options] [file]\n" "Options are:\n" @@ -598,7 +604,7 @@ int main(int argc, char *argv[]) { log("main: entry"); #endif - parser3_filespec = argv[0]; + parser3_filespec = argc && argv[0] ? argv[0] : "parser3"; umask(2); // were we started as CGI? @@ -624,7 +630,7 @@ int main(int argc, char *argv[]) { char c = carg[k]; switch (c) { case 'h': - usage(argv[0]); + usage(parser3_filespec); break; case 'f': if(optind < argc - 1){ @@ -644,8 +650,8 @@ int main(int argc, char *argv[]) { break; #endif default: - fprintf(stderr, "%s: invalid option '%c'\n", argv[0], c); - usage(argv[0]); + fprintf(stderr, "%s: invalid option '%c'\n", parser3_filespec, c); + usage(parser3_filespec); break; } } @@ -654,16 +660,16 @@ int main(int argc, char *argv[]) { if (optind > argc - 1) { if(!httpd_host_port) { - fprintf(stderr, "%s: file not specified\n", argv[0]); - usage(argv[0]); + fprintf(stderr, "%s: file not specified\n", parser3_filespec); + usage(parser3_filespec); } } else { raw_filespec_to_process=argv[optind]; } if (httpd_host_port && mail_received) { - fprintf(stderr, "%s: -p and -m options should not be used together\n", argv[0]); - usage(argv[0]); + fprintf(stderr, "%s: -p and -m options should not be used together\n", parser3_filespec); + usage(parser3_filespec); } argv_extra=argv + optind; @@ -690,10 +696,8 @@ int main(int argc, char *argv[]) { #endif try { // global try - 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; + filespec_to_process=full_disk_path(raw_filespec_to_process); } REAL_PARSER_HANDLER(cgi);