--- parser3/src/targets/cgi/parser3.C 2002/05/06 10:53:53 1.178 +++ parser3/src/targets/cgi/parser3.C 2002/08/14 11:37:14 1.194 @@ -3,17 +3,15 @@ Copyright(c) 2001, 2002 ArtLebedev Group (http://www.artlebedev.com) Author: Alexandr Petrosian (http://paf.design.ru) - - $Id: parser3.C,v 1.178 2002/05/06 10:53:53 paf Exp $ */ +static const char* IDENT_PARSER3_C="$Date: 2002/08/14 11:37:14 $"; + #include "pa_config_includes.h" #if _MSC_VER # include # include -#else -# include "pa_config_paths.h" #endif #include "pa_sapi.h" @@ -26,10 +24,16 @@ #ifdef WIN32 # include +# include "getopt.h" +#else +# include #endif +#include "fixopt.h" + //#define DEBUG_POOL_MALLOC //#define DEBUG_STRING_APPENDS_VS_EXPANDS +//#define DEBUG_MAILRECEIVE "test.eml" #ifdef DEBUG_STRING_APPENDS_VS_EXPANDS extern ulong @@ -41,54 +45,43 @@ extern ulong // consts -#ifndef _PROFILE -extern const char *main_RCSIds[]; -#ifdef USE_SMTP -extern const char *smtp_RCSIds[]; -#endif -extern const char *gd_RCSIds[]; -extern const char *classes_RCSIds[]; -extern const char *types_RCSIds[]; -extern const char *parser3_RCSIds[]; -const char **RCSIds[]={ - main_RCSIds, -#ifdef USE_SMTP - smtp_RCSIds, -#endif - gd_RCSIds, - classes_RCSIds, - types_RCSIds, - parser3_RCSIds, - 0 -}; -#endif - #define REDIRECT_PREFIX "REDIRECT_" -#define PARSER_ROOT_CONFIG_ENV_NAME "HTTP_PARSER_ROOT_CONFIG" -#define PARSER_SITE_CONFIG_ENV_NAME "HTTP_PARSER_SITE_CONFIG" +#define PARSER_CONFIG_ENV_NAME "CGI_PARSER_CONFIG" /// IIS refuses to read bigger chunks const size_t READ_POST_CHUNK_SIZE=0x400*0x400; // 1M -const char *argv0; -Pool *pool; // global pool [dont describe to doxygen: it confuses it with param names] -bool cgi; ///< we were started as CGI? +static const char *argv0; +static const char *config_filespec_cstr=0; +static bool fail_on_config_read_problem=true; + +static Pool *pool; // global pool [dont describe to doxygen: it confuses it with param names] +static bool cgi; ///< we were started as CGI? +static bool mail_received=false; ///< we were started with -m option? [asked to parse incoming message to $mail:received] // SAPI static void log(const char *fmt, va_list args) { - bool opened; + bool opened=false; FILE *f=0; - if(argv0) { - // beside by binary + if(config_filespec_cstr) { + char beside_config_path[MAX_STRING]; + strncpy(beside_config_path, config_filespec_cstr, 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; + } + char file_spec[MAX_STRING]; - strncpy(file_spec, argv0, MAX_STRING-1); file_spec[MAX_STRING-1]=0; // filespec of my binary - rsplit(file_spec, '/'); rsplit(file_spec, '\\');// strip filename - strcat(file_spec, "/parser3.log"); + snprintf(file_spec, MAX_STRING, + "%s/parser3.log", beside_config_path); f=fopen(file_spec, "at"); + opened=f!=0; } - opened=f!=0; + // fallback to stderr if(!opened) f=stderr; @@ -165,6 +158,16 @@ const char *SAPI::get_env(Pool& , const return getenv(name); } +const char *const *SAPI::environment(Pool&) { +#ifdef _MSC_VER + extern char **_environ; + return _environ; +#else + extern char **environ; + return environ; +#endif +} + size_t SAPI::read_post(Pool& , char *buf, size_t max_bytes) { size_t read_size=0; do { @@ -199,7 +202,7 @@ void SAPI::send_body(Pool& , const void // -void full_file_spec(const char *file_name, char *buf, size_t buf_size) { +static void full_file_spec(const char *file_name, char *buf, size_t buf_size) { if(file_name) if(file_name[0]=='/' #ifdef WIN32 @@ -227,7 +230,7 @@ main workhorse wich is tested but seems slow. IIS5 todo find out proper 'illegal call' check */ -void real_parser_handler( +static void real_parser_handler( const char *filespec_to_process, const char *request_method, bool header_only) { // init socks @@ -238,7 +241,7 @@ void real_parser_handler( // init global variables pa_globals_init(*pool); - if(!filespec_to_process) + if(!filespec_to_process || !*filespec_to_process) SAPI::die("Parser/%s", PARSER_VERSION); // Request info @@ -278,10 +281,10 @@ void real_parser_handler( request_info.uri=reconstructed_uri; } else request_info.uri=path_info; - else - throw Exception("parser.runtime", - 0, - "CGI: no PATH_INFO defined(in reinventing REQUEST_URI)"); + else + throw Exception("parser.runtime", + 0, + "CGI: no PATH_INFO defined(in reinventing REQUEST_URI)"); #ifndef WIN32 // they've changed this under IIS5. @@ -300,76 +303,48 @@ void real_parser_handler( const char *content_length=SAPI::get_env(*pool, "CONTENT_LENGTH"); request_info.content_length=(content_length?atoi(content_length):0); request_info.cookie=SAPI::get_env(*pool, "HTTP_COOKIE"); - request_info.user_agent=SAPI::get_env(*pool, "HTTP_USER_AGENT"); - + request_info.mail_received=mail_received; + // prepare to process request Request request(*pool, request_info, -#ifdef _DEBUG +/*#ifdef _DEBUG String::UL_HTML|String::UL_OPTIMIZE_BIT -#else +#else*/ cgi ? String::UL_HTML|String::UL_OPTIMIZE_BIT : String::UL_AS_IS -#endif +/*#endif*/ , true /* status_allowed */); - // some root-controlled location - const char *root_config_filespec_cstr; - char root_config_filespec_buf[MAX_STRING]; - const char *root_config_by_env=getenv(PARSER_ROOT_CONFIG_ENV_NAME); - if(!root_config_by_env) - root_config_by_env=getenv(REDIRECT_PREFIX PARSER_ROOT_CONFIG_ENV_NAME); - if(root_config_by_env) - root_config_filespec_cstr=root_config_by_env; - else { -#ifdef ROOT_CONFIG_DIR - root_config_filespec_cstr=ROOT_CONFIG_DIR "/" CONFIG_FILE_NAME; -#else -# ifdef WIN32 - // c:\windows - char windows_dir[MAX_STRING]; - GetWindowsDirectory(windows_dir, MAX_STRING); - - - snprintf(root_config_filespec_buf, MAX_STRING, - "%s/%s", - windows_dir, CONFIG_FILE_NAME); - - root_config_filespec_cstr=root_config_filespec_buf; -# else -#error must be compiled either configure/make or MSVC++ -# endif -#endif - } - - const char *site_config_filespec_cstr; - char site_config_filespec_buf[MAX_STRING]; - const char *site_config_by_env=getenv(PARSER_SITE_CONFIG_ENV_NAME); - if(!site_config_by_env) - site_config_by_env=getenv(REDIRECT_PREFIX PARSER_SITE_CONFIG_ENV_NAME); - if(site_config_by_env) - site_config_filespec_cstr=site_config_by_env; - else { - // beside by binary - // @todo full path, not ./! - char beside_binary_path[MAX_STRING]; - strncpy(beside_binary_path, argv0, 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 - beside_binary_path[0]='.'; beside_binary_path[1]=0; + char config_filespec_buf[MAX_STRING]; + if(!config_filespec_cstr) { + const char *config_by_env=getenv(PARSER_CONFIG_ENV_NAME); + if(!config_by_env) + config_by_env=getenv(REDIRECT_PREFIX PARSER_CONFIG_ENV_NAME); + if(config_by_env) + config_filespec_cstr=config_by_env; + else { + // beside by binary + char beside_binary_path[MAX_STRING]; + strncpy(beside_binary_path, argv0, 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; + } + snprintf(config_filespec_buf, MAX_STRING, + "%s/%s", + beside_binary_path, AUTO_FILE_NAME); + config_filespec_cstr=config_filespec_buf; + fail_on_config_read_problem=false; } - snprintf(site_config_filespec_buf, MAX_STRING, - "%s/%s", - beside_binary_path, CONFIG_FILE_NAME); - site_config_filespec_cstr=site_config_filespec_buf; } // process the request request.core( - root_config_filespec_cstr, false /*fail_on_read_problem*/, - site_config_filespec_cstr, false /*fail_on_read_problem*/, + config_filespec_cstr, fail_on_config_read_problem, header_only); // @@ -391,7 +366,7 @@ void real_parser_handler( } -void call_real_parser_handler__do_SEH( +static void call_real_parser_handler__do_SEH( const char *filespec_to_process, const char *request_method, bool header_only) { #if _MSC_VER && !defined(_DEBUG) @@ -428,16 +403,45 @@ int failed_new(size_t size) { #endif #ifdef HAVE_SET_NEW_HANDLER -void failed_new() { +static void failed_new() { SAPI::die("out of memory in 'new'"); } #endif -int main(int argc, char *argv[]) { +static void usage(const char *program) { + printf( + "Parser/%s Copyright(c) 2001, 2002 ArtLebedev Group (http://www.artlebedev.com)\n" + "Author: Alexandr Petrosian (http://paf.design.ru)\n" + "\n" + "Usage: %s [options] file\n" + "Options are:\n" +#ifdef WITH_MAILRECEIVE + " -m Parse mail, put received letter to $mail:received\n" +#endif + " -f config_file Use this config file (/path/to/auto.p)\n" + " -h Display usage information (this message)\n" + , PARSER_VERSION, + program); + exit(EINVAL); +} + +int main(int raw_argc, char *raw_argv[]) { + int argc; + char **argv; + fixopt( + raw_argc, raw_argv, + argc, argv); + Pool_storage global_pool_storage; Pool global_pool(&global_pool_storage); pool=&global_pool; +#ifdef DEBUG_MAILRECEIVE + if(FILE *fake_in=fopen(DEBUG_MAILRECEIVE, "rt")) { + dup2(fake_in->_file, 0/*STDIN_FILENO*/); + } +#endif + #ifdef _DEBUG // _crtBreakAlloc=33112; #endif @@ -453,17 +457,42 @@ int main(int argc, char *argv[]) { getenv("GATEWAY_INTERFACE") || getenv("REQUEST_METHOD"); - if(!cgi) { - if(argc<2) { - printf( - "Parser/%s Copyright(c) 2001, 2002 ArtLebedev Group (http://www.artlebedev.com)\n" - "Author: Alexandr Petrosian (http://paf.design.ru)\n" - "\n" - "Usage: %s \n", - PARSER_VERSION, - argv0?argv0:"parser3"); - return 1; + char *raw_filespec_to_process; + if(cgi) + raw_filespec_to_process=getenv("PATH_TRANSLATED"); + else { + optind = 1; + opterr = 0; + int c; + while((c = getopt(argc, argv, "hf:" +#ifdef WITH_MAILRECEIVE + "m" +#endif + )) > 0) { + switch (c) { + case 'h': + usage(argv[0]); + break; + case 'f': + config_filespec_cstr=optarg; + break; +#ifdef WITH_MAILRECEIVE + case 'm': + mail_received=true; + break; +#endif + default: + fprintf(stderr, "%s: invalid option '%c'\n", argv[0], optopt); + usage(argv[0]); + break; + } } + if (optind != argc - 1) { + fprintf(stderr, "%s: file not specified\n", argv[0]); + usage(argv[0]); + } + + raw_filespec_to_process=argv[optind++]; } #ifdef WIN32 @@ -494,7 +523,6 @@ int main(int argc, char *argv[]) { std::set_new_handler(failed_new); #endif - char *raw_filespec_to_process=cgi?getenv("PATH_TRANSLATED"):argv[1]; char filespec_to_process[MAX_STRING]; full_file_spec(raw_filespec_to_process, filespec_to_process, sizeof(filespec_to_process));