--- parser3/src/main/pa_request.C 2009/08/31 13:03:16 1.313 +++ parser3/src/main/pa_request.C 2012/05/24 12:50:20 1.331 @@ -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/08/31 13:03:16 $"; - #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.331 2012/05/24 12:50:20 misha 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" @@ -71,6 +71,7 @@ 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" @@ -83,6 +84,7 @@ const String exception_handled_part_name 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); @@ -97,9 +99,10 @@ 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), + anti_endless_json_string_recoursion(0), // public method_frame(0), @@ -157,8 +160,7 @@ 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)); // cookie class @@ -205,12 +207,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); } @@ -249,6 +250,17 @@ void Request::configure_admin(VStateless "$" MAIN_CLASS_NAME ":" CHARSETS_NAME " must be hash"); } +#ifdef STRICT_VARS + 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); @@ -332,9 +344,8 @@ gettimeofday(&mt[0],NULL); // 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*/); } @@ -359,14 +370,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 +383,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(...) { @@ -415,11 +421,12 @@ 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); @@ -473,8 +480,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 +503,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,9 +522,7 @@ t[9]-t[3] // doing that ugly // future $response:content-type - response.fields().remove(content_type_name); - response.fields().put(http_content_type, - new VString(*new String(UNHANDLED_EXCEPTION_CONTENT_TYPE))); + response.fields().put(http_content_type, new VString(*new String(UNHANDLED_EXCEPTION_CONTENT_TYPE))); // future $response:body body_string=new String(exception_cstr); } @@ -551,61 +558,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)); +} + + +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* 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; + 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 @@ -679,11 +705,11 @@ static void add_header_attribute( || name==CHARSET_NAME) return; - const char* aname=String(name, String::L_URI).transcode_and_untaint_cstr(String::L_URI, &info->r.charsets); + 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, - attributed_meaning_to_string(*value, String::L_URI, false).transcode_and_untaint_cstr(String::L_URI, &info->r.charsets) + 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) @@ -748,7 +774,7 @@ 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]; @@ -781,7 +807,7 @@ static void output_pieces(Request& r, } 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, HTTP_STATUS, "501 Not Implemented"); return; @@ -791,10 +817,9 @@ static void output_pieces(Request& r, SAPI::add_header_attribute(r.sapi_info, HTTP_CONTENT_LENGTH, format(part_length, "%u")); - 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()); - } + if(add_last_modified) + SAPI::add_header_attribute(r.sapi_info, "last-modified", attributed_meaning_to_string(date, String::L_AS_IS, true).cstr()); + SAPI::send_header(r.sapi_info); const String& filespec=r.absolute(filename); @@ -826,10 +851,10 @@ 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); @@ -839,7 +864,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) { @@ -848,7 +873,7 @@ 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(String(sfile_name, String::L_HTTP_HEADER))); response.fields().put(content_disposition, &hash); @@ -858,24 +883,20 @@ void Request::output_result(VFile* body_ } // set Content-Type - response.fields().put(http_content_type, - body_file_content_type - ? body_file_content_type - : response.fields().get(content_type_name) - ? response.fields().get(content_type_name) - : new VString(*new String(DEFAULT_CONTENT_TYPE))); - - response.fields().remove(content_type_name); + if(body_file_content_type) { + // body file content type + response.fields().put(content_type_name, body_file_content_type); + } else { + // default content type + response.fields().put_dont_replace(content_type_name, 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); - 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; @@ -899,11 +920,19 @@ 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, '.')) { @@ -921,6 +950,12 @@ const String& Request::mime_type_of(cons 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);