--- parser3/src/main/pa_request.C 2013/08/21 12:11:14 1.334 +++ parser3/src/main/pa_request.C 2020/11/21 23:26:26 1.393 @@ -1,12 +1,13 @@ /** @file Parser: request class main part. @see compile.C and execute.C. - Copyright (c) 2001-2012 Art. Lebedev Studio (http://www.artlebedev.com) + Copyright (c) 2001-2017 Art. Lebedev Studio (http://www.artlebedev.com) Author: Alexandr Petrosian (http://paf.design.ru) */ #include "pa_sapi.h" #include "pa_common.h" +#include "pa_os.h" #include "pa_request.h" #include "pa_wwrapper.h" #include "pa_vclass.h" @@ -32,68 +33,106 @@ #include "pa_vconsole.h" #include "pa_vdate.h" -volatile const char * IDENT_PA_REQUEST_C="$Id: pa_request.C,v 1.334 2013/08/21 12:11:14 moko Exp $" IDENT_PA_REQUEST_H IDENT_PA_REQUEST_CHARSETS_H IDENT_PA_REQUEST_INFO_H IDENT_PA_VCONSOLE_H; +volatile const char * IDENT_PA_REQUEST_C="$Id: pa_request.C,v 1.393 2020/11/21 23:26:26 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" -/// content type of exception response, when no @MAIN:exception handler defined -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 uint LOOP_LIMIT=20000; +const uint EXECUTE_RECOURSION_LIMIT=1000; +const uint HTTPD_TIMEOUT=4; +const size_t FILE_SIZE_LIMIT=512*1024*1024; // defines for globals #define MAIN_METHOD_NAME "main" #define AUTO_METHOD_NAME "auto" +#define USE_METHOD_NAME "use" #define AUTOUSE_METHOD_NAME "autouse" -#define BODY_NAME "body" + #define EXCEPTION_TYPE_PART_NAME "type" #define EXCEPTION_SOURCE_PART_NAME "source" #define EXCEPTION_COMMENT_PART_NAME "comment" +#define ORIGIN_KEY "origin" + // globals const String main_method_name(MAIN_METHOD_NAME); const String auto_method_name(AUTO_METHOD_NAME); -const String autouse_method_name(AUTOUSE_METHOD_NAME); +static const String use_method_name(USE_METHOD_NAME); +static const String autouse_method_name(AUTOUSE_METHOD_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); +static const String origin_key(ORIGIN_KEY); + +int pa_loop_limit=LOOP_LIMIT; +int pa_execute_recoursion_limit=EXECUTE_RECOURSION_LIMIT; +int pa_httpd_timeout=HTTPD_TIMEOUT; +size_t pa_file_size_limit=FILE_SIZE_LIMIT; + // defines for statics #define CHARSETS_NAME "CHARSETS" #define MIME_TYPES_NAME "MIME-TYPES" #define STRICT_VARS_NAME "STRICT-VARS" -#define ORIGINS_MODE_NAME "ORIGINS" +#define PROTOTYPE_NAME "OBJECT-PROTOTYPE" +#define LIMITS_NAME "LIMITS" +#define LOOP_LIMIT_NAME "max_loop" +#define RECOURSION_LIMIT_NAME "max_recoursion" +#define HTTPD_TIMEOUT_NAME "httpd_timeout" +#define FILE_SIZE_LIMIT_NAME "max_file_size" +#define LOCK_WAIT_TIMEOUT_NAME "lock_wait_timeout" #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 strict_vars_name(STRICT_VARS_NAME); -static const String origins_mode_name(ORIGINS_MODE_NAME); +static const String prototype_name(PROTOTYPE_NAME); +static const String limits_name(LIMITS_NAME); +static const String loop_limit_name(LOOP_LIMIT_NAME); +static const String recoursion_limit_name(RECOURSION_LIMIT_NAME); +static const String httpd_timeout_name(HTTPD_TIMEOUT_NAME); +static const String file_size_limit_name(FILE_SIZE_LIMIT_NAME); +static const String lock_wait_timeout_name(LOCK_WAIT_TIMEOUT_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(); @@ -104,19 +143,19 @@ Request::Request(SAPI_Info& asapi_info, anti_endless_execute_recoursion(0), // public + allow_class_replace(false), method_frame(0), rcontext(0), wcontext(0), flang(adefault_lang), fconnection(0), - finterrupted(false), - fskip(SKIP_NOTHING), fin_cycle(0), + fskip(SKIP_NOTHING), // 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)), @@ -136,49 +175,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 - 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, form)); + 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), &console); + 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() { @@ -186,43 +220,35 @@ 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(); } -Value* Request::get_class(const String& name){ - Value* result=classes().get(name); +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); - VMethodFrame frame(*method, 0 /*no parent*/, main_class); - - frame.store_params(&vname, 1); - // we don't need the result - execute_method(frame); - - result=classes().get(name); - } - + if(const Method *method=main_class.get_element_method(autouse_method_name)){ + 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) { - const String::Body NAME=String(akey, String::L_CLEAN).change_case(charsets->source(), String::CC_UPPER); - ::charsets.load_charset(*charsets, NAME, avalue->as_string()); +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 @@ -234,13 +260,12 @@ void Request::configure_admin(VStateless ] */ if(Value* vcharsets=conf_class.get_element(charsets_name)) { - if(!vcharsets->is_string()) + if(!vcharsets->is_string()) { if(HashStringValue* charsets=vcharsets->get_hash()) 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 @@ -248,54 +273,117 @@ void Request::configure_admin(VStateless 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"); + 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 ":LIMITS." 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 ":LIMITS." RECOURSION_LIMIT_NAME " must be int"); + } + + pa_httpd_timeout=HTTPD_TIMEOUT; + if(limits) + if(Value* httpd_timeout=limits->get_element(httpd_timeout_name)) { + if(httpd_timeout->is_evaluated_expr()) { + pa_httpd_timeout=httpd_timeout->as_int(); + if(pa_httpd_timeout==0) pa_httpd_timeout=INT_MAX; + } else + throw Exception(PARSER_RUNTIME, 0, "$" MAIN_CLASS_NAME ":LIMITS." HTTPD_TIMEOUT_NAME " must be int"); + } + + pa_file_size_limit=FILE_SIZE_LIMIT; + if(limits) + if(Value* file_size_limit=limits->get_element(file_size_limit_name)) { + if(file_size_limit->is_evaluated_expr()) { + double limit=file_size_limit->as_double(); + if(limit >= (double)SSIZE_MAX) + throw Exception(PARSER_RUNTIME, 0, "$" MAIN_CLASS_NAME ":LIMITS." FILE_SIZE_LIMIT_NAME " must be less then %.15g", (double)SSIZE_MAX); + pa_file_size_limit=(size_t)limit; + if(pa_file_size_limit==0) pa_file_size_limit=SSIZE_MAX; + } else + throw Exception(PARSER_RUNTIME, 0, "$" MAIN_CLASS_NAME ":LIMITS." FILE_SIZE_LIMIT_NAME " must be number"); + } + + pa_lock_attempts=PA_LOCK_ATTEMPTS; + if(limits) + if(Value* lock_wait_timeout=limits->get_element(lock_wait_timeout_name)) { + if(lock_wait_timeout->is_evaluated_expr()) { + double limit=lock_wait_timeout->as_double(); + if(limit >= 3600*24) + throw Exception(PARSER_RUNTIME, 0, "$" MAIN_CLASS_NAME ":LIMITS." LOCK_WAIT_TIMEOUT_NAME " must be less then %d", 3600*24); + pa_lock_attempts=(unsigned int)(limit*2)+1; + } else + throw Exception(PARSER_RUNTIME, 0, "$" MAIN_CLASS_NAME ":LIMITS." LOCK_WAIT_TIMEOUT_NAME " must be number"); + } + // 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; } @@ -324,55 +412,19 @@ void Request::configure() { @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 header_only, const String &amain_method_name) { try { - // filling mail received - mail.fill_received(*this); - // loading config - if(config_filespec) { - const String& filespec=*new String(config_filespec); - use_file_directly(main_class, - filespec, - config_fail_on_read_problem, - true /*file must exist if 'fail on read problem' not set*/); - } + if(config_filespec) + use_file_directly(*new String(config_filespec)); - // loading auto.p files from document_root/.. - // to the one beside requested file. - // all assigned bases from upper dir - { - 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; - } - - 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_directly(main_class, - sfile_spec, - true /*fail on read problem*/, - false /*but ignore absence, sole user*/); - } - for(after=before+1;*after=='/';after++); - } - } + // filling mail received + mail.fill_received(*this); try { // compile requested file - String& spath_translated=*new String; - spath_translated.append_help_length(request_info.path_translated, 0, String::L_TAINTED); - use_file_directly(main_class, spath_translated); - + if(request_info.path_translated) + use_file_directly(*new String(request_info.path_translated, String::L_TAINTED), true, true /* load auto.p files */); configure(); } catch(...) { configure(); // configure anyway, useful in @unhandled_exception [say, if they would want to mail by SMTP something] @@ -380,33 +432,28 @@ void Request::core(const char* config_fi } // execute @main[] - const String* body_string=execute_virtual_method(main_class, main_method_name); + const String* body_string=amain_method_name.is_empty() ? &String::Empty : execute_method(main_class, amain_method_name); if(!body_string) - throw Exception(PARSER_RUNTIME, - 0, - "'"MAIN_METHOD_NAME"' method not found"); + throw Exception(PARSER_RUNTIME, 0, "'%s' method not found", amain_method_name.cstr()); // 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)) - if(Junction* junction=value->get_junction()) - if(const Method *method=junction->method) { - // preparing to pass parameters to - // @postprocess[data] - VMethodFrame frame(*method, 0 /*no parent*/, main_class); - - frame.store_params(&body_value, 1); - execute_method(frame); - - body_value=&frame.result().as_value(); - } + if(const Method *method=main_class.get_method(post_process_method_name)) { + // preparing to pass parameters to + // @postprocess[data] + 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(flang, &charsets); @@ -431,80 +478,65 @@ void Request::core(const char* config_fi // 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))) { - if(Junction* junction=value->get_junction()) { - if(const Method *method=junction->method) { - // preparing to pass parameters to - // @unhandled_exception[exception;stack] - - // $stack[^table::create{name file lineno colno}] - 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(); ias_bool()) { SAPI::log(sapi_info, "%s", exception_cstr); } - // ERROR. write it out - output_result(body_file, header_only, false); + if(body_string) { // could report an error beautifully? + VString body_vstring(*body_string); + VFile* body_file=body_vstring.as_vfile(flang, &charsets); + // write it out the error + output_result(body_file, header_only, false); + } else { + // doing that ugly + SAPI::send_error(sapi_info, exception_cstr, !strcmp(e.type(), "file.missing") ? "404" : "500"); + } } catch(const Exception& e) { // exception in unhandled exception Request::Exception_details details=get_details(e); const char* exception_cstr=get_exception_cstr(e, details); - // unconditionally log the beast - SAPI::log(sapi_info, "%s", exception_cstr); - - throw Exception(0, - 0, - "in %s", - exception_cstr); + // unconditionally log the beast in exception handler + throw Exception(0, 0, "Unhandled exception in %s", exception_cstr); } } } @@ -514,38 +546,57 @@ uint Request::register_file(String::Body return file_list.count()-1; } -void Request::use_file_directly(VStateless_class& aclass, - const String& file_spec, - bool fail_on_read_problem, - bool fail_on_file_absence) { - +void Request::use_file_directly(const String& file_spec, bool fail_on_file_absence, bool with_auto_p) { // cyclic dependence check if(used_files.get(file_spec)) return; used_files.put(file_spec, true); - if(fail_on_read_problem && !fail_on_file_absence) // ignore file absence if asked for - if(!entry_exists(file_spec)) - return; + if(!fail_on_file_absence && !entry_exists(file_spec)) // ignore file absence if asked for + return; - if(const char* source=file_read_text(charsets, file_spec, fail_on_read_problem)) - use_buf(aclass, source, 0, register_file(file_spec)); -} + if(with_auto_p) { + // loading auto.p files from document_root/.. + // to the one beside requested file. + // all assigned bases from upper dir + const char* target=file_spec.cstr(); + // all relative paths are calculated from main document + request_info.path_translated=target; -void Request::use_file(VStateless_class& aclass, - const String& file_name, - const String* use_filespec/*absolute*/) { + const char* after=target; + size_t drlen=strlen(request_info.document_root); + if(memcmp(after, request_info.document_root, drlen)==0) { + after+=drlen; + if(after[-1]=='/') + --after; + } + + while(const char* before=strchr(after, '/')) { + String& sfile_spec=*new String; + if(after!=target) { + sfile_spec.append_strdup(target, before-target, String::L_CLEAN); + sfile_spec << "/" AUTO_FILE_NAME; + use_file_directly(sfile_spec, false /*ignore absence, sole user*/); + } + for(after=before+1;*after=='/';after++); + } + } + + if(const char* source=file_read_text(charsets, file_spec, true)) + use_buf(main_class, source, 0, register_file(file_spec)); +} + + +void Request::use_file(const String& file_name, const String* use_filespec/*absolute*/, bool with_auto_p) { if(file_name.is_empty()) - throw Exception(PARSER_RUNTIME, - 0, - "usage failed - no filename was specified"); + throw Exception(PARSER_RUNTIME, 0, "usage failed - no filename was specified"); const String* filespec=0; if(file_name.first_char()=='/') //absolute path? [no need to scan MAIN:CLASS_PATH] - filespec=&absolute(file_name); + filespec=&full_disk_path(file_name); else if(use_filespec){ // search in current dir first size_t last_slash_pos=use_filespec->strrpbrk("/"); if(last_slash_pos!=STRING_NOT_FOUND) @@ -559,38 +610,48 @@ void Request::use_file(VStateless_class& searched_along_class_path.put(file_name, true); if(Value* element=main_class.get_element(class_path_name)) { if(element->is_string()) { - filespec=file_exist(absolute(element->as_string()), file_name); // found at class_path? + filespec=file_exist(full_disk_path(element->as_string()), file_name); // found at class_path? } else if(Table *table=element->get_table()) { for(size_t i=table->count(); i--; ) { const String& path=*(*table->get(i))[0]; - if(filespec=file_exist(absolute(path), file_name)) + if(filespec=file_exist(full_disk_path(path), file_name)) break; // found along class_path } } else - throw Exception(PARSER_RUNTIME, - 0, - "$" CLASS_PATH_NAME " must be string or table"); + throw Exception(PARSER_RUNTIME, 0, "$" CLASS_PATH_NAME " must be string or table"); if(!filespec) - throw Exception(PARSER_RUNTIME, - &file_name, - "not found along " MAIN_CLASS_NAME ":" CLASS_PATH_NAME); + throw Exception(PARSER_RUNTIME, &file_name, "not found along $" MAIN_CLASS_NAME ":" CLASS_PATH_NAME); } else - throw Exception(PARSER_RUNTIME, - &file_name, - "usage failed - no $" MAIN_CLASS_NAME ":" CLASS_PATH_NAME " were specified"); + throw Exception(PARSER_RUNTIME, &file_name, "usage failed - no $" MAIN_CLASS_NAME ":" CLASS_PATH_NAME " were specified"); } - use_file_directly(aclass, *filespec); + use_file_directly(*filespec, true, with_auto_p); } +void Request::use_file(const String& file_name, const String* use_filespec/*absolute*/, Operation::Origin origin) { + static String use("USE"); + try { + static VHash* voptions=new VHash(); + if(const Method *method=main_class.get_method(use_method_name)){ + Value *params[]={new VString(file_name), voptions}; + voptions->hash().put(origin_key, new VString(*use_filespec)); -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 + CONSTRUCTOR_FRAME_ACTION(*method, 0 /*no parent*/, main_class, { + frame.store_params(params, 2); + // we don't need the result + call(frame); + }); + } + } 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 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 classes @@ -603,21 +664,18 @@ void Request::use_buf(VStateless_class& VStateless_class& cclass=*cclasses.get(i); // locate and execute possible @conf[] static - Execute_nonvirtual_method_result executed=execute_nonvirtual_method(cclass, - conf_method_name, vfilespec, - false/*no string result needed*/); - if(executed.method) + if(execute_method_if_exists(cclass, conf_method_name, vfilespec)) configure_admin(cclass/*, executed.method->name*/); // locate and execute possible @auto[] static - execute_nonvirtual_method(cclass, - auto_method_name, vfilespec, - false/*no result needed*/); + execute_method_if_exists(cclass, auto_method_name, vfilespec); + + 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 << "/"; @@ -625,22 +683,22 @@ const String& Request::relative(const ch return result; } -const String& Request::absolute(const String& relative_name) { +const String& Request::full_disk_path(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 - if(relative_name.pos("://")!=STRING_NOT_FOUND // something like "http://xxx" + } + 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 + || 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); + ) + return relative_name; + + return relative(request_info.path_translated ? request_info.path_translated : request_info.document_root, relative_name); } #ifndef DOXYGEN @@ -652,36 +710,26 @@ public: bool add_last_modified; }; #endif -static void add_header_attribute( - HashStringValue::key_type name, - HashStringValue::value_type value, - Add_header_attribute_info* info) { - if(name==BODY_NAME - || name==DOWNLOAD_NAME - || name==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* aname=String(name, String::L_URI).untaint_and_transcode_cstr(String::L_URI, &info->r.charsets); SAPI::add_header_attribute(info->r.sapi_info, - aname, + aname, attributed_meaning_to_string(*value, String::L_URI, false).untaint_and_transcode_cstr(String::L_URI, &info->r.charsets) ); - - if(strcasecmp(aname, "last-modified")==0) - info->add_last_modified=false; } -static void output_sole_piece(Request& r, - bool header_only, - VFile& body_file, - Value* body_file_content_type) { +static void output_sole_piece(Request& r, bool header_only, VFile& body_file, Value* body_file_content_type) { // transcode text body when "text/*" or simple result 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, - r.charsets.source(), - r.charsets.client()); + output=Charset::transcode(output, r.charsets.source(), r.charsets.client()); // prepare header: Content-Length SAPI::add_header_attribute(r.sapi_info, HTTP_CONTENT_LENGTH, format(output.length, "%u")); @@ -723,18 +771,12 @@ static void parse_range(const String* s, } } -static void output_pieces(Request& r, - bool header_only, - const String& filename, - size_t content_length, - Value& date, - bool add_last_modified) -{ +static void output_pieces(Request& r, bool header_only, const String& filename, size_t content_length, Value& date, bool add_last_modified) { SAPI::add_header_attribute(r.sapi_info, "accept-ranges", "bytes"); - const size_t BUFSIZE = 10*0x400; + const size_t BUFSIZE = 128*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){ @@ -778,17 +820,15 @@ static void output_pieces(Request& r, SAPI::send_header(r.sapi_info); - const String& filespec=r.absolute(filename); + const String& filespec=r.full_disk_path(filename); size_t sent = 0; if(!header_only){ size_t to_read = 0; size_t size = 0; do{ - to_read = part_lengthfields().get(response_body_file_name); 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)); + vfile_name=new VString(*new String(pa_filename(vfile_name->as_string().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(); - h.put(value_name, new VString( as_attachment ? content_disposition_attachment : content_disposition_inline )); - h.put(content_disposition_filename_name, new VString(String(sfile_name, String::L_HTTP_HEADER))); - - response.fields().put(content_disposition, &hash); + hash.hash().put(value_name, new VString(as_attachment ? content_disposition_attachment : content_disposition_inline)); + hash.hash().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())); @@ -841,10 +874,10 @@ void Request::output_result(VFile* body_ // 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, :download and :charset @@ -854,11 +887,9 @@ void Request::output_result(VFile* body_ 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; + uint64_t content_length=0; time_t atime=0, mtime=0, ctime=0; - file_stat(absolute(sresponse_body_file), - content_length, - atime, mtime, ctime); + file_stat(full_disk_path(sresponse_body_file), content_length, atime, mtime, ctime); VDate* vdate=0; if(Value* v=body_file->fields().get("mdate")) { @@ -868,20 +899,15 @@ void Request::output_result(VFile* body_ 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, - content_length, - *vdate, - info.add_last_modified); + output_pieces(*this, header_only, sresponse_body_file, (size_t)content_length, *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); + output_sole_piece(*this, header_only, *body_file, body_file_content_type); } } @@ -894,19 +920,18 @@ const String& Request::mime_type_of(cons 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(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, - 0, - MIME_TYPES_NAME " table column elements must not be empty"); + throw Exception(PARSER_RUNTIME, 0, MIME_TYPES_NAME " table column elements must not be empty"); + } } return *new String("application/octet-stream"); } -const String* Request::get_used_filename(uint file_no){ +const String* Request::get_used_filespec(uint file_no){ if(file_no < file_list.count()) return new String(file_list[file_no], String::L_TAINTED); return 0; @@ -926,58 +951,61 @@ const String& Request::transcode(const x } #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 (we usually know source of next-from-throw-point exception) 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(*problem_source, String::L_TAINTED); - 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, String::L_TAINTED))); + hash.put(exception_comment_part_name, new VString(*new String(comment, String::L_TAINTED))); // $.handled(0) hash.put(exception_handled_part_name, &VBool::get(false)); - return Request::Exception_details(trace, problem_source, vhash); + 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); +} + +Temp_value_element::~Temp_value_element() { + frequest.put_element(fwhere, fname, saved ? saved : VVoid::get()); }