--- parser3/src/main/pa_request.C 2009/08/30 06:05:56 1.312 +++ parser3/src/main/pa_request.C 2010/09/16 23:35:11 1.324 @@ -5,7 +5,7 @@ Author: Alexandr Petrosian (http://paf.design.ru) */ -static const char * const IDENT_REQUEST_C="$Date: 2009/08/30 06:05:56 $"; +static const char * const IDENT_REQUEST_C="$Date: 2010/09/16 23:35:11 $"; #include "pa_sapi.h" #include "pa_common.h" @@ -100,6 +100,7 @@ Request::Request(SAPI_Info& asapi_info, String::Language adefault_lang, bool status_allowed): // private anti_endless_execute_recoursion(0), + anti_endless_json_string_recoursion(0), // public method_frame(0), @@ -200,21 +201,20 @@ Value& Request::get_self() { return meth Value* Request::get_class(const String& name){ Value* result=classes().get(name); - if(!result){ + 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(*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); } - } + return result; } @@ -332,9 +332,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 +358,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 +371,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 +409,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 +468,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 +491,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 +510,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 +546,75 @@ 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*/) { - 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 + int afterslash=lastposafter(*use_filespec, 0, "/", 1, true); + if(afterslash>0) + filespec=file_exist(use_filespec->mid(0, afterslash-1), 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 +688,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) @@ -719,8 +728,7 @@ struct Range size_t end; }; #endif -static void parse_range(const String* s, Array &ar) -{ +static void parse_range(const String* s, Array &ar) { const char *p = s->cstr(); if(s->starts_with("bytes=")) p += 6; @@ -749,7 +757,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]; @@ -782,7 +790,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; @@ -792,10 +800,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); @@ -827,18 +834,15 @@ 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); - if(vfile_name) - { - const String& sfile_name=vfile_name->as_string(); - - char* name_cstr=sfile_name.cstrm(); + 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, '/')) @@ -852,8 +856,8 @@ 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); + response.fields().put(content_disposition, &hash); if(!body_file_content_type) @@ -862,24 +866,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; @@ -903,6 +903,10 @@ 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); } @@ -914,8 +918,8 @@ const String& Request::mime_type_of(cons String sext(++cext); Table::Action_options 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; + if(const String* result=mime_types->item(1)) + return *result; else throw Exception(PARSER_RUNTIME, 0, @@ -925,6 +929,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);