--- parser3/src/main/pa_request.C 2002/12/02 10:07:39 1.243 +++ parser3/src/main/pa_request.C 2003/12/11 09:36:51 1.263 @@ -1,11 +1,11 @@ /** @file Parser: request class main part. @see compile.C and execute.C. - Copyright (c) 2001, 2002 ArtLebedev Group (http://www.artlebedev.com) + Copyright (c) 2001-2003 ArtLebedev Group (http://www.artlebedev.com) Author: Alexandr Petrosian (http://paf.design.ru) */ -static const char* IDENT_REQUEST_C="$Date: 2002/12/02 10:07:39 $"; +static const char * const IDENT_REQUEST_C="$Date: 2003/12/11 09:36:51 $"; #include "pa_sapi.h" #include "pa_common.h" @@ -16,118 +16,193 @@ static const char* IDENT_REQUEST_C="$Dat #include "pa_vint.h" #include "pa_vmethod_frame.h" #include "pa_types.h" +#include "pa_venv.h" +#include "pa_vmath.h" +#include "pa_vstatus.h" +#include "pa_vrequest.h" #include "pa_vtable.h" #include "pa_vfile.h" #include "pa_dictionary.h" #include "pa_charset.h" #include "pa_charsets.h" +#include "pa_cache_managers.h" +#include "pa_vmail.h" +#include "pa_vform.h" +#include "pa_vcookie.h" +#include "pa_vresponse.h" +#include "pa_vmemory.h" +#include "pa_vconsole.h" -const char *POST_PROCESS_METHOD_NAME="postprocess"; -const char *UNHANDLED_EXCEPTION_METHOD_NAME="unhandled_exception"; +// consts + +const char* UNHANDLED_EXCEPTION_METHOD_NAME="unhandled_exception"; /// content type of exception response, when no @MAIN:exception handler defined -const char *UNHANDLED_EXCEPTION_CONTENT_TYPE="text/plain"; +const char* UNHANDLED_EXCEPTION_CONTENT_TYPE="text/plain"; /// content type of response when no $MAIN:defaults.content-type defined -const char *DEFAULT_CONTENT_TYPE="text/html"; -const char *ORIGINS_CONTENT_TYPE="text/plain"; +const char* DEFAULT_CONTENT_TYPE="text/html"; +const char* ORIGINS_CONTENT_TYPE="text/plain"; + +// defines for globals + +#define MAIN_METHOD_NAME "main" +#define AUTO_METHOD_NAME "auto" +#define BODY_NAME "body" +#define EXCEPTION_TYPE_PART_NAME "type" +#define EXCEPTION_SOURCE_PART_NAME "source" +#define EXCEPTION_COMMENT_PART_NAME "comment" + +// globals + +const String main_method_name(MAIN_METHOD_NAME); +const String auto_method_name(AUTO_METHOD_NAME); +const String content_disposition_name(CONTENT_DISPOSITION_NAME); +const String content_disposition_value(CONTENT_DISPOSITION_VALUE); +const String content_disposition_filename_name(CONTENT_DISPOSITION_FILENAME_NAME); +const String body_name(BODY_NAME); +const String exception_type_part_name(EXCEPTION_TYPE_PART_NAME); +const String exception_source_part_name(EXCEPTION_SOURCE_PART_NAME); +const String exception_comment_part_name(EXCEPTION_COMMENT_PART_NAME); +const String exception_handled_part_name(EXCEPTION_HANDLED_PART_NAME); + +// defines for statics + +#define CHARSETS_NAME "CHARSETS" +#define MIME_TYPES_NAME "MIME-TYPES" +#define ORIGINS_MODE_NAME "ORIGINS" +#define CONF_METHOD_NAME "conf" +#define POST_PROCESS_METHOD_NAME "postprocess" +#define DOWNLOAD_NAME "download" +#define CLASS_PATH_NAME "CLASS_PATH" + +// statics + +static const String charsets_name(CHARSETS_NAME); +static const String main_class_name(MAIN_CLASS_NAME); +static const String mime_types_name(MIME_TYPES_NAME); +static const String origins_mode_name(ORIGINS_MODE_NAME); +static const String conf_method_name(CONF_METHOD_NAME); +static const String post_process_method_name(POST_PROCESS_METHOD_NAME); +static const String download_name(DOWNLOAD_NAME); +static const String class_path_name(CLASS_PATH_NAME); + +// defines // op.C -VClass& VClassMAIN_create(Pool& pool); -// op.C -VHash& exception2vhash(Pool& pool, const Exception& e); +VStateless_class& VClassMAIN_create(); // -Request::Request(Pool& apool, - Info& ainfo, - uchar adefault_lang, - bool status_allowed) : Pooled(apool), - main_method_name(apool, MAIN_METHOD_NAME), - stack(apool), - main_class(VClassMAIN_create(apool)), - env(apool), - status(apool), - form(apool), - mail(apool), - math(apool), - request(apool, *this), - response(apool), - cookie(apool), - fclasses(apool), - fdefault_lang(adefault_lang), flang(adefault_lang), - info(ainfo), - post_data(0), post_size(0), - used_files(apool), - configure_admin_done(false), - default_content_type(0), - mime_types(0), - fconnection(0), - classes_conf(apool), +Request::Request(SAPI_Info& asapi_info, Request_info& arequest_info, + String::Language adefault_lang, bool status_allowed): + // private anti_endless_execute_recoursion(0), - exception_trace(apool) + + // public + method_frame(0), + rcontext(0), + wcontext(0), + flang(adefault_lang), + fconnection(0), + finterrupted(false), + + // public #ifdef RESOURCES_DEBUG - , sql_connect_time(0),sql_request_time(0) -#endif - , method_frame(0), rcontext(0), wcontext(0), - finterrupted(false) + sql_connect_time(0), + sql_request_time(0), +#endif + + // public + request_info(arequest_info), + sapi_info(asapi_info), + charsets(UTF8_charset, UTF8_charset, UTF8_charset), // default charsets + + main_class(VClassMAIN_create()), + form(*new VForm(charsets, arequest_info)), + mail(*new VMail), + response(*new VResponse(arequest_info, charsets)), + cookie(*new VCookie), + + // private + configure_admin_done(false), + + // private defaults + fdefault_lang(adefault_lang), + // private mime types + mime_types(0) { - // default charsets - pool().set_source_charset(*utf8_charset); - pool().set_client_charset(*utf8_charset); + pa_register_thread_request(*this); + + // file_no=0 => unknown + file_list+=String::Body("UNKNOWN"); + file_list+=String::Body("-body of process-"); // pseudo_file_no__process // maybe expire old caches - cache_managers->maybe_expire(); + cache_managers.maybe_expire(); /// directly used // MAIN class, operators classes().put(main_class.name(), &main_class); // classes: // table, file, random, mail, image, ... - methoded_array->register_directly_used(*this); + methoded_array().register_directly_used(*this); /// methodless // env class - classes().put(*NEW String(pool(), ENV_CLASS_NAME), &env); + classes().put(String::Body(ENV_CLASS_NAME), new VEnv(asapi_info)); // status class if(status_allowed) - classes().put(*NEW String(pool(), STATUS_CLASS_NAME), &status); + classes().put(String::Body(STATUS_CLASS_NAME), new VStatus()); // request class - classes().put(*NEW String(pool(), REQUEST_CLASS_NAME), &request); + classes().put(String::Body(REQUEST_CLASS_NAME), new VRequest(arequest_info, charsets)); // cookie class - classes().put(*NEW String(pool(), COOKIE_CLASS_NAME), &cookie); + classes().put(String::Body(COOKIE_CLASS_NAME), &cookie); + // console class + classes().put(String::Body(CONSOLE_CLASS_NAME), new VConsole()); /// methoded // response class - classes().put(response.get_class()->name(), &response); + classes().put(response.get_class()->name(), &response); /// bases used // form class - classes().put(form.get_class()->base_class()->name(), &form); + classes().put(form.get_class()->base_class()->name(), &form); // mail class - classes().put(mail.get_class()->base_class()->name(), &mail); + classes().put(mail.get_class()->base_class()->name(), &mail); // math class - classes().put(math.get_class()->base_class()->name(), &math); + { + Value& math=*new VMath; + classes().put(math.get_class()->base_class()->name(), &math); + } + // memory class + { + Value& memory=*new VMemory; + classes().put(memory.get_class()->base_class()->name(), &memory); + } } Request::~Request() { #ifdef XML // if for some strange reason xml generic errors failed to be reported, free them up - if(const char *xml_generic_errors=xmlGenericErrors()) { - SAPI::log(pool(), "warning: unreported xmlGenericErrors: %s", xml_generic_errors); + if(const char* xml_generic_errors=xmlGenericErrors()) { + SAPI::log(sapi_info, "warning: unreported xmlGenericErrors: %s", xml_generic_errors); free((void *)xml_generic_errors); } #endif } -Value *Request::get_self() { return method_frame?&method_frame->self():0; } +Value& Request::get_self() { return method_frame/*always have!*/->self(); } -static void load_charset(const Hash::Key& akey, Hash::Val *avalue, void *) { - charsets->load_charset(akey, static_cast(avalue)->as_string()); +static void load_charset(HashStringValue::key_type akey, + HashStringValue::value_type avalue, + Request_charsets* charsets) { + const String::Body NAME=String(akey, String::L_CLEAN).change_case(charsets->source(), String::CC_UPPER); + ::charsets.load_charset(*charsets, NAME, avalue->as_string()); } -void Request::configure_admin(VStateless_class& conf_class, const String *source) { +void Request::configure_admin(VStateless_class& conf_class) { if(configure_admin_done) throw Exception("parser.runtime", - source, + 0, "parser already configured"); configure_admin_done=true; @@ -139,10 +214,10 @@ void Request::configure_admin(VStateless ... ] */ - if(Value *vcharsets=conf_class.get_element(*charsets_name, conf_class, false)) { + if(Value* vcharsets=conf_class.get_element(charsets_name, conf_class, false)) { if(!vcharsets->is_string()) - if(Hash *charsets=vcharsets->get_hash(0)) - charsets->for_each(load_charset); + if(HashStringValue* charsets=vcharsets->get_hash()) + charsets->for_each(load_charset, &this->charsets); else throw Exception("parser.runtime", 0, @@ -151,7 +226,7 @@ void Request::configure_admin(VStateless // configure method_frame options // until someone with less privileges have overriden them - methoded_array->configure_admin(*this); + methoded_array().configure_admin(*this); } /** @@ -165,9 +240,7 @@ void Request::configure_admin(VStateless @test log stack trace */ -void Request::core( - const char *config_filespec, bool config_fail_on_read_problem, - bool header_only) { +void Request::core(const char* config_filespec, bool config_fail_on_read_problem, bool header_only) { #ifdef RESOURCES_DEBUG //measures @@ -176,70 +249,69 @@ struct timeval mt[10]; gettimeofday(&mt[0],NULL); #endif try { - char *auto_filespec=(char *)malloc(MAX_STRING); - // loading config if(config_filespec) { - String& filespec=*NEW String(pool()); - filespec.APPEND_CLEAN(config_filespec, 0, "config", 0); + const String& filespec=*new String(config_filespec); use_file(main_class, - filespec, true/* ignore class_path */, - config_fail_on_read_problem, true/* file must exist if 'fail on read problem' not set */); + filespec, 0 /*main_alias*/, + true /*ignore class_path*/, + config_fail_on_read_problem, + true /*file must exist if 'fail on read problem' not set*/); } // loading auto.p files from document_root/.. // to the one beside requested file. // all assigned bases from upper dir { - const char *after=info.path_translated; - size_t drlen=strlen(info.document_root); - if(memcmp(after, info.document_root, drlen)==0) { + const char* after=request_info.path_translated; + size_t drlen=strlen(request_info.document_root); + if(memcmp(after, request_info.document_root, drlen)==0) { after+=drlen; if(after[-1]=='/') --after; } - int step=0; - while(const char *before=strchr(after, '/')) { - String& sfile_spec=*NEW String(pool()); - if(after!=info.path_translated) { - sfile_spec.APPEND_CLEAN( - info.path_translated, before-info.path_translated, - "path-translated-scanned", step++); + while(const char* before=strchr(after, '/')) { + String& sfile_spec=*new String; + if(after!=request_info.path_translated) { + sfile_spec.append_strdup( + request_info.path_translated, before-request_info.path_translated, + String::L_CLEAN); sfile_spec << "/" AUTO_FILE_NAME; use_file(main_class, - sfile_spec, true/* ignore class_path */, - true/* fail on read problem */, false/* but ignore absence, sole user */); + sfile_spec, + 0 /*main_alias*/, + true /*ignore class_path*/, + true /*fail on read problem*/, + false /*but ignore absence, sole user*/); } after=before+1; } } // compile requested file - String& spath_translated=*NEW String(pool()); - spath_translated.APPEND_TAINTED(info.path_translated, 0, "user-request", 0); + String& spath_translated=*new String; + spath_translated.append_help_length(request_info.path_translated, 0, String::L_TAINTED); use_file(main_class, - spath_translated, true/* ignore class_path */, - true/* fail on read problem*/, true/* fail on abscence */); + spath_translated, + 0 /*main_alias*/, + true /*ignore class_path*/); // configure method_frame options if not configured yet if(!configure_admin_done) - configure_admin(main_class, 0); + configure_admin(main_class); // configure not-method_frame=user options - methoded_array->configure_user(*this); + methoded_array().configure_user(*this); // $MAIN:MIME-TYPES - if(Value *element=main_class.get_element(*mime_types_name, main_class, false)) + if(Value* element=main_class.get_element(mime_types_name, main_class, false)) if(Table *table=element->get_table()) mime_types=table; - // filling form fields - form.fill_fields_and_tables(*this); - // filling cookies - cookie.fill_fields(*this); + cookie.fill_fields(request_info); // filling mail received mail.fill_received(*this); @@ -249,10 +321,10 @@ gettimeofday(&mt[0],NULL); gettimeofday(&mt[1],NULL); #endif // execute @main[] - const String *body_string=execute_virtual_method(main_class, main_method_name); + const String* body_string=execute_virtual_method(main_class, main_method_name); if(!body_string) throw Exception("parser.runtime", - 0, + 0, "'"MAIN_METHOD_NAME"' method not found"); #ifdef RESOURCES_DEBUG @@ -260,38 +332,29 @@ gettimeofday(&mt[1],NULL); gettimeofday(&mt[2],NULL); #endif - VString body_vstring_before_post_process(*body_string); - VString *body_vstring_after_post_process=&body_vstring_before_post_process; + // extract response body + Value* body_value=response.fields().get(download_name); // $response:download? + bool as_attachment=body_value!=0; + if(!body_value) + body_value=response.fields().get(body_name); // $response:body + if(!body_value) + body_value=new VString(*body_string); // just result of ^main[] + // @postprocess - if(Value *value=main_class.get_element( - *NEW String(pool(), POST_PROCESS_METHOD_NAME), - main_class, - false)) - if(Junction *junction=value->get_junction()) + if(Value* value=main_class.get_element(post_process_method_name, main_class, false)) + if(Junction* junction=value->get_junction()) if(const Method *method=junction->method) { // preparing to pass parameters to // @postprocess[data] - VMethodFrame frame(pool(), method->name, *junction, 0/*no parent*/); + VMethodFrame frame(/*method->name, */ *junction, 0/*no parent*/); frame.set_self(main_class); - frame.store_param(&body_vstring_before_post_process); - body_vstring_after_post_process= - NEW VString(execute_method(frame, *method)); + frame.store_param(*body_value); + body_value=&execute_method(frame, *method).as_value(); } - bool lorigins_mode=origins_mode(); - - const VFile *body_file=body_vstring_after_post_process->as_vfile( - String::UL_UNSPECIFIED, lorigins_mode); - - // extract response body - Value *body_value=static_cast( - response.fields().get(*body_name)); - if(body_value) // there is some $response:body - body_file=body_value->as_vfile(); - else if(lorigins_mode) - response.fields().put(*content_type_name, - NEW VString(*NEW String(pool(), ORIGINS_CONTENT_TYPE))); + VFile* body_file=body_value->as_vfile( + String::L_UNSPECIFIED, &charsets); #ifdef RESOURCES_DEBUG //measure:after postprocess @@ -299,7 +362,7 @@ gettimeofday(&mt[3],NULL); #endif // OK. write out the result - output_result(*body_file, header_only); + output_result(body_file, header_only, as_attachment); #ifdef RESOURCES_DEBUG //measure:after output_result @@ -310,8 +373,8 @@ double t[10]; for(int i=0;i<10;i++) t[i]=mt[i].tv_sec+mt[i].tv_usec/1000000.0; //measure:log2 compile,main,postprocess,output -SAPI::log(pool(), "rmeasure: %s,%.2f,%.2f,%.2f %.2f,%.2f %.2f", -info.uri, +SAPI::log("rmeasure: %s,%.2f,%.2f,%.2f %.2f,%.2f %.2f", +request_info.uri, t[1]-t[0], t[2]-t[1], t[3]-t[2], @@ -321,152 +384,154 @@ t[9]-t[3] #endif } catch(const Exception& e) { // request handling problem // we're returning not result, but error explanation - try { - // log the beast - if(const String *problem_source=e.problem_source()) - SAPI::log(pool(), - "%s: " -#ifndef NO_STRING_ORIGIN - ORIGIN_FILE_LINE_FORMAT": " -#endif - "'%s' %s [%s]", - info.uri, -#ifndef NO_STRING_ORIGIN - problem_source->origin().file?problem_source->origin().file:"global", - problem_source->origin().line, -#endif - problem_source->cstr(), - e.comment(), - e.type() +#define PA_URI_FORMAT "%s: " +#define PA_ORIGIN_FILE_POS_FORMAT "%s(%d:%d): " +#define PA_SOURCE_FORMAT "'%s' " +#define PA_COMMENT_TYPE_FORMAT "%s [%s]" + // log the beast + Request::Exception_details details=get_details(e); + + if(details.problem_source) { // do we know the guy? + if(details.trace) { // do whe know where he came from? + Operation::Origin origin=details.trace.origin(); + SAPI::log(sapi_info, + PA_URI_FORMAT + PA_ORIGIN_FILE_POS_FORMAT + PA_SOURCE_FORMAT PA_COMMENT_TYPE_FORMAT, + request_info.uri, + file_list[origin.file_no].cstr(), 1+origin.line, 1+origin.col, + details.problem_source->cstr(), + e.comment(), e.type() ); - else - SAPI::log(pool(), - "%s: " - "%s [%s]", - info.uri, + } else + SAPI::log(sapi_info, + PA_URI_FORMAT + PA_SOURCE_FORMAT PA_COMMENT_TYPE_FORMAT, + request_info.uri, + details.problem_source->cstr(), e.comment(), e.type() ); + } else + SAPI::log(sapi_info, + PA_URI_FORMAT + PA_COMMENT_TYPE_FORMAT, + request_info.uri, + e.comment(), e.type() + ); - // reset language to default - flang=fdefault_lang; - - // reset response - response.fields().clear(); + // reset language to default + flang=fdefault_lang; + + // reset response + response.fields().clear(); - // this is what we'd return in $response:body - const String *body_string=0; + // this is what we'd return in $response:body + const String* body_string=0; - // maybe we'd be lucky enough as to report an error - // in a gracefull way... - if(Value *value=main_class.get_element( - *NEW String(pool(), UNHANDLED_EXCEPTION_METHOD_NAME), - main_class, - false)) { - if(Junction *junction=value->get_junction()) { - if(const Method *method=junction->method) { - // preparing to pass parameters to - // @unhandled_exception[exception;stack] - VMethodFrame frame(pool(), method->name, *junction, 0/*no caller*/); - frame.set_self(main_class); - - // $exception - frame.store_param(&exception2vhash(pool(), e)); - // $stack[^table::set{name origin}] - Array& stack_trace_columns=*NEW Array(pool()); - stack_trace_columns+=NEW String(pool(), "name"); - stack_trace_columns+=NEW String(pool(), "file"); - stack_trace_columns+=NEW String(pool(), "lineno"); - Table& stack_trace=*NEW Table(pool(), 0, &stack_trace_columns); - Array_iter tracei(exception_trace); - while(tracei.has_next()) { - Array& row=*NEW Array(pool()); - - const String *name=(const String *)tracei.next(); - row+=name; // name column -#ifndef NO_STRING_ORIGIN - const Origin& origin=name->origin(); - if(origin.file) { - row+=NEW String(pool(), origin.file, 0, true); // file column - char *buf=(char *)malloc(MAX_NUMBER); - size_t buf_size=snprintf(buf, MAX_NUMBER, "%d", 1+origin.line); - row+=NEW String(pool(), buf, buf_size, true); // line column - } -#endif - stack_trace+=&row; - } - frame.store_param(NEW VTable(pool(), &stack_trace)); - - // future $response:body= - // execute ^unhandled_exception[exception;stack] - body_string=&execute_method(frame, *method); - } - } - } - - if(!body_string) { // couldn't report an error beautifully? - // doing that ugly + // maybe we'd be lucky enough as to report an error + // in a gracefull way... + if(Value* value=main_class.get_element( + *new String(UNHANDLED_EXCEPTION_METHOD_NAME), + main_class, + false)) { + if(Junction* junction=value->get_junction()) { + if(const Method *method=junction->method) { +// preparing to pass parameters to +// @unhandled_exception[exception;stack] +VMethodFrame frame(/*method->name, */ *junction, 0/*no caller*/); +frame.set_self(main_class); + +// $exception +frame.store_param(details.vhash); +// $stack[^table::set{name origin}] +Table::columns_type stack_trace_columns(new ArrayString); +*stack_trace_columns+=new String("name"); +*stack_trace_columns+=new String("file"); +*stack_trace_columns+=new String("lineno"); +*stack_trace_columns+=new String("colno"); +Table& stack_trace=*new Table(stack_trace_columns); +if(!exception_trace.is_empty()/*signed!*/) +for(size_t i=exception_trace.bottom_index(); iorigin(); - if(origin.file) - printed+=snprintf(buf+printed, MAX_STRING-printed, - ORIGIN_FILE_LINE_FORMAT": ", - origin.file, 1+origin.line - ); -#endif - printed+=snprintf(buf+printed, MAX_STRING-printed, "'%s' ", - problem_source->cstr()); +// future $response:body= +// execute ^unhandled_exception[exception;stack] +body_string=&execute_method(frame, *method).as_string(); } - if(const char *comment=e.comment(true)) - printed+=snprintf(buf+printed, MAX_STRING-printed, "%s", comment); - if(const char *type=e.type(true)) - printed+=snprintf(buf+printed, MAX_STRING-printed, " type: %s", type); - - // future $response:content-type - response.fields().put(*content_type_name, - NEW VString(*NEW String(pool(), UNHANDLED_EXCEPTION_CONTENT_TYPE))); - // future $response:body - body_string=NEW String(pool(), buf); } + } + + if(!body_string) { // couldn't report an error beautifully? + // doing that ugly - VString body_vstring(*body_string); - const VFile *body_file=body_vstring.as_vfile(); - - // ERROR. write it out - output_result(*body_file, header_only); - } catch(const Exception& ) { - /*re*/throw; + // make up result: $origin $source $comment $type $code + char *buf=new(PointerFreeGC) char[MAX_STRING]; + size_t printed=0; + if(const String* problem_source=e.problem_source()) + printed+=snprintf(buf+printed, MAX_STRING-printed, "'%s' ", + problem_source->cstr()); + if(const char* comment=e.comment(true)) + printed+=snprintf(buf+printed, MAX_STRING-printed, "%s", comment); + if(const char* type=e.type(true)) + printed+=snprintf(buf+printed, MAX_STRING-printed, " type: %s", type); + + // future $response:content-type + response.fields().put(content_type_name, + new VString(*new String(UNHANDLED_EXCEPTION_CONTENT_TYPE))); + // future $response:body + body_string=new String(buf); } + + VString body_vstring(*body_string); + VFile* body_file=body_vstring.as_vfile(String::L_UNSPECIFIED, &charsets); + + // ERROR. write it out + output_result(body_file, header_only, false); } } -VStateless_class *Request::use_file(VStateless_class& aclass, - const String& file_name, bool ignore_class_path, - bool fail_on_read_problem, bool fail_on_file_absence) { +size_t Request::register_file(String::Body file_spec) { + file_list+=file_spec; + return file_list.count()-1; +} + +void Request::use_file(VStateless_class& aclass, + const String& file_name, const String* main_alias, + bool ignore_class_path, + bool fail_on_read_problem, + bool fail_on_file_absence) { // cyclic dependence check if(used_files.get(file_name)) - return 0; - used_files.put(file_name, (Hash::Val *)true); + return; + used_files.put(file_name, true); - const String *file_spec; + const String* file_spec; if(ignore_class_path) // ignore_class_path? file_spec=&file_name; - else if(file_name.first_char()=='/') //absolute path, no need to scan MAIN:CLASS_PATH? + else if(file_name.first_char()=='/') //absolute path? [no need to scan MAIN:CLASS_PATH] file_spec=&absolute(file_name); else { file_spec=0; - if(Value *element=main_class.get_element(*class_path_name, main_class, false)) { + if(Value* element=main_class.get_element(class_path_name, main_class, false)) { if(element->is_string()) { file_spec=file_readable(absolute(element->as_string()), file_name); // found at class_path? } else if(Table *table=element->get_table()) { - int size=table->size(); + int size=table->count(); for(int i=size; i--; ) { - const String& path=*static_cast(table->get(i))->get_string(0); - if(file_spec=file_readable(absolute(path), file_name)) + const String& path=*(*table->get(i))[0]; + if((file_spec=file_readable(absolute(path), file_name))) break; // found along class_path } } else @@ -486,153 +551,219 @@ VStateless_class *Request::use_file(VSta if(fail_on_read_problem && !fail_on_file_absence) // ignore file absence if asked for if(!entry_exists(*file_spec)) - return 0; - - char *source=file_read_text(pool(), *file_spec, fail_on_read_problem); - if(!source) - return 0; + return; - return use_buf(aclass, source, *file_spec, file_spec->cstr()); + if(const char* source=file_read_text(charsets, *file_spec, fail_on_read_problem)) + use_buf(aclass, source, main_alias, register_file(*file_spec)); } -VStateless_class *Request::use_buf(VStateless_class& aclass, - const char *source, - const String& filespec, const char *filespec_cstr) { +void Request::use_buf(VStateless_class& aclass, + const char* source, const String* main_alias, + uint file_no) { // temporary zero @conf so to maybe-replace it in compiled code - Temp_method temp_method_conf(aclass, *conf_method_name, 0); + Temp_method temp_method_conf(aclass, conf_method_name, 0); // temporary zero @auto so to maybe-replace it in compiled code - Temp_method temp_method_auto(aclass, *auto_method_name, 0); + Temp_method temp_method_auto(aclass, auto_method_name, 0); // compile loaded class - VStateless_class& cclass=COMPILE(aclass, source, filespec_cstr); + VStateless_class& cclass=compile(&aclass, source, main_alias, file_no); // locate and execute possible @conf[] static - VString *vfilespec=NEW VString(filespec); - const Method *method_called; - execute_nonvirtual_method(cclass, - *conf_method_name, vfilespec, - 0/*no result needed*/, &method_called); - if(method_called) - configure_admin(cclass, &method_called->name); + VString* vfilespec= + new VString(*new String(file_list[file_no], String::L_TAINTED)); + Execute_nonvirtual_method_result executed=execute_nonvirtual_method(cclass, + conf_method_name, vfilespec, + false/*no string result needed*/); + if(executed.method) + configure_admin(cclass/*, executed.method->name*/); // locate and execute possible @auto[] static execute_nonvirtual_method(cclass, - *auto_method_name, vfilespec, - 0/*no result needed*/); - return &cclass; + auto_method_name, vfilespec, + false/*no result needed*/); } -const String& Request::relative(const char *apath, const String& relative_name) { - int hpath_buf_size=strlen(apath)+1; - char *hpath=(char *)malloc(hpath_buf_size); - memcpy(hpath, apath, hpath_buf_size); - String& result=*NEW String(pool()); - if(rsplit(hpath, '/')) // if something/splitted +const String& Request::relative(const char* apath, const String& relative_name) { + char *hpath=strdup(apath); + String& result=*new String; + if(rsplit(hpath, '/')) // if something/splitted result << hpath << "/"; - result << relative_name; - return result; + result << relative_name; + return result; } const String& Request::absolute(const String& relative_name) { if(relative_name.first_char()=='/') { - String& result=*NEW String(pool(), info.document_root); + String& result=*new String(strdup(request_info.document_root)); result << relative_name; return result; } else - return relative_name.pos("://")<0? relative(info.path_translated, relative_name) - :relative_name; // something like "http://xxx" -} - -static void add_header_attribute(const Hash::Key& aattribute, Hash::Val *ameaning, - void *info) { - Request& r=*static_cast(info); + if(relative_name.pos("://")!=STRING_NOT_FOUND // something like "http://xxx" +#ifdef WIN32 + || relative_name.pos(":")==1 // DRIVE: + || relative_name.starts_with("\\\\") // UNC1 + || relative_name.starts_with("//") // UNC2 +#endif + ) + return relative_name; + else + return relative(request_info.path_translated, relative_name); +} + +static void add_header_attribute( + HashStringValue::key_type aattribute, + HashStringValue::value_type ameaning, + Request *r) { if(aattribute==BODY_NAME + || aattribute==DOWNLOAD_NAME || aattribute==CHARSET_NAME) return; - Value& lmeaning=*static_cast(ameaning); - Pool& pool=lmeaning.pool(); - - SAPI::add_header_attribute(pool, + SAPI::add_header_attribute(r->sapi_info, aattribute.cstr(), - attributed_meaning_to_string(lmeaning, String::UL_HTTP_HEADER, false) - .cstr(String::UL_UNSPECIFIED)); + attributed_meaning_to_string(*ameaning, String::L_HTTP_HEADER, false). + cstr(String::L_UNSPECIFIED)); } -void Request::output_result(const VFile& body_file, bool header_only) { +void Request::output_result(VFile* body_file, bool header_only, bool as_attachment) { // header: cookies - cookie.output_result(); + cookie.output_result(sapi_info); - Value *body_file_content_type; + Value* body_file_content_type; // set content-type - if(body_file_content_type=static_cast( - body_file.fields().get(*content_type_name))) { + if((body_file_content_type=body_file->fields().get(content_type_name))) { // body file content type - response.fields().put(*content_type_name, body_file_content_type); + response.fields().put(content_type_name, body_file_content_type); } else { // default content type - response.fields().put_dont_replace(*content_type_name, - default_content_type?default_content_type - :NEW VString(*NEW String(pool(), DEFAULT_CONTENT_TYPE))); + response.fields().put_dont_replace(content_type_name, + new VString(*new String(DEFAULT_CONTENT_TYPE))); } // content-disposition - if(VString *vfile_name=static_cast(body_file.fields().get(*name_name))) - if(vfile_name->string()!=NONAME_DAT) { - VHash& vhash=*NEW VHash(pool()); - Hash& hash=vhash.hash(0); - hash.put(*value_name, NEW VString(*content_disposition_value)); - hash.put(*content_disposition_filename_name, vfile_name); - response.fields().put(*content_disposition_name, &vhash); + if(Value* vfile_name=body_file->fields().get(name_name)) + if(*vfile_name->get_string()!=NONAME_DAT) { + VHash& hash=*new VHash(); + HashStringValue &h=hash.hash(); + if(as_attachment) + h.put(value_name, new VString(content_disposition_value)); + h.put(content_disposition_filename_name, vfile_name); + response.fields().put(content_disposition_name, &hash); } // prepare header: $response:fields without :body response.fields().for_each(add_header_attribute, this); - const void *client_body; - size_t client_content_length; // transcode text body when "text/*" or simple result if(body_file_content_type) - if(Hash *hash=body_file_content_type->get_hash(0)) - body_file_content_type=static_cast(hash->get(*value_name)); - if(!body_file_content_type/*vstring.as_vfile*/ || body_file_content_type->as_string().pos("text/")==0) { - Charset::transcode(pool(), - pool().get_source_charset(), body_file.value_ptr(), body_file.value_size(), - pool().get_client_charset(), client_body, client_content_length - ); - } else { - client_body=body_file.value_ptr(); - client_content_length=body_file.value_size(); - } + if(HashStringValue *hash=body_file_content_type->get_hash()) + body_file_content_type=hash->get(value_name); + String::C output(body_file->value_ptr(), body_file->value_size()); + if(!body_file_content_type/*vstring.as_vfile*/ || body_file_content_type->as_string().pos("text/")==0) + output=Charset::transcode(output, + charsets.source(), + charsets.client()); // prepare header: content-length char content_length_cstr[MAX_NUMBER]; - snprintf(content_length_cstr, MAX_NUMBER, "%u", client_content_length); - SAPI::add_header_attribute(pool(), "content-length", content_length_cstr); + snprintf(content_length_cstr, MAX_NUMBER, "%u", output.length); + SAPI::add_header_attribute(sapi_info, "content-length", content_length_cstr); // send header - SAPI::send_header(pool()); + SAPI::send_header(sapi_info); // send body if(!header_only) - SAPI::send_body(pool(), client_body, client_content_length); + SAPI::send_body(sapi_info, output.str, output.length); } -const String& Request::mime_type_of(const char *user_file_name_cstr) { +const String& Request::mime_type_of(const char* user_file_name_cstr) { if(mime_types) - if(const char *cext=strrchr(user_file_name_cstr, '.')) { - String sext(pool(), ++cext); - if(mime_types->locate(0, sext.change_case(pool(), String::CC_LOWER))) - if(const String *result=mime_types->item(1)) - return *result; + if(const char* cext=strrchr(user_file_name_cstr, '.')) { + String sext(++cext); + Table::Action_options options; + if(mime_types->locate(0, sext.change_case(charsets.source(), String::CC_LOWER), options)) + if(const String* result=mime_types->item(1)) + return *result; else throw Exception("parser.runtime", - mime_types->origin_string(), + 0, MIME_TYPES_NAME " table column elements must not be empty"); } - return *NEW String(pool(), "application/octet-stream"); + + return *new String("application/octet-stream"); +} + +#ifdef XML +GdomeDOMString_auto_ptr Request::transcode(const String& s) { + return charsets.source().transcode(s); +} + +GdomeDOMString_auto_ptr Request::transcode(const String::Body s) { + return charsets.source().transcode(s); } -bool Request::origins_mode() { - return main_class.get_element(*origins_mode_name, main_class, false)!=0; // $ORIGINS mode +const String& Request::transcode(GdomeDOMString* s) { + return charsets.source().transcode(s); +} + +const String& Request::transcode(xmlChar* s) { + return charsets.source().transcode(s); +} +#endif + + +const Request::Trace Request::Exception_trace::extract_origin(const String*& problem_source) { + Trace result; + if(!is_empty()) { + result=bottom_value(); + if(!problem_source) { // we don't know who trigged the bug? + problem_source=result.name(); // consider the stack-top-guy did that + fbottom++; + } else if(result.name()==problem_source) // it is that same guy? + fbottom++; // throw away that trace + // else stack top contains not us, + // leaving result intact + // it would help ^throw + } + + return result; +} + +Request::Exception_details Request::get_details(const Exception& e) { + const String* problem_source=e.problem_source(); + Trace trace=exception_trace.extract_origin(problem_source); + + VHash& vhash=*new VHash; HashStringValue& hash=vhash.hash(); + + // $.type + if(const char* type=e.type(true)) + hash.put(exception_type_part_name, new VString(*new String(type))); + + // $.source + if(problem_source) { + String& source=*new String; + source.append(*problem_source, String::L_TAINTED, true/*forced*/); + + hash.put(exception_source_part_name, new VString(source)); + } + + // $.file lineno colno + if(trace) { + const Operation::Origin origin=trace.origin(); + hash.put(String::Body("file"), + new VString(*new String(file_list[origin.file_no], String::L_TAINTED))); + hash.put(String::Body("lineno"), new VInt(1+origin.line)); + hash.put(String::Body("colno"), new VInt(1+origin.col)); + } + + // $.comment + if(const char* comment=e.comment(true)) + hash.put(exception_comment_part_name, + new VString(*new String(comment, 0, true/*tainted*/))); + + // $.handled(0) + hash.put(exception_handled_part_name, new VBool(false)); + + return Request::Exception_details(trace, problem_source, vhash); }