--- parser3/src/targets/isapi/parser3isapi.C 2002/06/24 11:59:33 1.76 +++ parser3/src/targets/isapi/parser3isapi.C 2004/02/03 16:45:25 1.86 @@ -1,12 +1,12 @@ /** @file Parser: IIS extension. - Copyright (c) 2000,2001, 2002 ArtLebedev Group (http://www.artlebedev.com) + Copyright (c) 2000,2001-2003 ArtLebedev Group (http://www.artlebedev.com) Author: Alexandr Petrosian (http://paf.design.ru) - - $Id: parser3isapi.C,v 1.76 2002/06/24 11:59:33 paf Exp $ */ +static const char * const IDENT_PARSER3ISAPI_C="$Date: 2004/02/03 16:45:25 $"; + #ifndef _MSC_VER # error compile ISAPI module with MSVC [no urge for now to make it autoconf-ed (PAF)] #endif @@ -17,12 +17,10 @@ #include "pa_globals.h" #include "pa_request.h" #include "pa_version.h" -#include "pool_storage.h" #include "pa_socks.h" #include #include -#include #include @@ -30,27 +28,7 @@ // consts -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 *parser3isapi_RCSIds[]; -const char **RCSIds[]={ - main_RCSIds, -#ifdef USE_SMTP - smtp_RCSIds, -#endif - gd_RCSIds, - classes_RCSIds, - types_RCSIds, - parser3isapi_RCSIds, - 0 -}; - -const char *IIS51vars[]={ +const char* IIS51vars[]={ "APPL_MD_PATH", "APPL_PHYSICAL_PATH", "AUTH_PASSWORD", "AUTH_TYPE", "AUTH_USER", "CERT_COOKIE", "CERT_FLAGS", "CERT_ISSUER", "CERT_KEYSIZE", "CERT_SECRETKEYSIZE", @@ -79,7 +57,8 @@ char argv0[MAX_STRING]=""; ISAPI SAPI functions receive this context information. see Pool::set_context */ -struct SAPI_func_context { +class SAPI_Info { +public: LPEXTENSION_CONTROL_BLOCK lpECB; String *header; DWORD http_response_code; @@ -87,49 +66,57 @@ struct SAPI_func_context { #endif // goes to 'cs-uri-query' log file field. webmaster: switch it ON[default OFF]. -void SAPI::log(Pool& pool, const char *fmt, ...) { - SAPI_func_context& ctx=*static_cast(pool.get_context()); - +void SAPI::log(SAPI_Info& SAPI_info, const char* fmt, ...) { va_list args; va_start(args,fmt); char buf[MAX_STRING]; - const char *prefix="PARSER_ERROR:"; + const char* prefix="PARSER_ERROR:"; strcpy(buf, prefix); char *start=buf+strlen(prefix); DWORD size=vsnprintf(start, MAX_STRING-strlen(prefix), fmt, args); remove_crlf(start, start+size); - ctx.lpECB->ServerSupportFunction(ctx.lpECB->ConnID, + SAPI_info.lpECB->ServerSupportFunction(SAPI_info.lpECB->ConnID, HSE_APPEND_LOG_PARAMETER, buf, &size, 0); } /// @todo event log -void SAPI::die(const char *fmt, ...) { - if(FILE *log=fopen("c:\\die.log", "at")) { - va_list args; - va_start(args,fmt); +static void abort(const char* fmt, va_list args) { + if(FILE *log=fopen("c:\\parser3die.log", "at")) { vfprintf(log, fmt, args); fclose(log); } - exit(1); + // exit & try to produce core dump + abort(); +} +void SAPI::die(const char* fmt, ...) { + va_list args; + va_start(args, fmt); + ::abort(fmt, args); + va_end(args); } -const char *SAPI::get_env(Pool& pool, const char *name) { - SAPI_func_context& ctx=*static_cast(pool.get_context()); +void SAPI::abort(const char* fmt, ...) { + va_list args; + va_start(args, fmt); + ::abort(fmt, args); + va_end(args); +} - char *variable_buf=(char *)pool.malloc(MAX_STRING); +char* SAPI::get_env(SAPI_Info& SAPI_info, const char* name) { + char *variable_buf=new(PointerFreeGC) char[MAX_STRING]; DWORD variable_len = MAX_STRING-1; - if(ctx.lpECB->GetServerVariable(ctx.lpECB->ConnID, const_cast(name), + if(SAPI_info.lpECB->GetServerVariable(SAPI_info.lpECB->ConnID, const_cast(name), variable_buf, &variable_len)) { if(*variable_buf) { // saw returning len=1 && *buf=0 :( variable_buf[variable_len]=0; return variable_buf; } } else if (GetLastError()==ERROR_INSUFFICIENT_BUFFER) { - variable_buf=(char *)pool.malloc(variable_len+1); + variable_buf=new(PointerFreeGC) char[variable_len+1]; - if(ctx.lpECB->GetServerVariable(ctx.lpECB->ConnID, const_cast(name), + if(SAPI_info.lpECB->GetServerVariable(SAPI_info.lpECB->ConnID, const_cast(name), variable_buf, &variable_len)) { if(*variable_buf) { variable_buf[variable_len]=0; @@ -141,7 +128,7 @@ const char *SAPI::get_env(Pool& pool, co return 0; } -static int grep_char(const char *s, char c) { +static int grep_char(const char* s, char c) { int result=0; if(s) { while(s=strchr(s, c)) { @@ -151,32 +138,31 @@ static int grep_char(const char *s, char } return result; } -static const char *mk_env_pair(Pool& pool, const char *key, const char *value) { - char *result=(char *)pool.malloc(strlen(key)+1/*=*/+strlen(value)+1/*0*/); +static const char* mk_env_pair(const char* key, const char* value) { + char *result=new(PointerFreeGC) char[strlen(key)+1/*=*/+strlen(value)+1/*0*/]; strcpy(result, key); strcat(result, "="); strcat(result, value); return result; } -const char *const *SAPI::environment(Pool& pool) { +const char* const *SAPI::environment(SAPI_Info& info) { // we know this buf is writable - char *all_http_vars=const_cast(SAPI::get_env(pool, "ALL_HTTP")); + char* all_http_vars=SAPI::get_env(info, "ALL_HTTP"); const int http_var_count=grep_char(all_http_vars, '\n')+1/*\n for theoretical(never saw) this \0*/; - const char **result= - (const char **)pool.malloc(sizeof(char *)*(IIS51var_count+http_var_count+1/*0*/)); - const char **cur=result; + const char* *result=new const char*[IIS51var_count+http_var_count+1/*0*/]; + const char* *cur=result; // IIS5.1 vars for(int i=0; i(pool.get_context()); - +size_t SAPI::read_post(SAPI_Info& SAPI_info, char *buf, size_t max_bytes) { DWORD read_from_buf=0; DWORD read_from_input=0; DWORD total_read=0; - read_from_buf=min(ctx.lpECB->cbAvailable, max_bytes); - memcpy(buf, ctx.lpECB->lpbData, read_from_buf); + read_from_buf=min(SAPI_info.lpECB->cbAvailable, max_bytes); + memcpy(buf, SAPI_info.lpECB->lpbData, read_from_buf); total_read+=read_from_buf; if(read_from_bufcbTotalBytes) { + read_from_bufcbTotalBytes) { DWORD cbRead=0, cbSize; read_from_input=min(max_bytes-read_from_buf, - ctx.lpECB->cbTotalBytes-read_from_buf); + SAPI_info.lpECB->cbTotalBytes-read_from_buf); while(cbRead < read_from_input) { cbSize=read_from_input - cbRead; - if(!ctx.lpECB->ReadClient(ctx.lpECB->ConnID, + if(!SAPI_info.lpECB->ReadClient(SAPI_info.lpECB->ConnID, buf+read_from_buf+cbRead, &cbSize) || cbSize==0) break; @@ -215,30 +199,23 @@ size_t SAPI::read_post(Pool& pool, char return total_read; } -void SAPI::add_header_attribute(Pool& pool, const char *key, const char *value) { - SAPI_func_context& ctx=*static_cast(pool.get_context()); - - if(strcasecmp(key, "location")==0) - ctx.http_response_code=302; - - if(strcasecmp(key, "status")==0) - ctx.http_response_code=atoi(value); - else { - ctx.header->APPEND_CONST(key); - ctx.header->APPEND_CONST(": "); - ctx.header->APPEND_CONST(value); - ctx.header->APPEND_CONST("\r\n"); - } +void SAPI::add_header_attribute(SAPI_Info& SAPI_info, + const char* dont_store_key, const char* dont_store_value) { + if(strcasecmp(dont_store_key, "location")==0) + SAPI_info.http_response_code=302; + + if(strcasecmp(dont_store_key, "status")==0) + SAPI_info.http_response_code=atoi(dont_store_value); + else + (*SAPI_info.header) << pa_strdup(dont_store_key) << ": " << pa_strdup(dont_store_value) << "\r\n"; } /// @todo intelligent cache-control -void SAPI::send_header(Pool& pool) { - SAPI_func_context& ctx=*static_cast(pool.get_context()); - +void SAPI::send_header(SAPI_Info& SAPI_info) { HSE_SEND_HEADER_EX_INFO header_info; char status_buf[MAX_STATUS_LENGTH]; - switch(ctx.http_response_code) { + switch(SAPI_info.http_response_code) { case 200: header_info.pszStatus="200 OK"; break; @@ -250,65 +227,45 @@ void SAPI::send_header(Pool& pool) { break; default: snprintf(status_buf, MAX_STATUS_LENGTH, - "%d Undescribed", ctx.http_response_code); + "%d Undescribed", SAPI_info.http_response_code); header_info.pszStatus=status_buf; break; } header_info.cchStatus=strlen(header_info.pszStatus); - *ctx.header << "\r\n"; // ISAPI v<5 did quite well without it - header_info.pszHeader=ctx.header->cstr(); - header_info.cchHeader=ctx.header->size(); + *SAPI_info.header << "\r\n"; // ISAPI v<5 did quite well without it + header_info.pszHeader=SAPI_info.header->cstr(); + header_info.cchHeader=SAPI_info.header->length(); header_info.fKeepConn=true; - ctx.lpECB->dwHttpStatusCode=ctx.http_response_code; + SAPI_info.lpECB->dwHttpStatusCode=SAPI_info.http_response_code; - ctx.lpECB->ServerSupportFunction(ctx.lpECB->ConnID, + SAPI_info.lpECB->ServerSupportFunction(SAPI_info.lpECB->ConnID, HSE_REQ_SEND_RESPONSE_HEADER_EX, &header_info, NULL, NULL); } -void SAPI::send_body(Pool& pool, const void *buf, size_t size) { - SAPI_func_context& ctx=*static_cast(pool.get_context()); - +void SAPI::send_body(SAPI_Info& SAPI_info, const void *buf, size_t size) { DWORD num_bytes=size; - ctx.lpECB->WriteClient(ctx.lpECB->ConnID, + SAPI_info.lpECB->WriteClient(SAPI_info.lpECB->ConnID, const_cast(buf), &num_bytes, HSE_IO_SYNC); } -// -int failed_new(size_t size) { - SAPI::die("out of memory in 'new', failed to allocated %u bytes", size); - return 0; // not reached -} - -#ifdef _DEBUG -static Pool_storage *global_pool_storagep; -#endif static bool parser_init() { static bool globals_inited=false; if(globals_inited) return true; globals_inited=true; - _set_new_handler(failed_new); - - static Pool_storage pool_storage; -#ifdef _DEBUG - global_pool_storagep=&pool_storage; -#endif - static Pool pool(&pool_storage); // global pool try { // init socks - init_socks(pool); - // init global classes - init_methoded_array(pool); + pa_init_socks(); // init global variables - pa_globals_init(pool); + pa_globals_init(); // successful finish return true; } catch(const Exception& e) { // global problem - const char *body=e.comment(); + //const char* body=e.comment(); // unsuccessful finish return false; @@ -335,23 +292,23 @@ BOOL WINAPI GetExtensionVersion(HSE_VERS PARSER_VERSION from outside */ -void real_parser_handler(Pool& pool, LPEXTENSION_CONTROL_BLOCK lpECB, bool header_only) { - static_cast(pool.get_context())->header=new(pool) String(pool); +void real_parser_handler(SAPI_Info& SAPI_info, bool header_only) { + SAPI_info.header=new String; + LPEXTENSION_CONTROL_BLOCK lpECB=SAPI_info.lpECB; // Request info - Request::Info request_info; + Request_info request_info; memset(&request_info, 0, sizeof(request_info)); size_t path_translated_buf_size=strlen(lpECB->lpszPathTranslated)+1; - char *filespec_to_process=(char *)pool.malloc(path_translated_buf_size); - memcpy(filespec_to_process, lpECB->lpszPathTranslated, path_translated_buf_size); + char *filespec_to_process=pa_strdup(lpECB->lpszPathTranslated, path_translated_buf_size); #ifdef WIN32 back_slashes_to_slashes(filespec_to_process); #endif - if(const char *path_info=SAPI::get_env(pool, "PATH_INFO")) { + if(const char* path_info=SAPI::get_env(SAPI_info, "PATH_INFO")) { // IIS size_t len=strlen(filespec_to_process)-strlen(path_info); - char *buf=(char *)pool.malloc(len+1); + char *buf=new(PointerFreeGC) char[len+1]; strncpy(buf, filespec_to_process, len); buf[len]=0; request_info.document_root=buf; } else @@ -363,9 +320,9 @@ void real_parser_handler(Pool& pool, LPE request_info.method=lpECB->lpszMethod; request_info.query_string=lpECB->lpszQueryString; if(lpECB->lpszQueryString && *lpECB->lpszQueryString) { - char *reconstructed_uri=(char *)pool.malloc( + char *reconstructed_uri=new(PointerFreeGC) char[ strlen(lpECB->lpszPathInfo)+1/*'?'*/+ - strlen(lpECB->lpszQueryString)+1/*0*/); + strlen(lpECB->lpszQueryString)+1/*0*/]; strcpy(reconstructed_uri, lpECB->lpszPathInfo); strcat(reconstructed_uri, "?"); strcat(reconstructed_uri, lpECB->lpszQueryString); @@ -375,19 +332,14 @@ void real_parser_handler(Pool& pool, LPE request_info.content_type=lpECB->lpszContentType; request_info.content_length=lpECB->cbTotalBytes; - request_info.cookie=SAPI::get_env(pool, "HTTP_COOKIE"); + request_info.cookie=SAPI::get_env(SAPI_info, "HTTP_COOKIE"); request_info.mail_received=false; // prepare to process request - Request request(pool, + Request request(SAPI_info, request_info, - String::UL_HTML|String::UL_OPTIMIZE_BIT, -#ifdef _DEBUG - true -#else - false -#endif - /* status_allowed */); + String::Language(String::L_HTML|String::L_OPTIMIZE_BIT), + true /* status_allowed */); // beside by binary static char beside_binary_path[MAX_STRING]; @@ -402,21 +354,20 @@ void real_parser_handler(Pool& pool, LPE snprintf(config_filespec, MAX_STRING, "%s/%s", beside_binary_path, AUTO_FILE_NAME); + bool fail_on_config_read_problem=entry_exists(config_filespec); // process the request request.core( - config_filespec, false /*fail_on_read_problem*/, // /path/to/first/auto.p + config_filespec, fail_on_config_read_problem, // /path/to/first/auto.p header_only); } -void call_real_parser_handler__do_SEH(Pool& pool, - LPEXTENSION_CONTROL_BLOCK lpECB, - bool header_only) { +void call_real_parser_handler__do_SEH(SAPI_Info& SAPI_info, bool header_only) { #if _MSC_VER & !defined(_DEBUG) LPEXCEPTION_POINTERS system_exception=0; __try { #endif - real_parser_handler(pool, lpECB, header_only); + real_parser_handler(SAPI_info, header_only); #if _MSC_VER & !defined(_DEBUG) } __except ( @@ -436,27 +387,25 @@ void call_real_parser_handler__do_SEH(Po #endif } -inline DWORD RealHttpExtensionProc(LPEXTENSION_CONTROL_BLOCK lpECB) { - Pool_storage pool_storage; - Pool pool(&pool_storage); // no allocations until assigned context [for reporting] - SAPI_func_context ctx={ +DWORD WINAPI HttpExtensionProc(LPEXTENSION_CONTROL_BLOCK lpECB) { + //_asm int 3; + SAPI_Info SAPI_info={ lpECB, - 0, // filling later: so that if there would be error pool would have ctx - 200 // default http_response_code + 0, // filling later: so that if there would be error pool would have SAPI_info + 200 // default http_response_code [lpECB->dwHttpStatusCode seems to be always 0, even on 404 redirect to /404.html] }; - pool.set_context(&ctx);// no allocations before this line! bool header_only=strcasecmp(lpECB->lpszMethod, "HEAD")==0; try { // global try - call_real_parser_handler__do_SEH(pool, lpECB, header_only); + call_real_parser_handler__do_SEH(SAPI_info, header_only); // successful finish } catch(const Exception& e) { // global problem // don't allocate anything on pool here: // possible pool' exception not catch-ed now // and there could be out-of-memory exception - const char *body=e.comment(); + const char* body=e.comment(); // log it - SAPI::log(pool, "exception in request exception handler: %s", body); + SAPI::log(SAPI_info, "exception in request exception handler: %s", body); // int content_length=strlen(body); @@ -465,7 +414,7 @@ inline DWORD RealHttpExtensionProc(LPEXT char header_buf[MAX_STRING]; int header_len=snprintf(header_buf, MAX_STRING, "content-type: text/plain\r\n" - "content-length: %lu\r\n" + "content-length: %u\r\n" // "expires: Fri, 23 Mar 2001 09:32:23 GMT\r\n" "\r\n", content_length); @@ -484,12 +433,12 @@ inline DWORD RealHttpExtensionProc(LPEXT // send body if(!header_only) - SAPI::send_body(pool, body, content_length); + SAPI::send_body(SAPI_info, body, content_length); // unsuccessful finish } /* - const char *body="test"; + const char* body="test"; // int content_length=strlen(body); @@ -498,7 +447,7 @@ inline DWORD RealHttpExtensionProc(LPEXT char header_buf[MAX_STRING]; int header_len=snprintf(header_buf, MAX_STRING, "content-type: text/plain\r\n" - "content-length: %lu\r\n" + "content-length: %u\r\n" "expires: Fri, 23 Mar 2001 09:32:23 GMT\r\n" "\r\n", content_length); @@ -522,39 +471,10 @@ inline DWORD RealHttpExtensionProc(LPEXT return HSE_STATUS_SUCCESS_AND_KEEP_CONN; } -#ifdef _DEBUG -//for memory leaks detection only -#undef _WINDOWS_ -#include -#endif -DWORD WINAPI HttpExtensionProc(LPEXTENSION_CONTROL_BLOCK lpECB) { -// Declare the variables needed -#ifdef _DEBUG -// _crtBreakAlloc=97779;//97777; //997; - - CMemoryState oldMemState, newMemState, diffMemState; - oldMemState.Checkpoint(); - //global_pool_storagep->fbreak_on_alloc=true; -#endif - - DWORD result=RealHttpExtensionProc(lpECB); - -#ifdef _DEBUG - newMemState.Checkpoint(); - if( diffMemState.Difference( oldMemState, newMemState ) ) - { - TRACE( "Memory leaked!\n" ); - diffMemState.DumpStatistics( ); - diffMemState.DumpAllObjectsSince(); - } -#endif - return result; -} - BOOL WINAPI DllMain( HINSTANCE hinstDLL, // handle to the DLL module - DWORD fdwReason, // reason for calling function - LPVOID lpvReserved // reserved + DWORD /*fdwReason*/, // reason for calling function + LPVOID /*lpvReserved*/ // reserved ) { GetModuleFileName(