--- parser3/src/main/pa_request.C 2009/07/06 12:07:04 1.304 +++ parser3/src/main/pa_request.C 2010/05/23 01:06:47 1.320 @@ -5,7 +5,7 @@ Author: Alexandr Petrosian (http://paf.design.ru) */ -static const char * const IDENT_REQUEST_C="$Date: 2009/07/06 12:07:04 $"; +static const char * const IDENT_REQUEST_C="$Date: 2010/05/23 01:06:47 $"; #include "pa_sapi.h" #include "pa_common.h" @@ -49,6 +49,7 @@ 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" @@ -58,11 +59,8 @@ const char* ORIGINS_CONTENT_TYPE="text/p const String main_method_name(MAIN_METHOD_NAME); const String auto_method_name(AUTO_METHOD_NAME); -const String content_transfer_encoding_name(CONTENT_TRANSFER_ENCODING_NAME); -const String content_disposition_name(CONTENT_DISPOSITION_NAME); -const String content_disposition_inline(CONTENT_DISPOSITION_INLINE); -const String content_disposition_attachment(CONTENT_DISPOSITION_ATTACHMENT); -const String content_disposition_filename_name(CONTENT_DISPOSITION_FILENAME_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); @@ -109,7 +107,9 @@ Request::Request(SAPI_Info& asapi_info, wcontext(0), flang(adefault_lang), fconnection(0), - finterrupted(false),fskip(SKIP_NOTHING), + finterrupted(false), + fskip(SKIP_NOTHING), + fin_cycle(0), // public #ifdef RESOURCES_DEBUG @@ -198,6 +198,26 @@ Request::~Request() { Value& Request::get_self() { return method_frame/*always have!*/->self(); } +Value* Request::get_class(const String& name){ + Value* 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(*junction, 0/*no parent*/); + + frame.set_self(main_class); + frame.store_params(&vname, 1); + // we don't need the result + execute_method(frame, *method); + + result=classes().get(name); + } + + return result; +} + static void load_charset(HashStringValue::key_type akey, HashStringValue::value_type avalue, Request_charsets* charsets) { @@ -219,7 +239,7 @@ void Request::configure_admin(VStateless ... ] */ - if(Value* vcharsets=conf_class.get_element(charsets_name, conf_class, false)) { + if(Value* vcharsets=conf_class.get_element(charsets_name)) { if(!vcharsets->is_string()) if(HashStringValue* charsets=vcharsets->get_hash()) charsets->for_each(load_charset, &this->charsets); @@ -283,7 +303,7 @@ void Request::configure() { methoded_array().configure_user(*this); // $MAIN:MIME-TYPES - if(Value* element=main_class.get_element(mime_types_name, main_class, false)) + if(Value* element=main_class.get_element(mime_types_name)) if(Table *table=element->get_table()) mime_types=table; } @@ -312,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*/); } @@ -339,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++); } } @@ -354,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(...) { @@ -390,7 +404,7 @@ gettimeofday(&mt[2],NULL); body_value=new VString(*body_string); // just result of ^main[] // @postprocess - if(Value* value=main_class.get_element(post_process_method_name, main_class, false)) + if(Value* value=main_class.get_element(post_process_method_name)) if(Junction* junction=value->get_junction()) if(const Method *method=junction->method) { // preparing to pass parameters to @@ -448,10 +462,7 @@ t[9]-t[3] // maybe we'd be lucky enough as to report an error // in a gracefull way... - if(Value* value=main_class.get_element( - *new String(UNHANDLED_EXCEPTION_METHOD_NAME), - main_class, - false)) { + if(Value* value=main_class.get_element(*new String(UNHANDLED_EXCEPTION_METHOD_NAME))) { if(Junction* junction=value->get_junction()) { if(const Method *method=junction->method) { // preparing to pass parameters to @@ -496,8 +507,7 @@ t[9]-t[3] // doing that ugly // future $response:content-type - response.fields().put(content_type_name, - 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); } @@ -533,61 +543,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); - 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; - if(Value* element=main_class.get_element(class_path_name, main_class, false)) { + 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* 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 @@ -661,11 +685,11 @@ static void add_header_attribute( || name==CHARSET_NAME) return; - const char* aname=String(name, String::L_TAINT).taint_cstr(String::L_URI, 0, &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).untaint_cstr(String::L_AS_IS, 0, &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) @@ -683,10 +707,8 @@ static void output_sole_piece(Request& r r.charsets.source(), r.charsets.client()); - // prepare header: content-length - char content_length_cstr[MAX_NUMBER]; - snprintf(content_length_cstr, MAX_NUMBER, "%u", output.length); - SAPI::add_header_attribute(r.sapi_info, "content-length", content_length_cstr); + // prepare header: Content-Length + SAPI::add_header_attribute(r.sapi_info, HTTP_CONTENT_LENGTH, format(output.length, "%u")); // send header SAPI::send_header(r.sapi_info); @@ -703,8 +725,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; @@ -733,7 +754,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]; @@ -747,7 +768,7 @@ static void output_pieces(Request& r, if(count == 1){ Range &rg = ar.get_ref(0); if(rg.start == (size_t)-1 && rg.end == (size_t)-1){ - SAPI::add_header_attribute(r.sapi_info, "status", "416 Requested Range Not Satisfiable"); + SAPI::add_header_attribute(r.sapi_info, HTTP_STATUS, "416 Requested Range Not Satisfiable"); return; } if(rg.start == (size_t)-1 && rg.end != (size_t)-1){ @@ -761,26 +782,24 @@ static void output_pieces(Request& r, part_length -= rg.start; } if(part_length == 0){ - SAPI::add_header_attribute(r.sapi_info, "status", "204 No Content"); + SAPI::add_header_attribute(r.sapi_info, HTTP_STATUS, "204 No Content"); return; } - SAPI::add_header_attribute(r.sapi_info, "status", "206 Partial Content"); + 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, "status", "501 Not Implemented"); + SAPI::add_header_attribute(r.sapi_info, HTTP_STATUS, "501 Not Implemented"); return; } } - snprintf(buf, BUFSIZE, "%u", part_length); - SAPI::add_header_attribute(r.sapi_info, "Content-Length", buf); + SAPI::add_header_attribute(r.sapi_info, HTTP_CONTENT_LENGTH, format(part_length, "%u")); + + if(add_last_modified) + SAPI::add_header_attribute(r.sapi_info, "last-modified", attributed_meaning_to_string(date, String::L_AS_IS, true).cstr()); - 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()); - } SAPI::send_header(r.sapi_info); const String& filespec=r.absolute(filename); @@ -812,18 +831,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, '/')) @@ -837,34 +853,30 @@ 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_name, &hash); + + response.fields().put(content_disposition, &hash); if(!body_file_content_type) body_file_content_type=new VString(mime_type_of(sfile_name.cstr())); } } - // set content-type + // set Content-Type 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))); + 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; @@ -874,7 +886,7 @@ void Request::output_result(VFile* body_ VDate* vdate=0; if(Value* v=body_file->fields().get("mdate")) { - if(Value* vdatep=v->as(VDATE_TYPE, false)) + if(Value* vdatep=v->as(VDATE_TYPE)) vdate=static_cast(vdatep); else throw Exception(PARSER_RUNTIME, 0, "mdate must be a date"); @@ -888,6 +900,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); } @@ -899,8 +915,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, @@ -910,6 +926,74 @@ const String& Request::mime_type_of(cons return *new String("application/octet-stream"); } +const String* Request::get_method_filename(const Method* method){ + if(ArrayOperation* code=method->parser_code) + if(code){ + Operation::Origin origin={0, 0, 0}; + Array_iterator i(*code); + while( i.has_next() ){ + switch( i.next().code ){ + case OP::OP_CURLY_CODE__STORE_PARAM: + case OP::OP_EXPR_CODE__STORE_PARAM: + case OP::OP_CURLY_CODE__CONSTRUCT: + case OP::OP_NESTED_CODE: + case OP::OP_OBJECT_POOL: + case OP::OP_STRING_POOL: + case OP::OP_CALL: + case OP::OP_CALL__WRITE: + { + i.next(); // skip local ops + i.next(); // skip next opcode + } + case OP::OP_CONSTRUCT_OBJECT: + case OP::OP_CONSTRUCT_OBJECT__WRITE: + case OP::OP_VALUE: + case OP::OP_STRING__WRITE: + case OP::OP_VALUE__GET_CLASS: +#ifdef OPTIMIZE_BYTECODE_GET_OBJECT_ELEMENT + case OP::OP_GET_OBJECT_ELEMENT: + case OP::OP_GET_OBJECT_ELEMENT__WRITE: +#endif +#ifdef OPTIMIZE_BYTECODE_GET_OBJECT_VAR_ELEMENT + case OP::OP_GET_OBJECT_VAR_ELEMENT: + case OP::OP_GET_OBJECT_VAR_ELEMENT__WRITE: +#endif +#ifdef OPTIMIZE_BYTECODE_GET_ELEMENT + case OP::OP_VALUE__GET_ELEMENT: + case OP::OP_VALUE__GET_ELEMENT__WRITE: + case OP::OP_VALUE__GET_ELEMENT_OR_OPERATOR: + case OP::OP_WITH_ROOT__VALUE__GET_ELEMENT: +#endif +#ifdef OPTIMIZE_BYTECODE_GET_SELF_ELEMENT + case OP::OP_WITH_SELF__VALUE__GET_ELEMENT: + case OP::OP_WITH_SELF__VALUE__GET_ELEMENT__WRITE: +#endif +#ifdef OPTIMIZE_BYTECODE_CONSTRUCT + case OP::OP_WITH_ROOT__VALUE__CONSTRUCT_EXPR: + case OP::OP_WITH_ROOT__VALUE__CONSTRUCT_VALUE: + case OP::OP_WITH_WRITE__VALUE__CONSTRUCT_EXPR: + case OP::OP_WITH_WRITE__VALUE__CONSTRUCT_VALUE: + case OP::OP_WITH_SELF__VALUE__CONSTRUCT_EXPR: + case OP::OP_WITH_SELF__VALUE__CONSTRUCT_VALUE: +#endif + { + origin=i.next().origin; + break; + } + } + if(origin.file_no) + return get_used_filename(origin.file_no); + } + } + return 0; +} + +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); @@ -956,9 +1040,7 @@ Request::Exception_details Request::get_ // $.source if(problem_source) { - String& source=*new String; - source.append(*problem_source, String::L_TAINTED, true/*forced*/); - + String& source=*new String(*problem_source, String::L_TAINTED); hash.put(exception_source_part_name, new VString(source)); }