--- parser3/src/main/pa_request.C 2009/04/29 03:26:50 1.300 +++ parser3/src/main/pa_request.C 2009/08/30 06:05:56 1.312 @@ -5,7 +5,7 @@ Author: Alexandr Petrosian (http://paf.design.ru) */ -static const char * const IDENT_REQUEST_C="$Date: 2009/04/29 03:26:50 $"; +static const char * const IDENT_REQUEST_C="$Date: 2009/08/30 06:05:56 $"; #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; } @@ -388,16 +408,9 @@ gettimeofday(&mt[2],NULL); body_value=response.fields().get(body_name); // $response:body if(!body_value) body_value=new VString(*body_string); // just result of ^main[] - // ensure that body_value has no just L_TAINTED parts left - if(body_value->is_string()) - { - String& untainted=*new String(); - untainted.append(*body_value->get_string(), flang); - body_value=new VString(untainted); - } // @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 @@ -409,8 +422,7 @@ gettimeofday(&mt[2],NULL); body_value=&execute_method(frame, *method).as_value(); } - VFile* body_file=body_value->as_vfile( - String::L_UNSPECIFIED, &charsets); + VFile* body_file=body_value->as_vfile(flang, &charsets); #ifdef RESOURCES_DEBUG //measure:after postprocess @@ -456,10 +468,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 @@ -504,14 +513,15 @@ t[9]-t[3] // doing that ugly // future $response:content-type - response.fields().put(content_type_name, + response.fields().remove(content_type_name); + response.fields().put(http_content_type, new VString(*new String(UNHANDLED_EXCEPTION_CONTENT_TYPE))); // future $response:body body_string=new String(exception_cstr); } VString body_vstring(*body_string); - VFile* body_file=body_vstring.as_vfile(String::L_UNSPECIFIED, &charsets); + VFile* body_file=body_vstring.as_vfile(flang, &charsets); // conditionally log it Value* vhandled=details.vhash.hash().get(exception_handled_part_name); @@ -558,7 +568,7 @@ void Request::use_file(VStateless_class& file_spec=&absolute(file_name); else { file_spec=0; - if(Value* element=main_class.get_element(class_path_name, main_class, false)) { + 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? } else if(Table *table=element->get_table()) { @@ -669,14 +679,15 @@ static void add_header_attribute( || name==CHARSET_NAME) return; - const char* aname=String(name, String::L_URI).cstr(String::L_UNSPECIFIED, 0, &info->r.charsets); + const char* aname=String(name, String::L_URI).transcode_and_untaint_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).cstr(String::L_UNSPECIFIED, 0, &info->r.charsets)); + aname, + attributed_meaning_to_string(*value, String::L_URI, false).transcode_and_untaint_cstr(String::L_URI, &info->r.charsets) + ); if(strcasecmp(aname, "last-modified")==0) - info->add_last_modified = false; + info->add_last_modified=false; } static void output_sole_piece(Request& r, @@ -690,10 +701,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); @@ -754,7 +763,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){ @@ -768,21 +777,20 @@ 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); }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){ const String &s = attributed_meaning_to_string(date, String::L_AS_IS, true); @@ -846,22 +854,22 @@ void Request::output_result(VFile* body_ 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 - 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))); - } + // 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); // prepare header: $response:fields without :body Add_header_attribute_info info(*this); @@ -881,7 +889,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"); @@ -963,9 +971,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)); } @@ -981,7 +987,7 @@ Request::Exception_details Request::get_ // $.comment if(const char* comment=e.comment(true)) hash.put(exception_comment_part_name, - new VString(*new String(comment, 0, true/*tainted*/))); + new VString(*new String(comment, String::L_TAINTED))); // $.handled(0) hash.put(exception_handled_part_name, &VBool::get(false));