--- parser3/src/main/pa_request.C 2009/10/15 01:07:54 1.316 +++ parser3/src/main/pa_request.C 2015/06/03 23:49:18 1.345 @@ -1,12 +1,10 @@ /** @file Parser: request class main part. @see compile.C and execute.C. - Copyright (c) 2001-2009 ArtLebedev Group (http://www.artlebedev.com) + Copyright (c) 2001-2012 Art. Lebedev Studio (http://www.artlebedev.com) Author: Alexandr Petrosian (http://paf.design.ru) */ -static const char * const IDENT_REQUEST_C="$Date: 2009/10/15 01:07:54 $"; - #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.345 2015/06/03 23:49:18 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" @@ -50,7 +50,6 @@ const char* ORIGINS_CONTENT_TYPE="text/p #define MAIN_METHOD_NAME "main" #define AUTO_METHOD_NAME "auto" #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" @@ -61,7 +60,6 @@ const String main_method_name(MAIN_METHO const String auto_method_name(AUTO_METHOD_NAME); 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); @@ -71,37 +69,54 @@ const String exception_handled_part_name #define CHARSETS_NAME "CHARSETS" #define MIME_TYPES_NAME "MIME-TYPES" +#define STRICT_VARS_NAME "STRICT-VARS" #define ORIGINS_MODE_NAME "ORIGINS" #define CONF_METHOD_NAME "conf" #define POST_PROCESS_METHOD_NAME "postprocess" -#define DOWNLOAD_NAME "download" #define CLASS_PATH_NAME "CLASS_PATH" #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 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), @@ -112,12 +127,6 @@ Request::Request(SAPI_Info& asapi_info, fin_cycle(0), // public -#ifdef RESOURCES_DEBUG - sql_connect_time(0), - sql_request_time(0), -#endif - - // public request_info(arequest_info), sapi_info(asapi_info), charsets(UTF8_charset, UTF8_charset, UTF8_charset), // default charsets @@ -157,10 +166,9 @@ Request::Request(SAPI_Info& asapi_info, // env class classes().put(String::Body(ENV_CLASS_NAME), new VEnv(asapi_info)); // status class - if(status_allowed) - classes().put(String::Body(STATUS_CLASS_NAME), new VStatus()); + classes().put(String::Body(STATUS_CLASS_NAME), new VStatus()); // request class - classes().put(String::Body(REQUEST_CLASS_NAME), new VRequest(arequest_info, charsets, form)); + classes().put(String::Body(REQUEST_CLASS_NAME), new VRequest(arequest_info, charsets, form, asapi_info)); // cookie class classes().put(String::Body(COOKIE_CLASS_NAME), &cookie); // console class @@ -191,7 +199,7 @@ 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 } @@ -205,12 +213,11 @@ Value* Request::get_class(const String& if(Junction* junction=value->get_junction()) if(const Method *method=junction->method) { Value *vname=new VString(name); - VMethodFrame frame(*junction, 0/*no parent*/); + VMethodFrame frame(*method, 0 /*no parent*/, main_class); - frame.set_self(main_class); frame.store_params(&vname, 1); // we don't need the result - execute_method(frame, *method); + execute_method(frame); result=classes().get(name); } @@ -240,15 +247,28 @@ 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"); + } } +#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 + // configure method_frame options // until someone with less privileges have overriden them methoded_array().configure_admin(*this); @@ -319,26 +339,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 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 @@ -359,14 +372,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++); } } @@ -374,10 +385,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(...) { @@ -385,27 +393,18 @@ 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, 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[] @@ -415,41 +414,19 @@ gettimeofday(&mt[2],NULL); 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); + VMethodFrame frame(*method, 0 /*no parent*/, main_class); frame.store_params(&body_value, 1); - body_value=&execute_method(frame, *method).as_value(); + execute_method(frame); + + body_value=&frame.result().as_value(); } VFile* body_file=body_value->as_vfile(flang, &charsets); -#ifdef RESOURCES_DEBUG -//measure:after postprocess -gettimeofday(&mt[3],NULL); -#endif - // 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 @@ -473,8 +450,6 @@ t[9]-t[3] 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); // $stack[^table::create{name file lineno colno}] Table::columns_type stack_trace_columns(new ArrayString); @@ -498,13 +473,17 @@ t[9]-t[3] stack_trace+=row; } - Value *params[]={&details.vhash, new VTable(&stack_trace)}; - frame.store_params(params, 2); - // future $response:body= // 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) - body_string=&execute_method(frame, *method).as_string(); + + 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(); } } } @@ -513,7 +492,7 @@ t[9]-t[3] // doing that ugly // future $response:content-type - response.fields().put(http_content_type, new VString(*new String(UNHANDLED_EXCEPTION_CONTENT_TYPE))); + response.fields().put(content_type_name_upper, new VString(*new String(UNHANDLED_EXCEPTION_CONTENT_TYPE))); // future $response:body body_string=new String(exception_cstr); } @@ -549,61 +528,80 @@ uint Request::register_file(String::Body return file_list.count()-1; } -void Request::use_file(VStateless_class& aclass, - const String& file_name, const String* main_alias, - bool ignore_class_path, - bool fail_on_read_problem, - bool fail_on_file_absence) { +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_name)) + if(used_files.get(file_spec)) return; - used_files.put(file_name, true); + 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(const char* source=file_read_text(charsets, file_spec, fail_on_read_problem)) + use_buf(aclass, source, 0, register_file(file_spec)); +} - const String* file_spec; - if(ignore_class_path) // ignore_class_path? - file_spec=&file_name; - else if(file_name.first_char()=='/') //absolute path? [no need to scan MAIN:CLASS_PATH] - file_spec=&absolute(file_name); - else { - file_spec=0; + +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"); + + const String* filespec=0; + + if(file_name.first_char()=='/') //absolute path? [no need to scan MAIN:CLASS_PATH] + filespec=&absolute(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) + 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_exist(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_exist(absolute(path), file_name))) + if(filespec=file_exist(absolute(path), file_name)) break; // found along class_path } } else throw Exception(PARSER_RUNTIME, 0, "$" CLASS_PATH_NAME " must be string or table"); - if(!file_spec) + if(!filespec) throw Exception(PARSER_RUNTIME, &file_name, "not found along " MAIN_CLASS_NAME ":" CLASS_PATH_NAME); - } - if(!file_spec) + } 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_buf(VStateless_class& aclass, - const char* source, const String* main_alias, - uint file_no, - int line_no_offset) { + 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 Temp_method temp_method_conf(aclass, conf_method_name, 0); // temporary zero @auto so to maybe-replace it in compiled code @@ -629,11 +627,13 @@ void Request::use_buf(VStateless_class& 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 << "/"; @@ -643,7 +643,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 @@ -668,24 +668,19 @@ 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, @@ -750,7 +745,7 @@ static void output_pieces(Request& r, 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){ @@ -836,7 +831,7 @@ void Request::output_result(VFile* body_ 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(name_cstr)); } } if(vfile_name) { @@ -845,9 +840,9 @@ void Request::output_result(VFile* body_ 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, vfile_name); + h.put(content_disposition_filename_name, new VString(*new String(sfile_name, String::L_HTTP_HEADER))); - response.fields().put(content_disposition, &hash); + 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())); @@ -857,10 +852,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 @@ -901,23 +896,34 @@ void Request::output_result(VFile* body_ } } +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(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"); + } } return *new String("application/octet-stream"); } +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; +} + #ifdef XML xmlChar* Request::transcode(const String& s) { return charsets.source().transcode(s); @@ -987,3 +993,19 @@ Request::Exception_details Request::get_ return Request::Exception_details(trace, 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()); +}