--- parser3/src/main/pa_request.C 2004/12/23 15:50:27 1.273 +++ parser3/src/main/pa_request.C 2016/11/03 16:17:37 1.363 @@ -1,12 +1,10 @@ /** @file Parser: request class main part. @see compile.C and execute.C. - Copyright (c) 2001-2004 ArtLebedev Group (http://www.artlebedev.com) + Copyright (c) 2001-2015 Art. Lebedev Studio (http://www.artlebedev.com) Author: Alexandr Petrosian (http://paf.design.ru) */ -static const char * const IDENT_REQUEST_C="$Date: 2004/12/23 15:50:27 $"; - #include "pa_sapi.h" #include "pa_common.h" #include "pa_request.h" @@ -34,6 +32,8 @@ static const char * const IDENT_REQUEST_ #include "pa_vconsole.h" #include "pa_vdate.h" +volatile const char * IDENT_PA_REQUEST_C="$Id: pa_request.C,v 1.363 2016/11/03 16:17:37 moko Exp $" IDENT_PA_REQUEST_H IDENT_PA_REQUEST_CHARSETS_H IDENT_PA_REQUEST_INFO_H IDENT_PA_VCONSOLE_H; + // consts #define UNHANDLED_EXCEPTION_METHOD_NAME "unhandled_exception" @@ -43,88 +43,112 @@ const char* UNHANDLED_EXCEPTION_CONTENT_ /// 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 uint EXECUTE_RECOURSION_LIMIT=1000; +const uint LOOP_LIMIT=20000; // defines for globals #define MAIN_METHOD_NAME "main" #define AUTO_METHOD_NAME "auto" -#define BODY_NAME "body" +#define AUTOUSE_METHOD_NAME "autouse" #define EXCEPTION_TYPE_PART_NAME "type" #define EXCEPTION_SOURCE_PART_NAME "source" #define EXCEPTION_COMMENT_PART_NAME "comment" -#define RESPONSE_BODY_FILE_NAME "file" // 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 autouse_method_name(AUTOUSE_METHOD_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); -const String response_body_file_name(RESPONSE_BODY_FILE_NAME); + +int pa_execute_recoursion_limit=EXECUTE_RECOURSION_LIMIT; +int pa_loop_limit=LOOP_LIMIT; // defines for statics #define CHARSETS_NAME "CHARSETS" #define MIME_TYPES_NAME "MIME-TYPES" -#define ORIGINS_MODE_NAME "ORIGINS" +#define STRICT_VARS_NAME "STRICT-VARS" +#define PROTOTYPE_NAME "OBJECT-PROTOTYPE" +#define LIMITS_NAME "LIMITS" +#define RECOURSION_LIMIT_NAME "max_recoursion" +#define LOOP_LIMIT_NAME "max_loop" #define CONF_METHOD_NAME "conf" #define POST_PROCESS_METHOD_NAME "postprocess" -#define DOWNLOAD_NAME "download" #define CLASS_PATH_NAME "CLASS_PATH" +#define RESPONSE_BODY_FILE_NAME "file" + +#define DOWNLOAD_NAME_UPPER "DOWNLOAD" +#define BODY_NAME_UPPER "BODY" // 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 strict_vars_name(STRICT_VARS_NAME); +static const String prototype_name(PROTOTYPE_NAME); +static const String limits_name(LIMITS_NAME); +static const String recoursion_limit_name(RECOURSION_LIMIT_NAME); +static const String loop_limit_name(LOOP_LIMIT_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); +static const String response_body_file_name(RESPONSE_BODY_FILE_NAME); + +static const String download_name_upper(DOWNLOAD_NAME_UPPER); +static const String body_name_upper(BODY_NAME_UPPER); + +// more static + +static const String content_type_name_upper(HTTP_CONTENT_TYPE_UPPER); +static const String content_disposition_name_upper(CONTENT_DISPOSITION_UPPER); +static const String content_disposition_inline(CONTENT_DISPOSITION_INLINE); +static const String content_disposition_attachment(CONTENT_DISPOSITION_ATTACHMENT); // defines +#define CHARSET_NAME_UPPER "CHARSET" +#define LAST_MODIFIED_NAME_UPPER "LAST-MODIFIED" + // op.C VStateless_class& VClassMAIN_create(); // Request::Request(SAPI_Info& asapi_info, Request_info& arequest_info, - String::Language adefault_lang, bool status_allowed): + String::Language adefault_lang): // private anti_endless_execute_recoursion(0), // public + allow_class_replace(false), 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 + fskip(SKIP_NOTHING), + fin_cycle(0), // public request_info(arequest_info), sapi_info(asapi_info), - charsets(UTF8_charset, UTF8_charset, UTF8_charset), // default charsets + charsets(pa_UTF8_charset, pa_UTF8_charset, pa_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), + cookie(*new VCookie(charsets, arequest_info)), + console(*new VConsole), // private configure_admin_done(false), @@ -137,51 +161,44 @@ Request::Request(SAPI_Info& asapi_info, 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 + file_list+="UNKNOWN"; + file_list+="-body of process-"; // pseudo_file_no__process // maybe expire old caches cache_managers->maybe_expire(); /// directly used // MAIN class, operators - classes().put(main_class.name(), &main_class); + put_class(&main_class); // classes: // table, file, random, mail, image, ... methoded_array().register_directly_used(*this); /// methodless + // env class - classes().put(String::Body(ENV_CLASS_NAME), new VEnv(asapi_info)); + put_class(new VEnv(asapi_info)); // status class - if(status_allowed) - classes().put(String::Body(STATUS_CLASS_NAME), new VStatus()); + put_class(new VStatus()); // request class - classes().put(String::Body(REQUEST_CLASS_NAME), new VRequest(arequest_info, charsets)); + put_class(new VRequest(arequest_info, charsets, form, asapi_info)); // cookie class - classes().put(String::Body(COOKIE_CLASS_NAME), &cookie); + put_class(&cookie); // console class - classes().put(String::Body(CONSOLE_CLASS_NAME), new VConsole()); + put_class(&console); /// methoded - // response class - classes().put(response.get_class()->name(), &response); - /// bases used + // response class + put_class(&response); // form class - classes().put(form.get_class()->base_class()->name(), &form); + put_class(&form); // mail class - classes().put(mail.get_class()->base_class()->name(), &mail); + put_class(&mail); // math class - { - Value& math=*new VMath; - classes().put(math.get_class()->base_class()->name(), &math); - } + put_class(new VMath); // memory class - { - Value& memory=*new VMemory; - classes().put(memory.get_class()->base_class()->name(), &memory); - } + put_class(new VMemory); } Request::~Request() { @@ -189,24 +206,37 @@ Request::~Request() { // if for some strange reason xml generic errors failed to be reported, free them up if(const char* xml_generic_errors=xmlGenericErrors()) { SAPI::log(sapi_info, "warning: unreported xmlGenericErrors: %s", xml_generic_errors); - free((void *)xml_generic_errors); + pa_free((void *)xml_generic_errors); } #endif } Value& Request::get_self() { return method_frame/*always have!*/->self(); } -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()); +VStateless_class* Request::get_class(const String& name){ + VStateless_class* result=classes().get(name); + if(!result) + if(Value* value=main_class.get_element(autouse_method_name)) + if(Junction* junction=value->get_junction()) + if(const Method *method=junction->method) { + Value *vname=new VString(name); + CONSTRUCTOR_FRAME_ACTION(*method, 0 /*no parent*/, main_class, { + frame.store_params(&vname, 1); + // we don't need the result + call(frame); + }); + result=classes().get(name); + } + return result; +} + +static void load_charset(HashStringValue::key_type akey, HashStringValue::value_type avalue, Request_charsets* charsets) { + pa_charsets.load_charset(*charsets, akey, avalue->as_string()); } + void Request::configure_admin(VStateless_class& conf_class) { if(configure_admin_done) - throw Exception("parser.runtime", - 0, - "parser already configured"); + throw Exception(PARSER_RUNTIME, 0, "parser already configured"); configure_admin_done=true; // charsets must only be specified in method_frame config @@ -217,57 +247,96 @@ void Request::configure_admin(VStateless ... ] */ - if(Value* vcharsets=conf_class.get_element(charsets_name, conf_class, false)) { - if(!vcharsets->is_string()) + if(Value* vcharsets=conf_class.get_element(charsets_name)) { + if(!vcharsets->is_string()) { if(HashStringValue* charsets=vcharsets->get_hash()) - charsets->for_each(load_charset, &this->charsets); + charsets->for_each(load_charset, &this->charsets); else - throw Exception("parser.runtime", - 0, - "$" MAIN_CLASS_NAME ":" CHARSETS_NAME " must be hash"); + throw Exception(PARSER_RUNTIME, 0, "$" MAIN_CLASS_NAME ":" CHARSETS_NAME " must be hash"); + } + } + +#ifdef STRICT_VARS + VVoid::strict_vars=false; + if(Value* strict_vars=conf_class.get_element(strict_vars_name)) { + if(strict_vars->is_bool()) + VVoid::strict_vars=strict_vars->as_bool(); + else + throw Exception(PARSER_RUNTIME, 0, "$" MAIN_CLASS_NAME ":" STRICT_VARS_NAME " must be bool"); } +#endif + +#ifdef OBJECT_PROTOTYPE + VClass::prototype=true; + if(Value* prototype=conf_class.get_element(prototype_name)) { + if(prototype->is_bool()) + VClass::prototype=prototype->as_bool(); + else + throw Exception(PARSER_RUNTIME, 0, "$" MAIN_CLASS_NAME ":" PROTOTYPE_NAME " must be bool"); + } +#endif + + Value* limits=conf_class.get_element(limits_name); + + pa_loop_limit=LOOP_LIMIT; + if(limits) + if(Value* loop_limit=limits->get_element(loop_limit_name)) { + if(loop_limit->is_evaluated_expr()) { + pa_loop_limit=loop_limit->as_int(); + if(pa_loop_limit==0) pa_loop_limit=INT_MAX; + } else + throw Exception(PARSER_RUNTIME, 0, "$" MAIN_CLASS_NAME ":" LOOP_LIMIT_NAME " must be int"); + } + + pa_execute_recoursion_limit=EXECUTE_RECOURSION_LIMIT; + if(limits) + if(Value* recoursion_limit=limits->get_element(recoursion_limit_name)) { + if(recoursion_limit->is_evaluated_expr()) { + pa_execute_recoursion_limit=recoursion_limit->as_int(); + if(pa_execute_recoursion_limit==0) pa_execute_recoursion_limit=INT_MAX; + } else + throw Exception(PARSER_RUNTIME, 0, "$" MAIN_CLASS_NAME ":" RECOURSION_LIMIT_NAME " must be int"); + } // configure method_frame options // until someone with less privileges have overriden them methoded_array().configure_admin(*this); } -const char* Request::get_exception_cstr( - const Exception& e, - Request::Exception_details& details) { +const char* Request::get_exception_cstr(const Exception& e, Request::Exception_details& details) { + #define PA_URI_FORMAT "%s: " +#define PA_COMMENT_TYPE_FORMAT "%s [%s]" + #define PA_ORIGIN_FILE_POS_FORMAT "%s(%d:%d): " #define PA_SOURCE_FORMAT "'%s' " -#define PA_COMMENT_TYPE_FORMAT "%s [%s]" + +#define PA_ORIGIN_FILE_POS_VALUE file_list[details.origin.file_no].cstr(), 1+details.origin.line, 1+details.origin.col, +#define PA_SOURCE_VALUE details.problem_source->cstr(), + +#define EXCEPTION_CSTR(f1,v1,f2,v2) \ + snprintf(result, MAX_STRING, \ + PA_URI_FORMAT \ + f1 f2 \ + PA_COMMENT_TYPE_FORMAT, \ + request_info.uri, \ + v1 v2 \ + e.comment(), e.type() \ + ); + char* result=new(PointerFreeGC) char[MAX_STRING]; 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(); - snprintf(result, MAX_STRING, - 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 - snprintf(result, MAX_STRING, - PA_URI_FORMAT - PA_SOURCE_FORMAT PA_COMMENT_TYPE_FORMAT, - request_info.uri, - details.problem_source->cstr(), - e.comment(), e.type() - ); - } else - snprintf(result, MAX_STRING, - PA_URI_FORMAT - PA_COMMENT_TYPE_FORMAT, - request_info.uri, - e.comment(), e.type() - ); + if(details.origin.file_no) // do whe know where he came from? + EXCEPTION_CSTR(PA_ORIGIN_FILE_POS_FORMAT, PA_ORIGIN_FILE_POS_VALUE, PA_SOURCE_FORMAT, PA_SOURCE_VALUE) + else + EXCEPTION_CSTR(PA_SOURCE_FORMAT, PA_SOURCE_VALUE,,) + } else { + if(details.origin.file_no) // do whe know where he came from? + EXCEPTION_CSTR(PA_ORIGIN_FILE_POS_FORMAT, PA_ORIGIN_FILE_POS_VALUE,,) + else + EXCEPTION_CSTR(,,,) + } return result; } @@ -281,7 +350,7 @@ void Request::configure() { 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)) if(Table *table=element->get_table()) mime_types=table; } @@ -297,29 +366,19 @@ void Request::configure() { */ void Request::core(const char* config_filespec, bool config_fail_on_read_problem, bool header_only) { -#ifdef RESOURCES_DEBUG -//measures -struct timeval mt[10]; -//measure:before all -gettimeofday(&mt[0],NULL); -#endif try { - // filling cookies - cookie.fill_fields(request_info); - - // filling mail received - mail.fill_received(*this); - // loading config if(config_filespec) { const String& filespec=*new String(config_filespec); - use_file(main_class, - filespec, 0 /*main_alias*/, - true /*ignore class_path*/, + use_file_directly(main_class, + filespec, config_fail_on_read_problem, true /*file must exist if 'fail on read problem' not set*/); } + // filling mail received + mail.fill_received(*this); + // loading auto.p files from document_root/.. // to the one beside requested file. // all assigned bases from upper dir @@ -340,14 +399,12 @@ gettimeofday(&mt[0],NULL); String::L_CLEAN); sfile_spec << "/" AUTO_FILE_NAME; - use_file(main_class, + use_file_directly(main_class, sfile_spec, - 0 /*main_alias*/, - true /*ignore class_path*/, true /*fail on read problem*/, false /*but ignore absence, sole user*/); } - after=before+1; + for(after=before+1;*after=='/';after++); } } @@ -355,10 +412,7 @@ gettimeofday(&mt[0],NULL); // compile requested file String& spath_translated=*new String; spath_translated.append_help_length(request_info.path_translated, 0, String::L_TAINTED); - use_file(main_class, - spath_translated, - 0 /*main_alias*/, - true /*ignore class_path*/); + use_file_directly(main_class, spath_translated); configure(); } catch(...) { @@ -366,72 +420,39 @@ gettimeofday(&mt[0],NULL); rethrow; } -#ifdef RESOURCES_DEBUG -//measure:after compile -gettimeofday(&mt[1],NULL); -#endif // execute @main[] const String* body_string=execute_virtual_method(main_class, main_method_name); if(!body_string) - throw Exception("parser.runtime", + throw Exception(PARSER_RUNTIME, 0, - "'"MAIN_METHOD_NAME"' method not found"); - -#ifdef RESOURCES_DEBUG - //measure:after main -gettimeofday(&mt[2],NULL); -#endif + "'" MAIN_METHOD_NAME "' method not found"); // extract response body - Value* body_value=response.fields().get(download_name); // $response:download? + Value* body_value=response.fields().get(download_name_upper); // $response:download? bool as_attachment=body_value!=0; if(!body_value) - body_value=response.fields().get(body_name); // $response:body + body_value=response.fields().get(body_name_upper); // $response:body if(!body_value) body_value=new VString(*body_string); // just result of ^main[] // @postprocess - if(Value* value=main_class.get_element(post_process_method_name, main_class, false)) + if(Value* value=main_class.get_element(post_process_method_name)) if(Junction* junction=value->get_junction()) if(const Method *method=junction->method) { // preparing to pass parameters to // @postprocess[data] - VMethodFrame frame(/*method->name, */ *junction, 0/*no parent*/); - frame.set_self(main_class); - - frame.store_param(*body_value); - body_value=&execute_method(frame, *method).as_value(); + METHOD_FRAME_ACTION(*method, 0 /*no parent*/, main_class, { + frame.store_params(&body_value, 1); + call(frame); + body_value=&frame.result(); + }); } - VFile* body_file=body_value->as_vfile( - String::L_UNSPECIFIED, &charsets); - -#ifdef RESOURCES_DEBUG -//measure:after postprocess -gettimeofday(&mt[3],NULL); -#endif + VFile* body_file=body_value->as_vfile(flang, &charsets); // OK. write out the result output_result(body_file, header_only, as_attachment); -#ifdef RESOURCES_DEBUG - //measure:after output_result -gettimeofday(&mt[9],NULL); -t[9]=mt[9].tv_sec+mt[9].tv_usec/1000000.0; - -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("rmeasure: %s,%.2f,%.2f,%.2f %.2f,%.2f %.2f", -request_info.uri, -t[1]-t[0], -t[2]-t[1], -t[3]-t[2], -sql_connect_time,sql_request_time, -t[9]-t[3] -); -#endif } catch(const Exception& e) { // request handling problem try { // we're returning not result, but error explanation @@ -450,45 +471,44 @@ t[9]-t[3] // 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(Value* value=main_class.get_element(*new String(UNHANDLED_EXCEPTION_METHOD_NAME))) { 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(); istrrpbrk("/"); + if(last_slash_pos!=STRING_NOT_FOUND) + filespec=file_exist(use_filespec->mid(0, last_slash_pos), file_name); // found in current dir? + } + + if(!filespec){ + // prevent multiple scan CLASS_PATH for searching one file + if(searched_along_class_path.get(file_name)) + return; + searched_along_class_path.put(file_name, true); + if(Value* element=main_class.get_element(class_path_name)) { if(element->is_string()) { - file_spec=file_readable(absolute(element->as_string()), file_name); // found at class_path? + filespec=file_exist(absolute(element->as_string()), file_name); // found at class_path? } else if(Table *table=element->get_table()) { - int size=table->count(); - for(int i=size; i--; ) { + for(size_t i=table->count(); i--; ) { const String& path=*(*table->get(i))[0]; - if((file_spec=file_readable(absolute(path), file_name))) + if(filespec=file_exist(absolute(path), file_name)) break; // found along class_path } } else - throw Exception("parser.runtime", + throw Exception(PARSER_RUNTIME, 0, "$" CLASS_PATH_NAME " must be string or table"); - if(!file_spec) - throw Exception("parser.runtime", + if(!filespec) + throw Exception(PARSER_RUNTIME, &file_name, "not found along " MAIN_CLASS_NAME ":" CLASS_PATH_NAME); - } - if(!file_spec) - throw Exception("parser.runtime", + } else + throw Exception(PARSER_RUNTIME, &file_name, "usage failed - no $" MAIN_CLASS_NAME ":" CLASS_PATH_NAME " were specified"); } - if(fail_on_read_problem && !fail_on_file_absence) // ignore file absence if asked for - if(!entry_exists(*file_spec)) - return; - - if(const char* source=file_read_text(charsets, *file_spec, fail_on_read_problem)) - use_buf(aclass, source, main_alias, register_file(*file_spec)); + use_file_directly(aclass, *filespec); } +void Request::use_file(VStateless_class& aclass, const String& file_name, const String* use_filespec/*absolute*/, Operation::Origin origin) { + static String use("USE"); + try { + use_file(aclass, file_name, use_filespec); + } catch (...) { + exception_trace.push(Trace(&use, origin)); + rethrow; + } +} -void Request::use_buf(VStateless_class& aclass, - const char* source, const String* main_alias, - uint file_no, - int line_no_offset) { - // temporary zero @conf so to maybe-replace it in compiled code +void Request::use_buf(VStateless_class& aclass, const char* source, const String* main_alias, uint file_no, int line_no_offset) { + // temporary zero @conf to avoid it second execution Temp_method temp_method_conf(aclass, conf_method_name, 0); - // temporary zero @auto so to maybe-replace it in compiled code + // temporary zero @auto to avoid it second execution Temp_method temp_method_auto(aclass, auto_method_name, 0); - // compile loaded class - VStateless_class& cclass=compile(&aclass, source, main_alias, file_no, line_no_offset); + // compile loaded classes + ArrayClass& cclasses=compile(&aclass, source, main_alias, file_no, line_no_offset); - // locate and execute possible @conf[] static 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, - false/*no result needed*/); + + for(size_t i=0; iname*/); + + // locate and execute possible @auto[] static + execute_nonvirtual_method(cclass, auto_method_name, vfilespec, false/*no result needed*/); + + cclass.enable_default_setter(); + } } const String& Request::relative(const char* apath, const String& relative_name) { - char *hpath=strdup(apath); + char *hpath=pa_strdup(apath); String& result=*new String; if(rsplit(hpath, '/')) // if something/splitted result << hpath << "/"; @@ -622,7 +668,7 @@ const String& Request::relative(const ch const String& Request::absolute(const String& relative_name) { if(relative_name.first_char()=='/') { - String& result=*new String(strdup(request_info.document_root)); + String& result=*new String(pa_strdup(request_info.document_root)); result << relative_name; return result; } else @@ -647,23 +693,19 @@ public: bool add_last_modified; }; #endif -static void add_header_attribute( - HashStringValue::key_type aattribute, - HashStringValue::value_type ameaning, - Add_header_attribute_info* info) { - if(aattribute==BODY_NAME - || aattribute==DOWNLOAD_NAME - || aattribute==CHARSET_NAME) +static void add_header_attribute(HashStringValue::key_type name, HashStringValue::value_type value, Add_header_attribute_info* info) { + if(name==BODY_NAME_UPPER || name==DOWNLOAD_NAME_UPPER || name==CHARSET_NAME_UPPER) return; + + if(name==LAST_MODIFIED_NAME_UPPER) + info->add_last_modified=false; - const char* a=aattribute.cstr(); - SAPI::add_header_attribute(info->r.sapi_info, - a, - attributed_meaning_to_string(*ameaning, String::L_HTTP_HEADER, false). - cstr(String::L_UNSPECIFIED)); + const char* aname=String(name, String::L_URI).untaint_and_transcode_cstr(String::L_URI, &info->r.charsets); - if(strcasecmp(a, "last-modified")==0) - info->add_last_modified = false; + SAPI::add_header_attribute(info->r.sapi_info, + aname, + attributed_meaning_to_string(*value, String::L_URI, false).untaint_and_transcode_cstr(String::L_URI, &info->r.charsets) + ); } static void output_sole_piece(Request& r, @@ -677,10 +719,8 @@ static void output_sole_piece(Request& r r.charsets.source(), r.charsets.client()); - // prepare header: content-length - char content_length_cstr[MAX_NUMBER]; - snprintf(content_length_cstr, MAX_NUMBER, "%u", output.length); - SAPI::add_header_attribute(r.sapi_info, "content-length", content_length_cstr); + // prepare header: Content-Length + SAPI::add_header_attribute(r.sapi_info, HTTP_CONTENT_LENGTH, format(output.length, "%u")); // send header SAPI::send_header(r.sapi_info); @@ -697,8 +737,7 @@ struct Range size_t end; }; #endif -static void parse_range(const String* s, Array &ar) -{ +static void parse_range(const String* s, Array &ar) { const char *p = s->cstr(); if(s->starts_with("bytes=")) p += 6; @@ -727,11 +766,11 @@ static void output_pieces(Request& r, Value& date, bool add_last_modified) { - SAPI::add_header_attribute(r.sapi_info, "Accept-Ranges", "bytes"); + SAPI::add_header_attribute(r.sapi_info, "accept-ranges", "bytes"); const size_t BUFSIZE = 10*0x400; char buf[BUFSIZE]; - const char *range = SAPI::get_env(r.sapi_info, "HTTP_RANGE"); + const char *range = SAPI::Env::get(r.sapi_info, "HTTP_RANGE"); size_t offset=0; size_t part_length=content_length; if(range){ @@ -741,7 +780,7 @@ static void output_pieces(Request& r, if(count == 1){ Range &rg = ar.get_ref(0); if(rg.start == (size_t)-1 && rg.end == (size_t)-1){ - SAPI::add_header_attribute(r.sapi_info, "status", "416 Requested Range Not Satisfiable"); + SAPI::add_header_attribute(r.sapi_info, HTTP_STATUS, "416 Requested Range Not Satisfiable"); return; } if(rg.start == (size_t)-1 && rg.end != (size_t)-1){ @@ -755,26 +794,24 @@ static void output_pieces(Request& r, part_length -= rg.start; } if(part_length == 0){ - SAPI::add_header_attribute(r.sapi_info, "status", "204 No Content"); + SAPI::add_header_attribute(r.sapi_info, HTTP_STATUS, "204 No Content"); return; } - SAPI::add_header_attribute(r.sapi_info, "status", "206 Partial Content"); + SAPI::add_header_attribute(r.sapi_info, HTTP_STATUS, "206 Partial Content"); snprintf(buf, BUFSIZE, "bytes %u-%u/%u", rg.start, rg.end, content_length); - SAPI::add_header_attribute(r.sapi_info, "Content-Range", buf); + SAPI::add_header_attribute(r.sapi_info, "content-range", buf); }else if(count != 0){ - SAPI::add_header_attribute(r.sapi_info, "status", "501 Not Implemented"); + SAPI::add_header_attribute(r.sapi_info, HTTP_STATUS, "501 Not Implemented"); return; } } - snprintf(buf, BUFSIZE, "%u", part_length); - SAPI::add_header_attribute(r.sapi_info, "Content-Length", buf); + SAPI::add_header_attribute(r.sapi_info, HTTP_CONTENT_LENGTH, format(part_length, "%u")); + + if(add_last_modified) + SAPI::add_header_attribute(r.sapi_info, "last-modified", attributed_meaning_to_string(date, String::L_AS_IS, true).cstr()); - if(add_last_modified){ - const String &s = attributed_meaning_to_string(date, String::L_AS_IS, true); - SAPI::add_header_attribute(r.sapi_info, "Last-Modified", s.cstr()); - } SAPI::send_header(r.sapi_info); const String& filespec=r.absolute(filename); @@ -806,56 +843,52 @@ void Request::output_result(VFile* body_ // header: cookies cookie.output_result(sapi_info); - // may be specified + // _file_ content-type might be specified Value* body_file_content_type=body_file->fields().get(content_type_name); - // content-disposition + // Content-Disposition Value* vfile_name=body_file->fields().get(name_name); if(!vfile_name) { vfile_name=body_file->fields().get(response_body_file_name); - const String& sfile_name=vfile_name->as_string(); - - char* name_cstr=sfile_name.cstrm(); - if(char *after_slash=rsplit(name_cstr, '\\')) - name_cstr=after_slash; - if(char *after_slash=rsplit(name_cstr, '/')) - name_cstr=after_slash; - vfile_name=new VString(*new String(name_cstr)); + if(vfile_name) { + char* name_cstr=vfile_name->as_string().cstrm(); + if(char *after_slash=rsplit(name_cstr, '\\')) + name_cstr=after_slash; + if(char *after_slash=rsplit(name_cstr, '/')) + name_cstr=after_slash; + vfile_name=new VString(*new String(name_cstr)); + } } if(vfile_name) { const String& sfile_name=vfile_name->as_string(); if(sfile_name!=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); + h.put(value_name, new VString( as_attachment ? content_disposition_attachment : content_disposition_inline )); + h.put(content_disposition_filename_name, new VString(*new String(sfile_name, String::L_HTTP_HEADER))); + + response.fields().put(content_disposition_name_upper, &hash); if(!body_file_content_type) body_file_content_type=new VString(mime_type_of(sfile_name.cstr())); } } - // set content-type + // set Content-Type if(body_file_content_type) { // body file content type - response.fields().put(content_type_name, body_file_content_type); + response.fields().put(content_type_name_upper, body_file_content_type); } else { // default content type - response.fields().put_dont_replace(content_type_name, - new VString(*new String(DEFAULT_CONTENT_TYPE))); + response.fields().put_dont_replace(content_type_name_upper, new VString(*new String(DEFAULT_CONTENT_TYPE))); } - // prepare header: $response:fields without :body + // prepare header: $response:fields without :body, :download and :charset Add_header_attribute_info info(*this); - response.fields().for_each(add_header_attribute, &info); - - if(body_file_content_type) - if(HashStringValue *hash=body_file_content_type->get_hash()) - body_file_content_type=hash->get(value_name); + response.fields().for_each(add_header_attribute, &info); if(Value* vresponse_body_file=body_file->fields().get(response_body_file_name)) { + // $response:[download|body][$.file[filespec]] -- optput specified file const String& sresponse_body_file=vresponse_body_file->as_string(); size_t content_length=0; time_t atime=0, mtime=0, ctime=0; @@ -865,13 +898,13 @@ void Request::output_result(VFile* body_ VDate* vdate=0; if(Value* v=body_file->fields().get("mdate")) { - if(Value* vdatep=v->as(VDATE_TYPE, false)) + if(Value* vdatep=v->as(VDATE_TYPE)) vdate=static_cast(vdatep); else - throw Exception("parser.runtime", 0, "mdate must be a date"); + throw Exception(PARSER_RUNTIME, 0, "mdate must be a date"); } if(!vdate) - vdate=new VDate(mtime); + vdate=new VDate((pa_time_t)mtime); output_pieces(*this, header_only, sresponse_body_file, @@ -879,98 +912,112 @@ void Request::output_result(VFile* body_ *vdate, info.add_last_modified); } else { + if(body_file_content_type) + if(HashStringValue *hash=body_file_content_type->get_hash()) + body_file_content_type=hash->get(value_name); + output_sole_piece(*this, header_only, *body_file, body_file_content_type); } } +const String& Request::mime_type_of(const String* file_name) { + return mime_type_of(file_name?file_name->taint_cstr(String::L_FILE_SPEC):0); +} + 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(++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; + 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", + throw Exception(PARSER_RUNTIME, 0, MIME_TYPES_NAME " table column elements must not be empty"); + } } return *new String("application/octet-stream"); } -#ifdef XML -GdomeDOMString_auto_ptr Request::transcode(const String& s) { - return charsets.source().transcode(s); +const String* Request::get_used_filename(uint file_no){ + if(file_no < file_list.count()) + return new String(file_list[file_no], String::L_TAINTED); + return 0; } -GdomeDOMString_auto_ptr Request::transcode(const String::Body s) { +#ifdef XML +xmlChar* Request::transcode(const String& s) { return charsets.source().transcode(s); } -const String& Request::transcode(GdomeDOMString* s) { +xmlChar* Request::transcode(const String::Body s) { return charsets.source().transcode(s); } -const String& Request::transcode(xmlChar* s) { +const String& Request::transcode(const 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(); + Operation::Origin origin={0, 0, 0}; + + if(!exception_trace.is_empty()) { + Trace bottom=exception_trace.bottom_value(); + origin=bottom.origin(); + if(!problem_source) { // we don't know who trigged the bug + problem_source=bottom.name(); // we usually know source of next-from-throw-point exception did that + exception_trace.set_bottom_index(exception_trace.bottom_index()+1); + } else if (bottom.name()==problem_source) { // it is that same guy? + exception_trace.set_bottom_index(exception_trace.bottom_index()+1); // throw away that trace + } else { + // stack top contains not us, leaving intact to help ^throw + } + } // $.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)); - } + if(problem_source) + hash.put(exception_source_part_name, new VString(*new String(*problem_source, String::L_TAINTED))); - // $.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)); + // $.file $.lineno $.colno + if(origin.file_no){ + hash.put("file", new VString(*new String(file_list[origin.file_no], String::L_TAINTED))); + hash.put("lineno", new VInt(1+origin.line)); + hash.put("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*/))); + hash.put(exception_comment_part_name, new VString(*new String(comment, String::L_TAINTED))); // $.handled(0) - hash.put(exception_handled_part_name, new VBool(false)); + hash.put(exception_handled_part_name, &VBool::get(false)); + + return Request::Exception_details(origin, problem_source, vhash); +} + +Temp_value_element::Temp_value_element(Request& arequest, Value& awhere, const String& aname, Value* awhat) : + frequest(arequest), + fwhere(awhere), + fname(aname), + saved(awhere.get_element(aname)) +{ + Junction* junction; + if(saved && (junction=saved->get_junction()) && junction->is_getter) + saved=0; + frequest.put_element(fwhere, aname, awhat); +} - return Request::Exception_details(trace, problem_source, vhash); +Temp_value_element::~Temp_value_element() { + frequest.put_element(fwhere, fname, saved ? saved : VVoid::get()); }