--- parser3/src/targets/cgi/parser3.C 2024/11/10 00:28:42 1.360 +++ parser3/src/targets/cgi/parser3.C 2024/12/11 18:35:31 1.366 @@ -5,7 +5,7 @@ Authors: Konstantin Morshnev , Alexandr Petrosian */ -volatile const char * IDENT_PARSER3_C="$Id: parser3.C,v 1.360 2024/11/10 00:28:42 moko Exp $"; +volatile const char * IDENT_PARSER3_C="$Id: parser3.C,v 1.366 2024/12/11 18:35:31 moko Exp $"; #include "pa_config_includes.h" @@ -34,7 +34,7 @@ extern "C" int GC_pthread_create(pthread // defines // comment remove me after debugging -//#define PA_DEBUG_CGI_ENTRY_EXIT "parser3-debug.log" +//#define PA_DEBUG_CGI_ENTRY_EXIT #if defined(_MSC_VER) && !defined(_DEBUG) # define PA_SUPPRESS_SYSTEM_EXCEPTION @@ -52,9 +52,11 @@ SAPI_Info_CGI sapi_cgi; static SAPI_Info *sapi_info = &sapi_cgi; static THREAD_LOCAL SAPI_Info *sapi_info_4log = NULL; // global for correct send error in die() +const char* parser3_mode = "cgi"; // $status:mode 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 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; @@ -72,26 +74,15 @@ template static T *dir_pos( return result; } -// SAPI - -static void pa_log(const char* fmt, va_list args) { - bool opened=false; - FILE *f=0; - - const char* log_by_env=getenv(PARSER_LOG_ENV_NAME); - if(!log_by_env) - log_by_env=getenv(REDIRECT_PREFIX PARSER_LOG_ENV_NAME); - if(log_by_env) { - f=fopen(log_by_env, "at"); - opened=f!=0; - } -#ifdef PA_DEBUG_CGI_ENTRY_EXIT - f=fopen(PA_DEBUG_CGI_ENTRY_EXIT, "at"); - opened=f!=0; -#endif +const char *parser3_log_filespec() { // $status:log-filename + const char* slog=log_filespec; - if(!opened && filespec_4log) { - char log_spec[MAX_STRING + 12 /* '/parser3.log' */]; + 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=dir_pos(log_spec)){ @@ -100,15 +91,22 @@ static void pa_log(const char* fmt, va_l // no path, just filename strcpy(log_spec, "./parser3.log"); } - - f=fopen(log_spec, "at"); - opened=f!=0; + slog=log_spec; } + return slog; +} + +// SAPI + +static void pa_log(const char* fmt, va_list args) { + // use no memory [so that we could log out-of-memory error] + const char* slog=parser3_log_filespec(); + FILE *f=strcmp(slog,"-") ? fopen(slog, "at") : stderr; + // fallback to stderr - if(!opened) + if(!f) f=stderr; - // use no memory [so that we could log out-of-memory error] setbuf(f, 0); // stderr stream is unbuffered by default, but still... // prefix @@ -117,8 +115,8 @@ static void pa_log(const char* fmt, va_l if(size_t len=strlen(stamp)) // saw once stamp being ="" fprintf(f, "[%.*s] [%u] ", (int)len-1, stamp, (unsigned int)pa_get_thread_id() ); } - // message + // message char buf[MAX_LOG_STRING]; size_t size=vsnprintf(buf, MAX_LOG_STRING, fmt, args); size=remove_crlf(buf, buf+size); @@ -129,7 +127,7 @@ static void pa_log(const char* fmt, va_l } else fputs(" [no request info]\n", f); - if(opened) + if(f!=stderr) fclose(f); else fflush(f); @@ -197,7 +195,7 @@ void SAPI::send_headers(SAPI_Info& info) } void SAPI::clear_headers(SAPI_Info& info) { - info.headers.clear(); + info.clear_headers(); } size_t SAPI::send_body(SAPI_Info& info, const void *buf, size_t size) { @@ -388,7 +386,7 @@ static void connection_handler(SAPI_Info 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, main_method_name, &httpd_class_name); - } catch(const Exception& e) { // exception in connection handling or unhandled exception + } catch(const Exception& e) { // exception in connection handling SAPI::log(info, "%s", e.comment()); const char* status = info.exception_http_status(e.type()); if(*status) @@ -557,7 +555,7 @@ static void real_parser_handler(bool cgi request_info.argv = argv_extra; #ifdef PA_DEBUG_CGI_ENTRY_EXIT - log("request_info: method=%s, uri=%s, q=%s, dr=%s, pt=%s", request_info.method, request_info.uri, request_info.query_string, request_info.document_root, request_info.path_translated); + pa_log("request_info: method=%s, uri=%s, q=%s, dr=%s, pt=%s", request_info.method, request_info.uri, request_info.query_string, request_info.document_root, request_info.path_translated); #endif // prepare to process request @@ -610,7 +608,11 @@ static void call_real_parser_handler__su #define REAL_PARSER_HANDLER real_parser_handler #endif -static void usage(const char* program) { +static void usage(const char* message=NULL) { + if(message){ + fprintf(stderr, message, parser3_filespec); + } + printf( "Parser/%s\n" "Copyright (c) 2001-2024 Art. Lebedev Studio (http://www.artlebedev.com)\n" @@ -622,89 +624,94 @@ static void usage(const char* program) { " -m Parse mail, put received letter to $mail:received\n" #endif " -f config_file Use this config file (/path/to/auto.p)\n" + " -l log_file Use this log file (/path/to/parser3.log)\n" " -p [host:]port Start web server on this port\n" " -h Display usage information (this message)\n", PARSER_VERSION, - program); + parser3_filespec ? parser3_filespec : "parser3" ); exit(EINVAL); } +#define ARG_REQUIRED \ + if(c[1] || !*(++carg)){ \ + fprintf(stderr, "%s: option '%c' requires an argument\n", parser3_filespec, *c); \ + usage(); \ + } int main(int argc, char *argv[]) { #ifdef PA_DEBUG_CGI_ENTRY_EXIT - log("main: entry"); + pa_log("main: entry"); #endif - parser3_filespec = argc && argv[0] ? MAYBE_BACK_SLASHES_TO_SLASHES(argv[0]) : "parser3"; + if(!argc || !argv[0]) + usage(); + parser3_filespec = MAYBE_BACK_SLASHES_TO_SLASHES(argv[0]); + umask(2); // were we started as CGI? bool cgi=(getenv("SERVER_SOFTWARE") || getenv("SERVER_NAME") || getenv("GATEWAY_INTERFACE") || getenv("REQUEST_METHOD")) && !getenv("PARSER_VERSION"); - if(!cgi) + if(!cgi){ sapi_info = &sapi_console; + parser3_mode = "console"; + } #ifdef SIGPIPE signal(SIGPIPE, SIGPIPE_handler); #endif - char* raw_filespec_to_process = NULL; if(cgi) { raw_filespec_to_process=getenv("PATH_TRANSLATED"); argv_extra=argv + 1; } else { - int optind=1; - while(optind < argc){ - char* carg = argv[optind]; - if(carg[0] != '-') + char** carg = argv + 1; + for(;*carg; carg++){ + if((*carg)[0] != '-') break; - for(size_t k = 1; k < strlen(carg); k++){ - char c = carg[k]; - switch (c) { + for(char* c=(*carg)+1; *c; c++){ + switch (*c) { case 'h': - usage(parser3_filespec); + usage(); break; case 'f': - if(optind < argc - 1){ - optind++; - config_filespec=argv[optind]; - } + ARG_REQUIRED; + config_filespec=*carg; + break; + case 'l': + ARG_REQUIRED; + log_filespec=*carg; break; case 'p': - if(optind < argc - 1){ - optind++; - httpd_host_port=argv[optind]; - } + ARG_REQUIRED; + httpd_host_port=*carg; + parser3_mode="httpd"; break; #ifdef WITH_MAILRECEIVE case 'm': mail_received=true; + parser3_mode="mail"; break; #endif default: - fprintf(stderr, "%s: invalid option '%c'\n", parser3_filespec, c); - usage(parser3_filespec); + fprintf(stderr, "%s: invalid option '%c'\n", parser3_filespec, *c); + usage(); break; } } - optind++; } - if (optind > argc - 1) { - if(!httpd_host_port) { - fprintf(stderr, "%s: file not specified\n", parser3_filespec); - usage(parser3_filespec); - } + if (*carg) { + raw_filespec_to_process=*carg; } else { - raw_filespec_to_process=argv[optind]; + if(!httpd_host_port) + usage("%s: file not specified\n"); } - if (httpd_host_port && mail_received) { - fprintf(stderr, "%s: -p and -m options should not be used together\n", parser3_filespec); - usage(parser3_filespec); - } + if (httpd_host_port && mail_received) + usage("%s: -p and -m options should not be used together\n"); - argv_extra=argv + optind; + argv_extra=carg; } #ifdef _MSC_VER @@ -733,13 +740,13 @@ int main(int argc, char *argv[]) { } REAL_PARSER_HANDLER(cgi); - } catch(const Exception& e) { // exception in unhandled exception + } catch(const Exception& e) { // exception in config_handler SAPI::log(*sapi_info, "%s", e.comment()); SAPI::send_error(*sapi_info, e.comment(), strcmp(e.type(), "file.missing") ? "500" : "404"); } #ifdef PA_DEBUG_CGI_ENTRY_EXIT - log("main: successful return"); + pa_log("main: successful return"); #endif return sapi_info->http_response_code < 100 ? sapi_info->http_response_code : 0; }