--- parser3/src/targets/cgi/parser3.C 2020/10/14 00:13:01 1.301 +++ parser3/src/targets/cgi/parser3.C 2020/11/13 23:35:53 1.314 @@ -5,7 +5,7 @@ Author: Alexandr Petrosian (http://paf.design.ru) */ -volatile const char * IDENT_PARSER3_C="$Id: parser3.C,v 1.301 2020/10/14 00:13:01 moko Exp $"; +volatile const char * IDENT_PARSER3_C="$Id: parser3.C,v 1.314 2020/11/13 23:35:53 moko Exp $"; #include "pa_config_includes.h" @@ -38,20 +38,20 @@ 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* config_filespec_cstr=0; // -f option +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 int args_skip=1; static char** argv_all = NULL; static bool cgi; ///< we were started as CGI? // for signal handlers Request *request=0; -bool execution_canceled=false; + // for die error logging -Request_info request_info; +static Request_info request_info; // SAPI @@ -71,9 +71,9 @@ static void log(const char* fmt, va_list opened=f!=0; #endif - if(!opened && config_filespec_cstr) { + if(!opened && config_filespec) { char beside_config_path[MAX_STRING]; - strncpy(beside_config_path, config_filespec_cstr, MAX_STRING-1); beside_config_path[MAX_STRING-1]=0; + strncpy(beside_config_path, config_filespec, 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; @@ -105,7 +105,7 @@ static void log(const char* fmt, va_list fwrite(buf, size, 1, f); if(request_info.method) { - fprintf(f, " [uri=%s, method=%s, cl=%lu]\n", request_info.uri ? request_info.uri : "", request_info.method, request_info.content_length); + fprintf(f, " [uri=%s, method=%s, cl=%lu]\n", request_info.uri ? request_info.uri : "", request_info.method, (unsigned long)request_info.content_length); } else fputs(" [no request info]\n", f); @@ -124,7 +124,7 @@ static void log(const char* fmt, ...) { } #endif -// appends to parser3.log located beside my binary if openable, to stderr otherwize +// appends to parser3.log located next to the executable if openable, to stderr otherwize void SAPI::log(SAPI_Info&, const char* fmt, ...) { va_list args; va_start(args,fmt); @@ -154,6 +154,10 @@ char* SAPI::Env::get(SAPI_Info& info, co return info.get_env(name); } +bool SAPI::Env::set(SAPI_Info& info, const char* name, const char* value) { + return info.set_env(name, value); +} + const char* const *SAPI::Env::get(SAPI_Info& info) { return info.get_env(); } @@ -174,20 +178,17 @@ 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) { - if(file_name) - if(file_name[0]=='/' +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]==':' + || file_name[0] && file_name[1]==':' #endif - ){ - strncpy(buf, file_name, buf_size-1); buf[buf_size-1]=0; - } else { - char cwd[MAX_STRING]; - snprintf(buf, buf_size, "%s/%s", getcwd(cwd, MAX_STRING) ? cwd : "", file_name); - } - else - buf[0]=0; + ){ + strncpy(buf, file_name, buf_size-1); buf[buf_size-1]=0; + } else { + char cwd[MAX_STRING]; + snprintf(buf, buf_size, "%s/%s", getcwd(cwd, MAX_STRING) ? cwd : "", file_name); + } #ifdef WIN32 back_slashes_to_slashes(buf); #endif @@ -213,7 +214,6 @@ static void SIGPIPE_handler(int /*sig*/) if(sigpipe && sigpipe->as_bool()) log_signal(SIGPIPE_NAME); - execution_canceled=true; if(request) request->set_skip(Request::SKIP_INTERRUPTED); } @@ -268,30 +268,7 @@ public: } }; -static bool locate_config(){ - if(!config_filespec_cstr) { - config_filespec_cstr=getenv(PARSER_CONFIG_ENV_NAME); - if(!config_filespec_cstr) - config_filespec_cstr=getenv(REDIRECT_PREFIX PARSER_CONFIG_ENV_NAME); - if(!config_filespec_cstr){ - // beside by binary - char beside_binary_path[MAX_STRING]; - strncpy(beside_binary_path, argv_all[0], MAX_STRING-1); beside_binary_path[MAX_STRING-1]=0; // filespec of my binary - if(!(rsplit(beside_binary_path, '/') || rsplit(beside_binary_path, '\\'))) { // strip filename - // no path, just filename - // @todo full path, not ./! - beside_binary_path[0]='.'; beside_binary_path[1]=0; - } - char config_filespec_buf[MAX_STRING]; - snprintf(config_filespec_buf, MAX_STRING, "%s/%s", beside_binary_path, AUTO_FILE_NAME); - config_filespec_cstr=pa_strdup(config_filespec_buf); - return entry_exists(config_filespec_cstr); - } - } - return true; -} - -static void connection_handler(SAPI_Info_HTTPD &info, HTTPD_Connection &connection, const char* filespec_to_process){ +static void connection_handler(SAPI_Info_HTTPD &info, HTTPD_Connection &connection){ connection.read_header(); info.populate_env(); @@ -299,7 +276,7 @@ static void connection_handler(SAPI_Info 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)); request_info.document_root = document_root_buf; request_info.path_translated = filespec_to_process; request_info.method = connection.method(); @@ -309,53 +286,56 @@ 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 + args_skip; + request_info.argv = argv_all; // 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); - bool fail_on_config_read_problem=locate_config(); // process the request - request.core(config_filespec_cstr, fail_on_config_read_problem, strcasecmp(request_info.method, "HEAD")==0); + request.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 } } -static void httpd_mode(const char* filespec_to_process){ +static void httpd_mode(){ int sock = HTTPD_Server::bind(httpd_host_port); while(1){ - HTTPD_Connection *connection = HTTPD_Server::accept(sock, 5); - if(!connection) - continue; - - SAPI_Info_HTTPD info(*connection); - - try { // connection try - connection_handler(info, *connection, filespec_to_process); - } catch(const Exception& e) { // exception in connection handling or unhandled exception - SAPI::log(info, "%s", e.comment()); - SAPI::send_error(info, e.comment(), info.exception_http_status(e.type())); + try { + HTTPD_Connection connection; + if(!connection.accept(sock, 5)) + continue; + + SAPI_Info_HTTPD info(connection); + + try { // connection try + connection_handler(info, connection); + } catch(const Exception& e) { // exception in connection handling or unhandled exception + SAPI::log(info, "%s", e.comment()); + SAPI::send_error(info, e.comment(), info.exception_http_status(e.type())); + } + // closing connection socket in HTTPD_Connection destructor + } catch(const Exception& e) { // exception in accept or send_error + SAPI::log(*sapiInfo, "%s", e.comment()); } - connection->close(); } } /** main workhorse */ -static void real_parser_handler(const char* filespec_to_process) { +static void real_parser_handler() { // init libraries pa_globals_init(); if(httpd_host_port){ - httpd_mode(filespec_to_process); + httpd_mode(); } const char* request_method=getenv("REQUEST_METHOD"); - if(!filespec_to_process || !*filespec_to_process) + if(!filespec_to_process) SAPI::die("Parser/%s", PARSER_VERSION); char document_root_buf[MAX_STRING]; @@ -418,20 +398,17 @@ static void real_parser_handler(const ch request_info.uri = 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 = ""; } request_info.content_type = getenv("CONTENT_TYPE"); - request_info.content_length = pa_atoui(getenv("CONTENT_LENGTH"), 10); + request_info.content_length = pa_atoul(getenv("CONTENT_LENGTH")); request_info.cookie = getenv("HTTP_COOKIE"); request_info.mail_received = mail_received; - request_info.argv = argv_all + args_skip; - - if(execution_canceled) - SAPI::die("Execution canceled"); + request_info.argv = argv_all; #ifdef PA_DEBUG_CGI_ENTRY_EXIT log("request_info: method=%s, uri=%s, q=%s, dr=%s, pt=%s, cookies=%s, cl=%u", @@ -449,10 +426,9 @@ static void real_parser_handler(const ch { // initing ::request ptr for signal handlers RequestController rc(&request); - bool fail_on_config_read_problem=locate_config(); // process the request - request.core(config_filespec_cstr, fail_on_config_read_problem, strcasecmp(request_info.method, "HEAD")==0); - // clearing ::request in RequestController desctructor to prevent signal handlers from accessing invalid memory + request.core(config_filespec, strcasecmp(request_info.method, "HEAD")==0); + // clearing ::request in RequestController destructor to prevent signal handlers from accessing invalid memory } // finalize libraries @@ -460,9 +436,9 @@ static void real_parser_handler(const ch } #ifdef PA_SUPPRESS_SYSTEM_EXCEPTION -static const Exception call_real_parser_handler__do_PEH_return_it(const char* filespec_to_process) { +static const Exception call_real_parser_handler__do_PEH_return_it() { try { - real_parser_handler(filespec_to_process); + real_parser_handler(); } catch(const Exception& e) { return e; } @@ -470,12 +446,12 @@ static const Exception call_real_parser_ return Exception(); } -static void call_real_parser_handler__supress_system_exception(const char* filespec_to_process) { +static void call_real_parser_handler__supress_system_exception() { Exception parser_exception; LPEXCEPTION_POINTERS system_exception=0; __try { - parser_exception=call_real_parser_handler__do_PEH_return_it(filespec_to_process); + parser_exception=call_real_parser_handler__do_PEH_return_it(); } __except ( (system_exception=GetExceptionInformation()), EXCEPTION_EXECUTE_HANDLER) { if(system_exception) if(_EXCEPTION_RECORD *er=system_exception->ExceptionRecord) @@ -501,7 +477,7 @@ static void usage(const char* program) { "Copyright (c) 2001-2017 Art. Lebedev Studio (http://www.artlebedev.com)\n" "Author: Alexandr Petrosian (http://paf.design.ru)\n" "\n" - "Usage: %s [options] file\n" + "Usage: %s [options] [file]\n" "Options are:\n" #ifdef WITH_MAILRECEIVE " -m Parse mail, put received letter to $mail:received\n" @@ -514,13 +490,34 @@ 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 - argv_all=argv; umask(2); // were we started as CGI? @@ -539,8 +536,7 @@ int main(int argc, char *argv[]) { char *raw_filespec_to_process = NULL; if(cgi) { raw_filespec_to_process=getenv("PATH_TRANSLATED"); - if(raw_filespec_to_process && !*raw_filespec_to_process) - raw_filespec_to_process=0; + argv_all=argv + 1; } else { int optind=1; while(optind < argc){ @@ -557,7 +553,7 @@ int main(int argc, char *argv[]) { case 'f': if(optind < argc - 1){ optind++; - config_filespec_cstr=argv[optind]; + config_filespec=argv[optind]; } break; case 'p': @@ -588,12 +584,13 @@ int main(int argc, char *argv[]) { } else { raw_filespec_to_process=argv[optind]; } - args_skip=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]); } + + argv_all=argv + optind; } #ifdef _MSC_VER @@ -616,11 +613,16 @@ int main(int argc, char *argv[]) { _CrtSetReportFile( _CRT_WARN, _CRTDBG_FILE_STDERR ); #endif - char filespec_to_process[MAX_STRING]; - full_file_spec(raw_filespec_to_process, filespec_to_process, sizeof(filespec_to_process)); + 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; + } + + locate_config(argv[0]); try { // global try - REAL_PARSER_HANDLER(filespec_to_process); + REAL_PARSER_HANDLER(); } catch(const Exception& e) { // exception in unhandled exception SAPI::die("%s", e.comment()); }