--- parser3/src/main/pa_request.C 2016/10/03 20:34:48 1.361 +++ parser3/src/main/pa_request.C 2016/12/21 21:14:42 1.367 @@ -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.361 2016/10/03 20:34:48 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.367 2016/12/21 21:14:42 moko Exp $" IDENT_PA_REQUEST_H IDENT_PA_REQUEST_CHARSETS_H IDENT_PA_REQUEST_INFO_H IDENT_PA_VCONSOLE_H; // consts @@ -51,22 +51,29 @@ const uint LOOP_LIMIT=20000; #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; @@ -76,8 +83,9 @@ int pa_loop_limit=LOOP_LIMIT; #define MIME_TYPES_NAME "MIME-TYPES" #define STRICT_VARS_NAME "STRICT-VARS" #define PROTOTYPE_NAME "OBJECT-PROTOTYPE" -#define RECOURSION_LIMIT_NAME "RECOURSION_LIMIT" -#define LOOP_LIMIT_NAME "LOOP_LIMIT" +#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" @@ -93,6 +101,7 @@ static const String main_class_name(MAIN static const String mime_types_name(MIME_TYPES_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); @@ -214,19 +223,15 @@ Value& Request::get_self() { return meth 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; } @@ -276,23 +281,27 @@ void Request::configure_admin(VStateless } #endif + Value* limits=conf_class.get_element(limits_name); + pa_loop_limit=LOOP_LIMIT; - if(Value* loop_limit=conf_class.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"); - } + 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(Value* recoursion_limit=conf_class.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"); - } + 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 @@ -366,10 +375,7 @@ void Request::core(const char* config_fi // 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*/); + 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 @@ -390,15 +396,10 @@ void Request::core(const char* config_fi 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.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*/); + use_file_directly(main_class, sfile_spec, true /*fail on read problem*/, false /*but ignore absence, sole user*/); } for(after=before+1;*after=='/';after++); } @@ -419,9 +420,7 @@ void Request::core(const char* config_fi // execute @main[] const String* body_string=execute_virtual_method(main_class, main_method_name); if(!body_string) - throw Exception(PARSER_RUNTIME, - 0, - "'" MAIN_METHOD_NAME "' method not found"); + throw Exception(PARSER_RUNTIME, 0, "'" MAIN_METHOD_NAME "' method not found"); // extract response body Value* body_value=response.fields().get(download_name_upper); // $response:download? @@ -437,12 +436,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(); + 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); @@ -500,13 +498,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(); + }); } } } @@ -538,10 +535,7 @@ void Request::core(const char* config_fi // unconditionally log the beast SAPI::log(sapi_info, "%s", exception_cstr); - throw Exception(0, - 0, - "in %s", - exception_cstr); + throw Exception(0, 0, "in %s", exception_cstr); } } } @@ -551,11 +545,7 @@ 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(VStateless_class& aclass, const String& file_spec, bool fail_on_read_problem, bool fail_on_file_absence) { // cyclic dependence check if(used_files.get(file_spec)) return; @@ -571,11 +561,8 @@ void Request::use_file_directly(VStatele 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, - 0, - "usage failed - no filename was specified"); + throw Exception(PARSER_RUNTIME, 0, "usage failed - no filename was specified"); const String* filespec=0; @@ -602,26 +589,30 @@ void Request::use_file(VStateless_class& 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); } -void Request::use_file(VStateless_class& aclass, const String& file_name, const String* use_filespec/*absolute*/, Operation::Origin origin) { +void Request::use_file(const String& file_name, const String* use_filespec/*absolute*/, Operation::Origin origin) { static String use("USE"); try { - use_file(aclass, file_name, use_filespec); + 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; @@ -706,16 +697,11 @@ static void add_header_attribute(HashStr ); } -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")); @@ -757,13 +743,7 @@ 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; @@ -888,11 +868,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(absolute(sresponse_body_file), content_length, atime, mtime, ctime); VDate* vdate=0; if(Value* v=body_file->fields().get("mdate")) { @@ -904,18 +882,13 @@ void Request::output_result(VFile* body_ if(!vdate) 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, 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); } } @@ -932,16 +905,14 @@ const String& Request::mime_type_of(cons 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;