--- parser3/src/targets/cgi/parser3.C 2001/03/18 16:32:26 1.20 +++ parser3/src/targets/cgi/parser3.C 2001/03/22 21:33:37 1.34 @@ -1,9 +1,11 @@ -/* - Parser +/** @file + Parser: scripting and CGI main. + Copyright (c) 2001 ArtLebedev Group (http://www.artlebedev.com) + Author: Alexander Petrosyan (http://design.ru/paf) - $Id: parser3.C,v 1.20 2001/03/18 16:32:26 paf Exp $ + $Id: parser3.C,v 1.34 2001/03/22 21:33:37 paf Exp $ */ #ifdef HAVE_CONFIG_H @@ -14,36 +16,39 @@ #ifdef WIN32 # include # include +#else +# include #endif + +//\ifwin32 +#include +//#include +//\endifwin32 + #include #include #include #include +#include "pa_common.h" #include "pa_globals.h" #include "pa_request.h" -#include "pa_common.h" Pool pool; // global pool -bool cgi; +bool cgi; ///< we were started as CGI? #ifdef WIN32 # if _MSC_VER // intercept global system errors -LONG WINAPI TopLevelExceptionFilter ( +static LONG WINAPI TopLevelExceptionFilter ( struct _EXCEPTION_POINTERS *ExceptionInfo ) { char buf[MAX_STRING]; if(ExceptionInfo && ExceptionInfo->ExceptionRecord) { - struct _EXCEPTION_RECORD *r=ExceptionInfo->ExceptionRecord; - - int printed=0; - printed+=snprintf(buf+printed, MAX_STRING-printed, "Exception 0x%X at 0x%p", - r->ExceptionCode, - r->ExceptionAddress); - for(unsigned int i=0; iNumberParameters; i++) - printed+=snprintf(buf+printed, MAX_STRING-printed, ", 0x%X", - r->ExceptionInformation[i]); + struct _EXCEPTION_RECORD *rr=ExceptionInfo->ExceptionRecord; + snprintf(buf, MAX_STRING, "Exception %#X at %p", + er->ExceptionCode, + er->ExceptionAddress); } else strcpy(buf, "Exception "); @@ -54,11 +59,25 @@ LONG WINAPI TopLevelExceptionFilter ( return EXCEPTION_EXECUTE_HANDLER; // never reached } # endif + #endif +//\if +static void fix_slashes(char *s) { + if(s) + for(; *s; s++) + if(*s=='\\') + *s='/'; +} +//\endif + // service funcs -int read_post(char *buf, int max_bytes) { +static const char *get_env(Pool& pool, const char *name) { + return getenv(name); +} + +static uint read_post(char *buf, uint max_bytes) { int read_size=0; do { int chunk_size=read @@ -71,33 +90,46 @@ int read_post(char *buf, int max_bytes) return read_size; } -void output_header_attribute(const char *key, const char *value) { +static void add_header_attribute(const char *key, const char *value) { if(cgi) printf("%s: %s\n", key, value); } -void output_body(const char *buf, size_t size) { - if(cgi) // header | body delimiter +/// @todo intelligent cache-control +static void send_header(const char *buf, size_t size) { + if(cgi) { + puts("Cache-Control: no-cache"); + + // header | body delimiter puts(""); + } +} +static void send_body(const char *buf, size_t size) { stdout_write(buf, size); } +/// Service funcs + Service_funcs service_funcs={ + get_env, + read_post, + add_header_attribute, + send_header, + send_body + }; + + // main int main(int argc, char *argv[]) { - //TODO: umask(2); + umask(2); + #ifdef WIN32 - _setmode(fileno(stdin), _O_BINARY); - _setmode(fileno(stdout), _O_BINARY); - _setmode(fileno(stderr), _O_BINARY); + setmode(fileno(stdin), _O_BINARY); + setmode(fileno(stdout), _O_BINARY); + setmode(fileno(stderr), _O_BINARY); #endif - // Service funcs - service_funcs.read_post=read_post; - service_funcs.output_header_attribute=output_header_attribute; - service_funcs.output_body=output_body; - // were we started as CGI? cgi= getenv("SERVER_SOFTWARE") || @@ -113,7 +145,10 @@ int main(int argc, char *argv[]) { } } - const char *filespec_to_process=cgi?getenv("PATH_TRANSLATED"):argv[1]; + char *filespec_to_process=cgi?getenv("PATH_TRANSLATED"):argv[1]; +//\#ifdef WIN32 + fix_slashes(filespec_to_process); +//\#endif PTRY { // global try // must be first in PTRY{}PCATCH @@ -133,7 +168,6 @@ int main(int argc, char *argv[]) { "no file to process"); // Request info - // TODO: ifdef WIN32 flip \\ to / Request::Info request_info; const char *document_root=getenv("DOCUMENT_ROOT"); if(!document_root) { @@ -150,60 +184,53 @@ int main(int argc, char *argv[]) { request_info.content_type=getenv("CONTENT_TYPE"); const char *content_length=getenv("CONTENT_LENGTH"); request_info.content_length=(content_length?atoi(content_length):0); + request_info.cookie=getenv("HTTP_COOKIE"); // prepare to process request - Request request(Pool(), + Pool request_pool; + Request request(request_pool, request_info, - cgi ? String::Untaint_lang::HTML_TYPO : String::Untaint_lang::NO + cgi ? String::UL_HTML_TYPO : String::UL_NO ); // some root-controlled location - char *sys_auto_path1; + char *root_auto_path; #ifdef WIN32 // c:\windows - sys_auto_path1=(char *)pool.malloc(MAX_STRING); - GetWindowsDirectory(sys_auto_path1, MAX_STRING); - strcat(sys_auto_path1, PATH_DELIMITER_STRING); + root_auto_path=(char *)pool.malloc(MAX_STRING); + GetWindowsDirectory(root_auto_path, MAX_STRING); #else // ~nobody - sys_auto_path1=getenv("HOME"); + root_auto_path=getenv("HOME"); #endif // beside by binary - char *sys_auto_path2=(char *)pool.malloc(MAX_STRING); - strncpy(sys_auto_path2, argv[0], MAX_STRING); // filespec of my binary - rsplit(sys_auto_path2, '/'); rsplit(sys_auto_path2, '\\');// strip filename - strcat(sys_auto_path2, PATH_DELIMITER_STRING); + char *site_auto_path=(char *)pool.malloc(MAX_STRING); + strncpy(site_auto_path, argv[0], MAX_STRING); // filespec of my binary + rsplit(site_auto_path, '/'); rsplit(site_auto_path, '\\');// strip filename // process the request request.core(pool.exception(), - sys_auto_path1, - sys_auto_path2); - // no actions with request' data past this point - // request.exception not not handled here, but all - // request' data are associated with it's pool=exception + root_auto_path, false, + site_auto_path, false, + strcasecmp(request_info.method, "HEAD")==0); - // must be last in PTRY{}PCATCH + // must be last in PTRY{}PCATCH #ifdef WIN32 # if _MSC_VER SetUnhandledExceptionFilter(0); # endif +#endif // successful finish return 0; -#endif } PCATCH(e) { // global problem - // @globals fill - // @Request create - // @prepare to .core() - // @request.core when reporting request exception - // @write result const char *body=e.comment(); int content_length=strlen(body); // header (*service_funcs.output_header_attribute)("content-type", "text/plain"); char content_length_cstr[MAX_NUMBER]; - snprintf(content_length_cstr, MAX_NUMBER, "%d", content_length); + snprintf(content_length_cstr, MAX_NUMBER, "%lu", content_length); (*service_funcs.output_header_attribute)("content-length", content_length_cstr);