--- parser3/src/targets/isapi/parser3isapi.C 2001/03/23 08:47:51 1.7 +++ parser3/src/targets/isapi/parser3isapi.C 2001/04/09 15:49:03 1.26 @@ -1,5 +1,5 @@ #ifndef _MSC_VER -# error compile ISAPI module with MSVC +# error compile ISAPI module with MSVC [no urge for now to make it autoconf-ed (PAF)] #endif #include @@ -7,23 +7,48 @@ #include +#include "pa_sapi.h" #include "pa_globals.h" #include "pa_request.h" #include "pa_version.h" +#include "pool_storage.h" +#include "pa_socks.h" +#include "pa_exec.h" + +/// @todo init_socks #define MAX_STATUS_LENGTH sizeof("xxxx LONGEST STATUS DESCRIPTION") -//@{ -/// service func decl +// SAPI + +/** + ISAPI SAPI functions receive this context information. -struct Service_func_context { + @see Pool::set_context +*/ +struct SAPI_func_context { LPEXTENSION_CONTROL_BLOCK lpECB; String *header; DWORD http_response_code; }; -static const char *get_env(Pool& pool, const char *name) { - Service_func_context& ctx=*static_cast(pool.context()); +// 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.context()); + + va_list args; + va_start(args,fmt); + char buf[MAX_STRING]; + const char *prefix="PARSER_ERROR:"; + strcpy(buf, prefix); + DWORD size=vsnprintf(buf+strlen(prefix), MAX_STRING-strlen(prefix), fmt, args); + + ctx.lpECB->ServerSupportFunction(ctx.lpECB->ConnID, + HSE_APPEND_LOG_PARAMETER, buf, &size, 0); +} + +const char *SAPI::get_env(Pool& pool, const char *name) { + SAPI_func_context& ctx=*static_cast(pool.context()); char *variable_buf=(char *)pool.malloc(MAX_STRING); DWORD variable_len = MAX_STRING-1; @@ -45,8 +70,8 @@ static const char *get_env(Pool& pool, c return 0; } -static uint read_post(Pool& pool, char *buf, uint max_bytes) { - Service_func_context& ctx=*static_cast(pool.context()); +size_t SAPI::read_post(Pool& pool, char *buf, size_t max_bytes) { + SAPI_func_context& ctx=*static_cast(pool.context()); DWORD read_from_buf=0; DWORD read_from_input=0; @@ -75,8 +100,8 @@ static uint read_post(Pool& pool, char * return total_read; } -static void add_header_attribute(Pool& pool, const char *key, const char *value) { - Service_func_context& ctx=*static_cast(pool.context()); +void SAPI::add_header_attribute(Pool& pool, const char *key, const char *value) { + SAPI_func_context& ctx=*static_cast(pool.context()); if(strcasecmp(key, "location")==0) ctx.http_response_code=302; @@ -92,12 +117,11 @@ static void add_header_attribute(Pool& p } /// @todo intelligent cache-control -static void send_header(Pool& pool) { - Service_func_context& ctx=*static_cast(pool.context()); +void SAPI::send_header(Pool& pool) { + SAPI_func_context& ctx=*static_cast(pool.context()); ctx.header->APPEND_CONST( - "Connection: keep-alive\n" - "Cache-Control: no-cache\n" + "expires: Fri, 23 Mar 2001 09:32:23 GMT\n" "\n"); HSE_SEND_HEADER_EX_INFO header_info; @@ -109,9 +133,9 @@ static void send_header(Pool& pool) { case 302: header_info.pszStatus="302 Moved Temporarily"; break; - /*case 401: + case 401:// useless untill parser auth mech header_info.pszStatus="401 Authorization Required"; - break;*/ + break; default: snprintf(status_buf, MAX_STATUS_LENGTH, "%d Undescribed", ctx.http_response_code); @@ -129,41 +153,41 @@ static void send_header(Pool& pool) { HSE_REQ_SEND_RESPONSE_HEADER_EX, &header_info, NULL, NULL); } -static void send_body(Pool& pool, const char *buf, size_t size) { - Service_func_context& ctx=*static_cast(pool.context()); +void SAPI::send_body(Pool& pool, const void *buf, size_t size) { + SAPI_func_context& ctx=*static_cast(pool.context()); DWORD num_bytes=size; ctx.lpECB->WriteClient(ctx.lpECB->ConnID, - const_cast(buf), &num_bytes, HSE_IO_SYNC); + const_cast(buf), &num_bytes, HSE_IO_SYNC); } -//@} -/// Service funcs -Service_funcs service_funcs={ - get_env, - read_post, - add_header_attribute, - send_header, - send_body -}; +int SAPI::execute(const String& file_spec, + const Hash *env, + const Array *argv, + const String& in, String& out, String& err) { + return pa_exec(file_spec, env, argv, in, out, err); +} // -static void parser_init() { +static bool parser_init() { static bool globals_inited=false; if(globals_inited) - return; + return true; globals_inited=true; - static Pool pool; // global pool + static Pool pool(0); // global pool PTRY { // init global variables - globals_init(pool); + pa_globals_init(pool); - //... + // successful finish + return true; } PCATCH(e) { // global problem - const char *body=e.comment(); - // TODO: somehow report that error + //const char *body=e.comment(); + + // unsuccessful finish + return false; } PEND_CATCH } @@ -171,42 +195,56 @@ static void parser_init() { /// ISAPI // BOOL WINAPI GetExtensionVersion(HSE_VERSION_INFO *pVer) { pVer->dwExtensionVersion = HSE_VERSION; - strncpy(pVer->lpszExtensionDesc, "Parser " PARSER_VERSION, HSE_MAX_EXT_DLL_NAME_LEN); - return TRUE; + strncpy(pVer->lpszExtensionDesc, "Parser "PARSER_VERSION, HSE_MAX_EXT_DLL_NAME_LEN); + return parser_init(); } /** ISAPI // main workhorse @todo - think of a better way than @c APPL_PHYSICAL_PATH - of obtaining the @c DOCUMENT_ROOT - because this only gets "the place where last IIS Application was set" - and if someone would redefine Application settings below the / - all ^table:load[/test] would open not /test but /below/test + IIS: remove trailing default-document[index.html] from $request.uri. + to do that we need to consult metabase, + wich is tested&works but seems slow runtime + and not could-be-quickly-implemented if prepared. */ DWORD WINAPI HttpExtensionProc(LPEXTENSION_CONTROL_BLOCK lpECB) { - Pool pool; + Pool_storage pool_storage; + Pool pool(&pool_storage); // no allocations until assigned context [for reporting] + SAPI_func_context ctx={ + lpECB, + 0, // filling later: so that if there would be error pool would have ctx + 200 + }; + pool.set_context(&ctx);// no allocations before this line! bool header_only=strcasecmp(lpECB->lpszMethod, "HEAD")==0; PTRY { // global try - Service_func_context ctx={ - lpECB, - new(pool) String(pool), - 200 - }; - pool.set_context(&ctx); + ctx.header=new(pool) String(pool); // Request info Request::Info request_info; - - if(!(request_info.document_root=get_env(pool, "APPL_PHYSICAL_PATH"))) + + size_t path_translated_buf_size=strlen(lpECB->lpszPathTranslated)+1; + char *filespec_to_process=(char *)malloc(path_translated_buf_size); + memcpy(filespec_to_process, 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")) { + // IIS + size_t len=strlen(filespec_to_process)-strlen(path_info); + char *buf=(char *)pool.malloc(len+1); + strncpy(buf, filespec_to_process, len); + buf[len]=0; + request_info.document_root=buf; + } else PTHROW(0, 0, 0, - "can not get server variable APPL_PHYSICAL_PATH (error #%lu)", - GetLastError()); // never + "ISAPI: no PATH_INFO defined (in reinventing DOCUMENT_ROOT)"); - request_info.path_translated=lpECB->lpszPathTranslated; + request_info.path_translated=filespec_to_process; request_info.method=lpECB->lpszMethod; request_info.query_string=lpECB->lpszQueryString; if(lpECB->lpszQueryString && *lpECB->lpszQueryString) { @@ -222,14 +260,16 @@ DWORD WINAPI HttpExtensionProc(LPEXTENSI request_info.content_type=lpECB->lpszContentType; request_info.content_length=lpECB->cbTotalBytes; - request_info.cookie=get_env(pool, "HTTP_COOKIE"); + request_info.cookie=SAPI::get_env(pool, "HTTP_COOKIE"); + request_info.user_agent=SAPI::get_env(pool, "HTTP_USER_AGENT"); + // prepare to process request Request request(pool, request_info, String::UL_HTML_TYPO ); - + // some root-controlled location // c:\windows // must be dynamic: rethrowing from request.core @@ -242,48 +282,46 @@ DWORD WINAPI HttpExtensionProc(LPEXTENSI root_auto_path, false/*may be abcent*/, // /path/to/admin/auto.p 0/*parser_site_auto_path*/, false, // /path/to/site/auto.p header_only); - // successful finish - } PCATCH(e) { // global problem + } PCATCH(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(); - int content_length=strlen(body); + // log it + SAPI::log(pool, "exception in request exception handler: %s", body); - // prepare header - add_header_attribute(pool, "content-type", "text/plain"); - char content_length_cstr[MAX_NUMBER]; - snprintf(content_length_cstr, MAX_NUMBER, "%lu", content_length); - add_header_attribute(pool, "content-length", content_length_cstr); + // + int content_length=strlen(body); + // prepare header // not using SAPI func wich allocates on pool + char header_buf[MAX_STRING]; + int header_len=snprintf(header_buf, MAX_STRING, + "content-type: text/plain\n" + "content-length: %ul\n" + "expires: Fri, 23 Mar 2001 09:32:23 GMT\n" + "\n", + content_length); + + HSE_SEND_HEADER_EX_INFO header_info; + header_info.pszStatus="200 OK"; + header_info.cchStatus=strlen(header_info.pszStatus); + header_info.pszHeader=header_buf; + header_info.cchHeader=header_len; + header_info.fKeepConn=true; + // send header - send_header(pool); + lpECB->dwHttpStatusCode=200; + lpECB->ServerSupportFunction(lpECB->ConnID, + HSE_REQ_SEND_RESPONSE_HEADER_EX, &header_info, NULL, NULL); // send body if(!header_only) - send_body(pool, body, content_length); + SAPI::send_body(pool, body, content_length); // unsuccessful finish - _endthread(); } PEND_CATCH return HSE_STATUS_SUCCESS_AND_KEEP_CONN; } - - -BOOL APIENTRY DllMain(HANDLE hModule, - DWORD ul_reason_for_call, - LPVOID lpReserved - ) { - switch (ul_reason_for_call) { - case DLL_PROCESS_ATTACH: - parser_init(); - break; - case DLL_THREAD_ATTACH: - break; - case DLL_THREAD_DETACH: - break; - case DLL_PROCESS_DETACH: - break; - } - return TRUE; -}