--- parser3/src/main/pa_request.C 2003/03/24 17:52:19 1.245.2.37.2.13 +++ parser3/src/main/pa_request.C 2008/02/15 11:49:44 1.291 @@ -1,11 +1,11 @@ /** @file Parser: request class main part. @see compile.C and execute.C. - Copyright (c) 2001-2003 ArtLebedev Group (http://www.artlebedev.com) + Copyright (c) 2001-2005 ArtLebedev Group (http://www.artlebedev.com) Author: Alexandr Petrosian (http://paf.design.ru) */ -static const char* IDENT_REQUEST_C="$Date: 2003/03/24 17:52:19 $"; +static const char * const IDENT_REQUEST_C="$Date: 2008/02/15 11:49:44 $"; #include "pa_sapi.h" #include "pa_common.h" @@ -30,10 +30,13 @@ static const char* IDENT_REQUEST_C="$Dat #include "pa_vform.h" #include "pa_vcookie.h" #include "pa_vresponse.h" +#include "pa_vmemory.h" +#include "pa_vconsole.h" +#include "pa_vdate.h" // consts -const char* UNHANDLED_EXCEPTION_METHOD_NAME="unhandled_exception"; +#define UNHANDLED_EXCEPTION_METHOD_NAME "unhandled_exception" /// content type of exception response, when no @MAIN:exception handler defined const char* UNHANDLED_EXCEPTION_CONTENT_TYPE="text/plain"; @@ -47,15 +50,24 @@ const char* ORIGINS_CONTENT_TYPE="text/p #define MAIN_METHOD_NAME "main" #define AUTO_METHOD_NAME "auto" #define BODY_NAME "body" +#define EXCEPTION_TYPE_PART_NAME "type" +#define EXCEPTION_SOURCE_PART_NAME "source" +#define EXCEPTION_COMMENT_PART_NAME "comment" // globals 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_value(CONTENT_DISPOSITION_VALUE); +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 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); +const String exception_handled_part_name(EXCEPTION_HANDLED_PART_NAME); // defines for statics @@ -66,6 +78,7 @@ const String body_name(BODY_NAME); #define POST_PROCESS_METHOD_NAME "postprocess" #define DOWNLOAD_NAME "download" #define CLASS_PATH_NAME "CLASS_PATH" +#define RESPONSE_BODY_FILE_NAME "file" // statics @@ -77,17 +90,16 @@ static const String conf_method_name(CON 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); // defines // op.C VStateless_class& VClassMAIN_create(); -// op.C -VHash& exception2vhash(const Exception& e); // Request::Request(SAPI_Info& asapi_info, Request_info& arequest_info, - String::Language adefault_lang, bool status_allowed): + String::Language adefault_lang, bool status_allowed): // private anti_endless_execute_recoursion(0), @@ -96,8 +108,8 @@ Request::Request(SAPI_Info& asapi_info, rcontext(0), wcontext(0), flang(adefault_lang), - fconnection(), - finterrupted(false), + fconnection(0), + finterrupted(false),fskip(SKIP_NOTHING), // public #ifdef RESOURCES_DEBUG @@ -106,15 +118,16 @@ Request::Request(SAPI_Info& asapi_info, #endif // public - sapi_info(asapi_info), request_info(arequest_info), + sapi_info(asapi_info), charsets(UTF8_charset, UTF8_charset, UTF8_charset), // default charsets main_class(VClassMAIN_create()), - form(*new VForm), + form(*new VForm(charsets, arequest_info)), mail(*new VMail), response(*new VResponse(arequest_info, charsets)), cookie(*new VCookie), + console(*new VConsole), // private configure_admin_done(false), @@ -124,8 +137,14 @@ Request::Request(SAPI_Info& asapi_info, // private mime types mime_types(0) { + pa_register_thread_request(*this); + + // file_no=0 => unknown + file_list+=String::Body("UNKNOWN"); + file_list+=String::Body("-body of process-"); // pseudo_file_no__process + // maybe expire old caches - cache_managers.maybe_expire(); + cache_managers->maybe_expire(); /// directly used // MAIN class, operators @@ -136,15 +155,16 @@ Request::Request(SAPI_Info& asapi_info, /// methodless // env class - classes().put(StringBody(ENV_CLASS_NAME), new VEnv(asapi_info)); + classes().put(String::Body(ENV_CLASS_NAME), new VEnv(asapi_info)); // status class if(status_allowed) - classes().put(StringBody(STATUS_CLASS_NAME), new VStatus()); + classes().put(String::Body(STATUS_CLASS_NAME), new VStatus()); // request class - classes().put(StringBody(REQUEST_CLASS_NAME), new VRequest(arequest_info, charsets)); + classes().put(String::Body(REQUEST_CLASS_NAME), new VRequest(arequest_info, charsets)); // cookie class - classes().put(StringBody(COOKIE_CLASS_NAME), &cookie); - + classes().put(String::Body(COOKIE_CLASS_NAME), &cookie); + // console class + classes().put(String::Body(CONSOLE_CLASS_NAME), &console); /// methoded // response class classes().put(response.get_class()->name(), &response); @@ -159,6 +179,11 @@ Request::Request(SAPI_Info& asapi_info, Value& math=*new VMath; classes().put(math.get_class()->base_class()->name(), &math); } + // memory class + { + Value& memory=*new VMemory; + classes().put(memory.get_class()->base_class()->name(), &memory); + } } Request::~Request() { @@ -173,12 +198,15 @@ Request::~Request() { Value& Request::get_self() { return method_frame/*always have!*/->self(); } -static void load_charset(HashStringValue::key_type akey, HashStringValue::value_type avalue, int) { - ::charsets.load_charset(*new String(akey, String::L_CLEAN), avalue->as_string()); +static void load_charset(HashStringValue::key_type akey, + HashStringValue::value_type avalue, + Request_charsets* charsets) { + const String::Body NAME=String(akey, String::L_CLEAN).change_case(charsets->source(), String::CC_UPPER); + ::charsets.load_charset(*charsets, NAME, avalue->as_string()); } void Request::configure_admin(VStateless_class& conf_class) { if(configure_admin_done) - throw Exception("parser.runtime", + throw Exception(PARSER_RUNTIME, 0, "parser already configured"); configure_admin_done=true; @@ -194,9 +222,9 @@ void Request::configure_admin(VStateless if(Value* vcharsets=conf_class.get_element(charsets_name, conf_class, false)) { if(!vcharsets->is_string()) if(HashStringValue* charsets=vcharsets->get_hash()) - charsets->for_each(load_charset, 0); + charsets->for_each(load_charset, &this->charsets); else - throw Exception("parser.runtime", + throw Exception(PARSER_RUNTIME, 0, "$" MAIN_CLASS_NAME ":" CHARSETS_NAME " must be hash"); } @@ -206,6 +234,59 @@ void Request::configure_admin(VStateless methoded_array().configure_admin(*this); } +const char* Request::get_exception_cstr( + const Exception& e, + Request::Exception_details& details) { +#define PA_URI_FORMAT "%s: " +#define PA_ORIGIN_FILE_POS_FORMAT "%s(%d:%d): " +#define PA_SOURCE_FORMAT "'%s' " +#define PA_COMMENT_TYPE_FORMAT "%s [%s]" + char* result=new(PointerFreeGC) char[MAX_STRING]; + + if(details.problem_source) { // do we know the guy? + if(details.trace) { // do whe know where he came from? + Operation::Origin origin=details.trace.origin(); + snprintf(result, MAX_STRING, + PA_URI_FORMAT + PA_ORIGIN_FILE_POS_FORMAT + PA_SOURCE_FORMAT PA_COMMENT_TYPE_FORMAT, + request_info.uri, + file_list[origin.file_no].cstr(), 1+origin.line, 1+origin.col, + details.problem_source->cstr(), + e.comment(), e.type() + ); + } else + snprintf(result, MAX_STRING, + PA_URI_FORMAT + PA_SOURCE_FORMAT PA_COMMENT_TYPE_FORMAT, + request_info.uri, + details.problem_source->cstr(), + e.comment(), e.type() + ); + } else + snprintf(result, MAX_STRING, + PA_URI_FORMAT + PA_COMMENT_TYPE_FORMAT, + request_info.uri, + e.comment(), e.type() + ); + + return result; +} + +void Request::configure() { + // configure admin options if not configured yet + if(!configure_admin_done) + configure_admin(main_class); + + // configure not-admin=user options + methoded_array().configure_user(*this); + + // $MAIN:MIME-TYPES + if(Value* element=main_class.get_element(mime_types_name, main_class, false)) + if(Table *table=element->get_table()) + mime_types=table; +} /** load MAIN class, execute @main. MAIN class consists of all the auto.p files we'd manage to find @@ -218,7 +299,6 @@ void Request::configure_admin(VStateless */ void Request::core(const char* config_filespec, bool config_fail_on_read_problem, bool header_only) { - #ifdef RESOURCES_DEBUG //measures struct timeval mt[10]; @@ -226,12 +306,20 @@ struct timeval mt[10]; gettimeofday(&mt[0],NULL); #endif try { + // filling cookies + cookie.fill_fields(request_info); + + // filling mail received + mail.fill_received(*this); + // loading config if(config_filespec) { const String& filespec=*new String(config_filespec); use_file(main_class, - filespec, true/* ignore class_path */, - config_fail_on_read_problem, true/* file must exist if 'fail on read problem' not set */); + filespec, 0 /*main_alias*/, + true /*ignore class_path*/, + config_fail_on_read_problem, + true /*file must exist if 'fail on read problem' not set*/); } // loading auto.p files from document_root/.. @@ -246,50 +334,39 @@ gettimeofday(&mt[0],NULL); --after; } - int step=0; while(const char* before=strchr(after, '/')) { String& sfile_spec=*new String; if(after!=request_info.path_translated) { - sfile_spec.append( + sfile_spec.append_strdup( request_info.path_translated, before-request_info.path_translated, String::L_CLEAN); sfile_spec << "/" AUTO_FILE_NAME; use_file(main_class, - sfile_spec, true/* ignore class_path */, - true/* fail on read problem */, false/* but ignore absence, sole user */); + sfile_spec, + 0 /*main_alias*/, + true /*ignore class_path*/, + true /*fail on read problem*/, + false /*but ignore absence, sole user*/); } after=before+1; } } - // compile requested file - String& spath_translated=*new String; - spath_translated.append(request_info.path_translated, 0, String::L_TAINTED); - use_file(main_class, - spath_translated, true/* ignore class_path */, - true/* fail on read problem*/, true/* fail on abscence */); - - // configure method_frame options if not configured yet - if(!configure_admin_done) - configure_admin(main_class); - - // configure not-method_frame=user options - methoded_array().configure_user(*this); - - // $MAIN:MIME-TYPES - if(Value* element=main_class.get_element(mime_types_name, main_class, false)) - if(Table *table=element->get_table()) - mime_types=table; - - // filling form fields - form.fill_fields_and_tables(charsets, request_info); - - // filling cookies - cookie.fill_fields(request_info); - - // filling mail received - mail.fill_received(*this); + try { + // 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*/); + + configure(); + } catch(...) { + configure(); // configure anyway, useful in @unhandled_exception [say, if they would want to mail by SMTP something] + rethrow; + } #ifdef RESOURCES_DEBUG //measure:after compile @@ -298,7 +375,7 @@ gettimeofday(&mt[1],NULL); // execute @main[] const String* body_string=execute_virtual_method(main_class, main_method_name); if(!body_string) - throw Exception("parser.runtime", + throw Exception(PARSER_RUNTIME, 0, "'"MAIN_METHOD_NAME"' method not found"); @@ -307,8 +384,21 @@ gettimeofday(&mt[1],NULL); gettimeofday(&mt[2],NULL); #endif - VString& body_vstring_before_post_process=*new VString(*body_string); - VString* body_vstring_after_post_process=&body_vstring_before_post_process; + // extract response body + Value* body_value=response.fields().get(download_name); // $response:download? + bool as_attachment=body_value!=0; + if(!body_value) + 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(Junction* junction=value->get_junction()) @@ -318,22 +408,12 @@ gettimeofday(&mt[2],NULL); VMethodFrame frame(/*method->name, */ *junction, 0/*no parent*/); frame.set_self(main_class); - frame.store_param(body_vstring_before_post_process); - body_vstring_after_post_process= - new VString(execute_method(frame, *method)); + frame.store_param(*body_value); + body_value=&execute_method(frame, *method).as_value(); } - VFile* body_file=body_vstring_after_post_process->as_vfile( - String::L_UNSPECIFIED); - - // extract response body - Value* body_value=response.fields().get(download_name); - bool as_attachment=body_value!=0; - if(!body_value) - body_value=response.fields().get(body_name); - - if(body_value) // there is some $response:body - body_file=body_value->as_vfile(); + VFile* body_file=body_value->as_vfile( + String::L_UNSPECIFIED, &charsets); #ifdef RESOURCES_DEBUG //measure:after postprocess @@ -362,125 +442,114 @@ t[9]-t[3] ); #endif } catch(const Exception& e) { // request handling problem - // we're returning not result, but error explanation try { - // log the beast - if(const String* problem_source=e.problem_source()) - SAPI::log(sapi_info, - "%s: " - "'%s' %s [%s]", - request_info.uri, - problem_source->cstr(), - e.comment(), - e.type() - ); - else - SAPI::log(sapi_info, - "%s: " - "%s [%s]", - request_info.uri, - e.comment(), e.type() - ); + // we're returning not result, but error explanation - // reset language to default - flang=fdefault_lang; - - // reset response - response.fields().clear(); + Request::Exception_details details=get_details(e); + const char* exception_cstr=get_exception_cstr(e, details); - // this is what we'd return in $response:body - const String* body_string=0; + // reset language to default + flang=fdefault_lang; + + // reset response + response.fields().clear(); + + // this is what we'd return in $response:body + const String* body_string=0; + + // 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(Junction* junction=value->get_junction()) { + 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); - // 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(Junction* junction=value->get_junction()) { - 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); - - // $exception - frame.store_param(exception2vhash(e)); - // $stack[^table::set{name origin}] - Table::columns_type stack_trace_columns(new ArrayString); - *stack_trace_columns+=new String("name"); - *stack_trace_columns+=new String("file"); - *stack_trace_columns+=new String("lineno"); - Table& stack_trace=*new Table(stack_trace_columns); - /*Array_iterator tracei(exception_trace); - while(tracei.has_next()) { + // $exception + frame.store_param(details.vhash); + // $stack[^table::create{name file lineno colno}] + Table::columns_type stack_trace_columns(new ArrayString); + *stack_trace_columns+=new String("name"); + *stack_trace_columns+=new String("file"); + *stack_trace_columns+=new String("lineno"); + *stack_trace_columns+=new String("colno"); + Table& stack_trace=*new Table(stack_trace_columns); + if(!exception_trace.is_empty()/*signed!*/) + for(size_t i=exception_trace.bottom_index(); iorigin(); - if(origin.file) { - *row+=StringBody(origin.file, 0, true)); // file column - *row+=StringBody( - pool().format_integer(1+origin.line), - 0, true)); // line column + *row+=trace.name(); // name column + Operation::Origin origin=trace.origin(); + if(origin.file_no) { + *row+=new String(file_list[origin.file_no], String::L_TAINTED); // 'file' column + *row+=new String(String::Body::Format(1+origin.line), String::L_CLEAN); // 'lineno' column + *row+=new String(String::Body::Format(1+origin.col), String::L_CLEAN); // 'colno' column } -#endif - *stack_trace+=row; - }*/ - frame.store_param(*new VTable(&stack_trace)); - - // future $response:body= - // execute ^unhandled_exception[exception;stack] - body_string=&execute_method(frame, *method); - } - } - } - - if(!body_string) { // couldn't report an error beautifully? - // doing that ugly + stack_trace+=row; + } + + frame.store_param(*new VTable(&stack_trace)); - // make up result: $origin $source $comment $type $code - char *buf=new(PointerFreeGC) char[MAX_STRING]; - size_t printed=0; - if(const String* problem_source=e.problem_source()) { - /*const String_fragment::Origin& origin=problem_source->origin(); - if(origin.file) - printed+=snprintf(buf+printed, MAX_STRING-printed, - ORIGIN_FILE_LINE_FORMAT": ", - origin.file, 1+origin.line - ); - printed+=snprintf(buf+printed, MAX_STRING-printed, "'%s' ", - problem_source->cstr().get()); - */ + // 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(); } - if(const char* comment=e.comment(true)) - printed+=snprintf(buf+printed, MAX_STRING-printed, "%s", comment); - if(const char* type=e.type(true)) - printed+=snprintf(buf+printed, MAX_STRING-printed, " type: %s", type); - - // future $response:content-type - response.fields().put(content_type_name, - new VString(*new String(UNHANDLED_EXCEPTION_CONTENT_TYPE))); - // future $response:body - body_string=new String(buf); } + } + + if(!body_string) { // couldn't report an error beautifully? + // doing that ugly + + // future $response:content-type + response.fields().put(content_type_name, + 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(); + VString body_vstring(*body_string); + VFile* body_file=body_vstring.as_vfile(String::L_UNSPECIFIED, &charsets); - // ERROR. write it out - output_result(body_file, header_only, false); - } catch(const Exception& ) { - rethrow; + // conditionally log it + Value* vhandled=details.vhash.hash().get(exception_handled_part_name); + if(!vhandled || !vhandled->as_bool()) { + SAPI::log(sapi_info, "%s", exception_cstr); + } + + // ERROR. write it out + output_result(body_file, header_only, false); + + } catch(const Exception& e) { // exception in unhandled exception + Request::Exception_details details=get_details(e); + const char* exception_cstr=get_exception_cstr(e, details); + // unconditionally log the beast + SAPI::log(sapi_info, "%s", exception_cstr); + + throw Exception(0, + 0, + "in %s", + exception_cstr); } } } +uint Request::register_file(String::Body file_spec) { + file_list+=file_spec; + return file_list.count()-1; +} + void Request::use_file(VStateless_class& aclass, - const String& file_name, bool ignore_class_path, - bool fail_on_read_problem, bool fail_on_file_absence) { + const String& file_name, const String* main_alias, + bool ignore_class_path, + bool fail_on_read_problem, + bool fail_on_file_absence) { // cyclic dependence check if(used_files.get(file_name)) return; @@ -489,31 +558,31 @@ void Request::use_file(VStateless_class& 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? + 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(element->is_string()) { - file_spec=file_readable(absolute(element->as_string()), file_name); // found at class_path? + file_spec=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--; ) { const String& path=*(*table->get(i))[0]; - if(file_spec=file_readable(absolute(path), file_name)) + if((file_spec=file_exist(absolute(path), file_name))) break; // found along class_path } } else - throw Exception("parser.runtime", + throw Exception(PARSER_RUNTIME, 0, "$" CLASS_PATH_NAME " must be string or table"); if(!file_spec) - throw Exception("parser.runtime", + throw Exception(PARSER_RUNTIME, &file_name, "not found along " MAIN_CLASS_NAME ":" CLASS_PATH_NAME); } if(!file_spec) - throw Exception("parser.runtime", + throw Exception(PARSER_RUNTIME, &file_name, "usage failed - no $" MAIN_CLASS_NAME ":" CLASS_PATH_NAME " were specified"); } @@ -522,24 +591,26 @@ void Request::use_file(VStateless_class& if(!entry_exists(*file_spec)) return; - if(const char* source=file_read_text(charsets.source(), *file_spec, fail_on_read_problem)) - use_buf(aclass, source, *file_spec, file_spec->cstr()); + if(const char* source=file_read_text(charsets, *file_spec, fail_on_read_problem)) + use_buf(aclass, source, main_alias, register_file(*file_spec)); } void Request::use_buf(VStateless_class& aclass, - const char* source, - const String& filespec, const char* filespec_cstr) { + 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 Temp_method temp_method_auto(aclass, auto_method_name, 0); // compile loaded class - VStateless_class& cclass=compile(&aclass, source, filespec_cstr); + VStateless_class& cclass=compile(&aclass, source, main_alias, file_no, line_no_offset); // locate and execute possible @conf[] static - VString* vfilespec=new VString(filespec); + VString* vfilespec= + new VString(*new String(file_list[file_no], String::L_TAINTED)); Execute_nonvirtual_method_result executed=execute_nonvirtual_method(cclass, conf_method_name, vfilespec, false/*no string result needed*/); @@ -567,32 +638,222 @@ const String& Request::absolute(const St result << relative_name; return result; } else - return relative_name.pos("://")==STRING_NOT_FOUND? - relative(request_info.path_translated, relative_name) - :relative_name; // something like "http://xxx" + if(relative_name.pos("://")!=STRING_NOT_FOUND // something like "http://xxx" +#ifdef WIN32 + || relative_name.pos(":")==1 // DRIVE: + || relative_name.starts_with("\\\\") // UNC1 + || relative_name.starts_with("//") // UNC2 +#endif + ) + return relative_name; + else + return relative(request_info.path_translated, relative_name); } +#ifndef DOXYGEN +class Add_header_attribute_info +{ +public: + Add_header_attribute_info(Request& ar) : r(ar), add_last_modified(true) {} + Request& r; + bool add_last_modified; +}; +#endif static void add_header_attribute( - HashStringValue::key_type aattribute, - HashStringValue::value_type ameaning, - Request *r) { - if(aattribute==BODY_NAME - || aattribute==DOWNLOAD_NAME - || aattribute==CHARSET_NAME) + HashStringValue::key_type name, + HashStringValue::value_type value, + Add_header_attribute_info* info) { + if(name==BODY_NAME + || name==DOWNLOAD_NAME + || name==CHARSET_NAME) return; + + const char* aname=String(name, String::L_URI).cstr(String::L_UNSPECIFIED, 0, &info->r.charsets); + + SAPI::add_header_attribute(info->r.sapi_info, + aname, + attributed_meaning_to_string(*value, String::L_URI, true).cstr(String::L_UNSPECIFIED, 0, &info->r.charsets)); - SAPI::add_header_attribute(r->sapi_info, - aattribute.cstr(), - attributed_meaning_to_string(*ameaning, String::L_HTTP_HEADER, false). - cstr(String::L_UNSPECIFIED)); + if(strcasecmp(aname, "last-modified")==0) + info->add_last_modified = false; } + +static void output_sole_piece(Request& r, + bool header_only, + VFile& body_file, + Value* body_file_content_type) { + // transcode text body when "text/*" or simple result + String::C output(body_file.value_ptr(), body_file.value_size()); + if(!body_file_content_type/*vstring.as_vfile*/ || body_file_content_type->as_string().pos("text/")==0) + output=Charset::transcode(output, + 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); + + // send header + SAPI::send_header(r.sapi_info); + + // send body + if(!header_only) + SAPI::send_body(r.sapi_info, output.str, output.length); +} + +#ifndef DOXYGEN +struct Range +{ + size_t start; + size_t end; +}; +#endif +static void parse_range(const String* s, Array &ar) +{ + const char *p = s->cstr(); + if(s->starts_with("bytes=")) + p += 6; + Range r; + while(*p){ + r.start = (size_t)-1; + r.end = (size_t)-1; + if(*p >= '0' && *p <= '9'){ + r.start = atol(p); + while(*p>='0' && *p<='9') ++p; + } + if(*p++ != '-') break; + if(*p >= '0' && *p <= '9'){ + r.end = atol(p); + while(*p>='0' && *p<='9') ++p; + } + if(*p == ',') ++p; + ar += r; + } +} + +static void output_pieces(Request& r, + bool header_only, + const String& filename, + size_t content_length, + Value& date, + bool add_last_modified) +{ + SAPI::add_header_attribute(r.sapi_info, "Accept-Ranges", "bytes"); + + const size_t BUFSIZE = 10*0x400; + char buf[BUFSIZE]; + const char *range = SAPI::get_env(r.sapi_info, "HTTP_RANGE"); + size_t offset=0; + size_t part_length=content_length; + if(range){ + Array ar; + parse_range(new String(range), ar); + size_t count = ar.count(); + 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"); + return; + } + if(rg.start == (size_t)-1 && rg.end != (size_t)-1){ + rg.start = content_length - rg.end; + rg.end = content_length; + offset += rg.start; + part_length = rg.end-rg.start; + }else if(rg.start != (size_t)-1 && rg.end == (size_t)-1){ + rg.end = content_length-1; + offset += rg.start; + part_length -= rg.start; + } + if(part_length == 0){ + SAPI::add_header_attribute(r.sapi_info, "status", "204 No Content"); + return; + } + SAPI::add_header_attribute(r.sapi_info, "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"); + return; + } + } + + + snprintf(buf, BUFSIZE, "%u", part_length); + SAPI::add_header_attribute(r.sapi_info, "Content-Length", buf); + + 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); + + size_t sent = 0; + if(!header_only){ + size_t to_read = 0; + size_t size = 0; + do{ + to_read = part_lengthfields().get(content_type_name); + + // 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(char *after_slash=rsplit(name_cstr, '\\')) + name_cstr=after_slash; + if(char *after_slash=rsplit(name_cstr, '/')) + name_cstr=after_slash; + vfile_name=new VString(*new String(name_cstr)); + } + } + if(vfile_name) { + const String& sfile_name=vfile_name->as_string(); + if(sfile_name!=NONAME_DAT) { + 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); + + 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->fields().get(content_type_name)) { + if(body_file_content_type) { // body file content type response.fields().put(content_type_name, body_file_content_type); } else { @@ -601,58 +862,53 @@ void Request::output_result(VFile* body_ new VString(*new String(DEFAULT_CONTENT_TYPE))); } - // content-disposition - if(Value* vfile_name=body_file->fields().get(name_name)) - if(*vfile_name->get_string()!=NONAME_DAT) { - VHash& hash=*new VHash(); - HashStringValue &h=hash.hash(); - if(as_attachment) - h.put(value_name, new VString(content_disposition_value)); - h.put(content_disposition_filename_name, vfile_name); - response.fields().put(content_disposition_name, &hash); - } - // prepare header: $response:fields without :body - response.fields().for_each(add_header_attribute, this); + Add_header_attribute_info info(*this); + response.fields().for_each(add_header_attribute, &info); - const void *client_body; - size_t client_content_length; - // transcode text body when "text/*" or simple result if(body_file_content_type) if(HashStringValue *hash=body_file_content_type->get_hash()) body_file_content_type=hash->get(value_name); - if(!body_file_content_type/*vstring.as_vfile*/ || body_file_content_type->as_string().pos("text/")==0) { - Charset::transcode( - charsets.source(), body_file->value_ptr(), body_file->value_size(), - charsets.client(), client_body, client_content_length - ); - } else { - client_body=body_file->value_ptr(); - client_content_length=body_file->value_size(); - } - // prepare header: content-length - char content_length_cstr[MAX_NUMBER]; - snprintf(content_length_cstr, MAX_NUMBER, "%u", client_content_length); - SAPI::add_header_attribute(sapi_info, "content-length", content_length_cstr); + if(Value* vresponse_body_file=body_file->fields().get(response_body_file_name)) { + const String& sresponse_body_file=vresponse_body_file->as_string(); + size_t content_length=0; + time_t atime=0, mtime=0, ctime=0; + file_stat(absolute(sresponse_body_file), + content_length, + atime, mtime, ctime); + + VDate* vdate=0; + if(Value* v=body_file->fields().get("mdate")) { + if(Value* vdatep=v->as(VDATE_TYPE, false)) + vdate=static_cast(vdatep); + else + throw Exception(PARSER_RUNTIME, 0, "mdate must be a date"); + } + if(!vdate) + vdate=new VDate(mtime); - // send header - SAPI::send_header(sapi_info); - - // send body - if(!header_only) - SAPI::send_body(sapi_info, client_body, client_content_length); + output_pieces(*this, header_only, + sresponse_body_file, + content_length, + *vdate, + info.add_last_modified); + } else { + output_sole_piece(*this, header_only, + *body_file, body_file_content_type); + } } 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); - if(mime_types->locate(0, sext.change_case(charsets.source(), String::CC_LOWER))) + 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; else - throw Exception("parser.runtime", + throw Exception(PARSER_RUNTIME, 0, MIME_TYPES_NAME " table column elements must not be empty"); } @@ -661,15 +917,73 @@ const String& Request::mime_type_of(cons } #ifdef XML -GdomeDOMString_auto_ptr Request::transcode(const String& s) { +xmlChar* Request::transcode(const String& s) { return charsets.source().transcode(s); } -const String& Request::transcode(GdomeDOMString* s) { +xmlChar* Request::transcode(const String::Body s) { return charsets.source().transcode(s); } -const String& Request::transcode(xmlChar* s) { +const String& Request::transcode(const xmlChar* s) { return charsets.source().transcode(s); } #endif + + +const Request::Trace Request::Exception_trace::extract_origin(const String*& problem_source) { + Trace result; + if(!is_empty()) { + result=bottom_value(); + if(!problem_source) { // we don't know who trigged the bug? + problem_source=result.name(); // consider the stack-top-guy (we usually know source of next-from-throw-point exception) did that + fbottom++; + } else if(result.name()==problem_source) // it is that same guy? + fbottom++; // throw away that trace + else { + // stack top contains not us, + // leaving result intact + // it would help ^throw + } + } + + return result; +} + +Request::Exception_details Request::get_details(const Exception& e) { + const String* problem_source=e.problem_source(); + Trace trace=exception_trace.extract_origin(problem_source); + + VHash& vhash=*new VHash; HashStringValue& hash=vhash.hash(); + + // $.type + if(const char* type=e.type(true)) + hash.put(exception_type_part_name, new VString(*new String(type))); + + // $.source + if(problem_source) { + String& source=*new String; + source.append(*problem_source, String::L_TAINTED, true/*forced*/); + + hash.put(exception_source_part_name, new VString(source)); + } + + // $.file lineno colno + if(trace) { + const Operation::Origin origin=trace.origin(); + hash.put(String::Body("file"), + new VString(*new String(file_list[origin.file_no], String::L_TAINTED))); + hash.put(String::Body("lineno"), new VInt(1+origin.line)); + hash.put(String::Body("colno"), new VInt(1+origin.col)); + } + + // $.comment + if(const char* comment=e.comment(true)) + hash.put(exception_comment_part_name, + new VString(*new String(comment, 0, true/*tainted*/))); + + // $.handled(0) + hash.put(exception_handled_part_name, new VBool(false)); + + return Request::Exception_details(trace, problem_source, vhash); +}