--- parser3/src/main/pa_request.C 2015/10/09 11:42:38 1.347 +++ parser3/src/main/pa_request.C 2016/11/27 23:08:28 1.365 @@ -1,7 +1,7 @@ /** @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-2015 Art. Lebedev Studio (http://www.artlebedev.com) Author: Alexandr Petrosian (http://paf.design.ru) */ @@ -32,7 +32,7 @@ #include "pa_vconsole.h" #include "pa_vdate.h" -volatile const char * IDENT_PA_REQUEST_C="$Id: pa_request.C,v 1.347 2015/10/09 11:42:38 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.365 2016/11/27 23:08:28 moko Exp $" IDENT_PA_REQUEST_H IDENT_PA_REQUEST_CHARSETS_H IDENT_PA_REQUEST_INFO_H IDENT_PA_VCONSOLE_H; // consts @@ -43,34 +43,49 @@ 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 USE_METHOD_NAME "use" #define AUTOUSE_METHOD_NAME "autouse" + #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 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_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 STRICT_VARS_NAME "STRICT-VARS" -#define ORIGINS_MODE_NAME "ORIGINS" +#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 CLASS_PATH_NAME "CLASS_PATH" @@ -85,7 +100,11 @@ static const String charsets_name(CHARSE 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 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 class_path_name(CLASS_PATH_NAME); @@ -129,7 +148,7 @@ Request::Request(SAPI_Info& asapi_info, // 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)), @@ -157,41 +176,36 @@ Request::Request(SAPI_Info& asapi_info, /// 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(ENV_CLASS_NAME, new VEnv(asapi_info)); + put_class(new VEnv(asapi_info)); // status class - classes().put(STATUS_CLASS_NAME, new VStatus()); + put_class(new VStatus()); // request class - classes().put(REQUEST_CLASS_NAME, new VRequest(arequest_info, charsets, form, asapi_info)); + put_class(new VRequest(arequest_info, charsets, form, asapi_info)); // cookie class - classes().put(COOKIE_CLASS_NAME, &cookie); + put_class(&cookie); // console class - classes().put(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() { @@ -206,36 +220,28 @@ Request::~Request() { 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_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 @@ -251,9 +257,7 @@ void Request::configure_admin(VStateless 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"); } } @@ -262,54 +266,82 @@ 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 ":" 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; } @@ -414,12 +446,11 @@ void Request::core(const char* config_fi 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(); + 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); @@ -477,13 +508,12 @@ void Request::core(const char* config_fi // execute ^unhandled_exception[exception;stack] exception_trace.clear(); // forget all about previous life, in case there would be error inside of this method, error handled would not be mislead by old stack contents (see extract_origin) - VMethodFrame frame(*method, 0 /*no caller*/, main_class); Value *params[]={&details.vhash, new VTable(&stack_trace)}; - - frame.store_params(params, 2); - execute_method(frame); - - body_string=&frame.result().as_string(); + METHOD_FRAME_ACTION(*method, 0 /*no caller*/, main_class, { + frame.store_params(params, 2); + call(frame); + body_string=&frame.result().as_string(); + }); } } } @@ -547,9 +577,7 @@ void Request::use_file_directly(VStatele } -void Request::use_file(VStateless_class& aclass, - const String& file_name, - const String* use_filespec/*absolute*/) { +void Request::use_file(VStateless_class& aclass, const String& file_name, const String* use_filespec/*absolute*/) { if(file_name.is_empty()) throw Exception(PARSER_RUNTIME, @@ -597,14 +625,30 @@ void Request::use_file(VStateless_class& use_file_directly(aclass, *filespec); } +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)); + + 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 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 classes @@ -617,16 +661,12 @@ 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*/); + 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*/); + execute_nonvirtual_method(cclass, auto_method_name, vfilespec, false/*no result needed*/); cclass.enable_default_setter(); } @@ -918,7 +958,7 @@ const String& Request::mime_type_of(cons 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; @@ -938,45 +978,34 @@ 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(); + // $.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)); @@ -984,13 +1013,12 @@ Request::Exception_details Request::get_ // $.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) :