--- parser3/src/main/pa_request.C 2002/09/18 12:40:38 1.230 +++ parser3/src/main/pa_request.C 2003/01/31 12:34:37 1.245.2.5 @@ -1,11 +1,11 @@ /** @file Parser: request class main part. @see compile.C and execute.C. - Copyright (c) 2001, 2002 ArtLebedev Group (http://www.artlebedev.com) + Copyright (c) 2001-2003 ArtLebedev Group (http://www.artlebedev.com) Author: Alexandr Petrosian (http://paf.design.ru) */ -static const char* IDENT_REQUEST_C="$Date: 2002/09/18 12:40:38 $"; +static const char* IDENT_REQUEST_C="$Date: 2003/01/31 12:34:37 $"; #include "pa_sapi.h" #include "pa_common.h" @@ -21,103 +21,114 @@ static const char* IDENT_REQUEST_C="$Dat #include "pa_dictionary.h" #include "pa_charset.h" #include "pa_charsets.h" +#include "pa_cache_managers.h" -const char *POST_PROCESS_METHOD_NAME="postprocess"; -const char *UNHANDLED_EXCEPTION_METHOD_NAME="unhandled_exception"; +// defines + +#define MAIN_METHOD_NAME "main" + +// consts + +const char* POST_PROCESS_METHOD_NAME="postprocess"; +const char* 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"; +const char* UNHANDLED_EXCEPTION_CONTENT_TYPE="text/plain"; /// content type of response when no $MAIN:defaults.content-type defined -const char *DEFAULT_CONTENT_TYPE="text/html"; -const char *ORIGINS_CONTENT_TYPE="text/plain"; +const char* DEFAULT_CONTENT_TYPE="text/html"; +const char* ORIGINS_CONTENT_TYPE="text/plain"; + +// globals + +StringPtr main_method_name(new String(MAIN_METHOD_NAME)); -Methoded *MOP_create(Pool&); +// op.C +VStateless_classPtr VClassMAIN_create(); // op.C VHash& exception2vhash(Pool& pool, const Exception& e); +void lock_system_class(HashStringValue::key_type key, HashStringValue::value_type value) { + if(VStateless_class *value_class=value->get_class()) + value_class->lock(); +} + // -Request::Request(Pool& apool, - Info& ainfo, - uchar adefault_lang, - bool status_allowed) : Pooled(apool), - main_method_name(apool, MAIN_METHOD_NAME), - stack(apool), - OP(*MOP_create(apool)), - env(apool), - status(apool), - form(apool), - mail(apool), - math(apool), - request(apool, *this), - response(apool), - cookie(apool), - fclasses(apool), +Request::Request(SAPI_Info& asapi_info, Request_info& arequest_info, + uchar adefault_lang, bool status_allowed): + sapi_info(asapi_info), + request_info(arequest_info), fdefault_lang(adefault_lang), flang(adefault_lang), - info(ainfo), - post_data(0), post_size(0), - used_files(apool), - configure_admin_done(false), - default_content_type(0), - mime_types(0), - main_class(0), - fconnection(0), - classes_conf(apool), - anti_endless_execute_recoursion(0), - exception_trace(apool) -#ifdef RESOURCES_DEBUG - , sql_connect_time(0),sql_request_time(0) -#endif - , self(0), method_frame(0), rcontext(0), wcontext(0) -{ - // default charsets - pool().set_source_charset(*utf8_charset); - pool().set_client_charset(*utf8_charset); + main_class(VClassMAIN_create()), + charsets(pool(), *UTF8_charset, *UTF8_charset, *UTF8_charset) // default charsets +{ // maybe expire old caches - cache_managers->maybe_expire(); + cache_managers.maybe_expire(); /// directly used - // operators - OP.register_directly_used(*this); + // MAIN class, operators + classes().put(main_class->name(), main_class); // classes: // table, file, random, mail, image, ... - methoded_array->register_directly_used(*this); + methoded_array.register_directly_used(*this); /// methodless // env class - classes().put(*NEW String(pool(), ENV_CLASS_NAME), &env); + classes().put(StringPtr(new String(ENV_CLASS_NAME)), + ValuePtr(new VEnv(asapi_info))); // status class if(status_allowed) - classes().put(*NEW String(pool(), STATUS_CLASS_NAME), &status); + classes().put(StringPtr(new String(STATUS_CLASS_NAME)), + ValuePtr(new VStatus)); // request class - classes().put(*NEW String(pool(), REQUEST_CLASS_NAME), &request); + classes().put(StringPtr(new String(REQUEST_CLASS_NAME)), + ValuePtr(new VRequest(arequest_info, charsets))); // cookie class - classes().put(*NEW String(pool(), COOKIE_CLASS_NAME), &cookie); + classes().put(StringPtr(new String(COOKIE_CLASS_NAME)), + ValuePtr(new VCookie)); /// methoded // response class - classes().put(response.get_class()->name(), &response); + { + ValuePtr response(new VResponse(arequest_info, charsets)); + classes().put(response->get_class()->name(), response); + } /// bases used // form class - classes().put(form.get_class()->base_class()->name(), &form); + { + ValuePtr form(new VForm); + classes().put(form->get_class()->base_class()->name(), form); + } // mail class - classes().put(mail.get_class()->base_class()->name(), &mail); + { + ValuePtr mail(new VMail); + classes().put(mail->get_class()->base_class()->name(), mail); + } // math class - classes().put(math.get_class()->base_class()->name(), &math); + { + ValuePtr math(new VMail); + classes().put(math->get_class()->base_class()->name(), math); + } + + // prevent system classes from modification [calling add_method] + // ^process[$string:CLASS]{@method} prohibited from now on... + classes().foreach(lock_system_class); } Request::~Request() { #ifdef XML // if for some strange reason xml generic errors failed to be reported, free them up - if(const char *xml_generic_errors=xmlGenericErrors()) { + if(const char* xml_generic_errors=xmlGenericErrors()) { SAPI::log(pool(), "warning: unreported xmlGenericErrors: %s", xml_generic_errors); free((void *)xml_generic_errors); } #endif } +Value *Request::get_self() { return method_frame?&method_frame->self():0; } + static void load_charset(const Hash::Key& akey, Hash::Val *avalue, void *) { charsets->load_charset(akey, static_cast(avalue)->as_string()); } @@ -136,18 +147,18 @@ void Request::configure_admin(VStateless ... ] */ - if(Value *vcharsets=conf_class.get_element(*charsets_name, &conf_class, false)) { - if(Hash *charsets=vcharsets->get_hash(0)) - charsets->for_each(load_charset); - else if(!vcharsets->get_string()) - throw Exception("parser.runtime", - 0, - "$" MAIN_CLASS_NAME ":" CHARSETS_NAME " must be hash"); + if(Value *vcharsets=conf_class.get_element(*charsets_name, conf_class, false)) { + if(!vcharsets->is_string()) + if(Hash *charsets=vcharsets->get_hash(0)) + charsets->for_each(load_charset); + else + throw Exception("parser.runtime", + 0, + "$" MAIN_CLASS_NAME ":" CHARSETS_NAME " must be hash"); } // configure method_frame options // until someone with less privileges have overriden them - OP.configure_admin(*this); methoded_array->configure_admin(*this); } @@ -163,7 +174,7 @@ void Request::configure_admin(VStateless */ void Request::core( - const char *config_filespec, bool config_fail_on_read_problem, + const char* config_filespec, bool config_fail_on_read_problem, bool header_only) { #ifdef RESOURCES_DEBUG @@ -179,18 +190,16 @@ gettimeofday(&mt[0],NULL); if(config_filespec) { String& filespec=*NEW String(pool()); filespec.APPEND_CLEAN(config_filespec, 0, "config", 0); - main_class=use_file( - filespec, - true/* ignore class_path */, - config_fail_on_read_problem, true/* file must exist if 'fail on read problem' not set */, - main_class_name, main_class); + 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 */); } // loading auto.p files from document_root/.. // to the one beside requested file. // all assigned bases from upper dir { - const char *after=info.path_translated; + const char* after=info.path_translated; size_t drlen=strlen(info.document_root); if(memcmp(after, info.document_root, drlen)==0) { after+=drlen; @@ -199,7 +208,7 @@ gettimeofday(&mt[0],NULL); } int step=0; - while(const char *before=strchr(after, '/')) { + while(const char* before=strchr(after, '/')) { String& sfile_spec=*NEW String(pool()); if(after!=info.path_translated) { sfile_spec.APPEND_CLEAN( @@ -207,10 +216,9 @@ gettimeofday(&mt[0],NULL); "path-translated-scanned", step++); sfile_spec << "/" AUTO_FILE_NAME; - main_class=use_file(sfile_spec, - true/* ignore class_path */, - true/* fail on read problem */, false/* but ignore absence, sole user */, - main_class_name, main_class); + use_file(main_class, + sfile_spec, true/* ignore class_path */, + true/* fail on read problem */, false/* but ignore absence, sole user */); } after=before+1; } @@ -219,21 +227,19 @@ gettimeofday(&mt[0],NULL); // compile requested file String& spath_translated=*NEW String(pool()); spath_translated.APPEND_TAINTED(info.path_translated, 0, "user-request", 0); - main_class=use_file(spath_translated, - true/* ignore class_path */, - true/* fail on read problem*/, true/* fail on abscence */, - main_class_name, main_class); + 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, 0); + configure_admin(main_class, 0); // configure not-method_frame=user options - OP.configure_user(*this); 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, main_class, false)) if(Table *table=element->get_table()) mime_types=table; @@ -251,7 +257,7 @@ gettimeofday(&mt[0],NULL); gettimeofday(&mt[1],NULL); #endif // execute @main[] - const String *body_string=execute_virtual_method(*main_class, main_method_name); + const String *body_string=execute_virtual_method(main_class, main_method_name); if(!body_string) throw Exception("parser.runtime", 0, @@ -265,16 +271,16 @@ gettimeofday(&mt[2],NULL); VString body_vstring_before_post_process(*body_string); VString *body_vstring_after_post_process=&body_vstring_before_post_process; // @postprocess - if(Value *value=main_class->get_element( - *NEW String(pool(), POST_PROCESS_METHOD_NAME), + if(Value *value=main_class.get_element( + StringPtr(new String(POST_PROCESS_METHOD_NAME), main_class, false)) if(Junction *junction=value->get_junction()) if(const Method *method=junction->method) { // preparing to pass parameters to // @postprocess[data] - VMethodFrame frame(pool(), method->name, *junction); - frame.set_self(*main_class); + VMethodFrame frame(pool(), method->name, *junction, 0/*no parent*/); + frame.set_self(main_class); frame.store_param(&body_vstring_before_post_process); body_vstring_after_post_process= @@ -288,12 +294,17 @@ gettimeofday(&mt[2],NULL); // extract response body Value *body_value=static_cast( - response.fields().get(*body_name)); + response.fields().get(*download_name)); + bool as_attachment=body_value!=0; + if(!body_value) + body_value=static_cast( + response.fields().get(*body_name)); + if(body_value) // there is some $response:body body_file=body_value->as_vfile(); else if(lorigins_mode) response.fields().put(*content_type_name, - NEW VString(*NEW String(pool(), ORIGINS_CONTENT_TYPE))); + NEW VString(StringPtr(new String(ORIGINS_CONTENT_TYPE))); #ifdef RESOURCES_DEBUG //measure:after postprocess @@ -301,7 +312,7 @@ gettimeofday(&mt[3],NULL); #endif // OK. write out the result - output_result(*body_file, header_only); + output_result(*body_file, header_only, as_attachment); #ifdef RESOURCES_DEBUG //measure:after output_result @@ -358,51 +369,51 @@ t[9]-t[3] // this is what we'd return in $response:body const String *body_string=0; - if(main_class) { // we've managed to end up with some 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(pool(), 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(pool(), method->name, *junction); - frame.set_self(*main_class); - - // $exception - frame.store_param(&exception2vhash(pool(), e)); - // $stack[^table::set{name origin}] - Array& stack_trace_columns=*NEW Array(pool()); - stack_trace_columns+=NEW String(pool(), "name"); - stack_trace_columns+=NEW String(pool(), "file"); - stack_trace_columns+=NEW String(pool(), "lineno"); - Table& stack_trace=*NEW Table(pool(), 0, &stack_trace_columns); - Array_iter tracei(exception_trace); - while(tracei.has_next()) { - Array& row=*NEW Array(pool()); + // maybe we'd be lucky enough as to report an error + // in a gracefull way... + if(Value *value=main_class.get_element( + StringPtr(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(pool(), method->name, *junction, 0/*no caller*/); + frame.set_self(main_class); + + // $exception + frame.store_param(&exception2vhash(pool(), e)); + // $stack[^table::set{name origin}] + Array& stack_trace_columns=*NEW Array(pool()); + stack_trace_columns+=NEW String(pool(), "name"); + stack_trace_columns+=NEW String(pool(), "file"); + stack_trace_columns+=NEW String(pool(), "lineno"); + Table& stack_trace=*NEW Table(pool(), 0, &stack_trace_columns); + Array_iter tracei(exception_trace); + while(tracei.has_next()) { + Array& row=*NEW Array(pool()); - const String *name=(const String *)tracei.next(); - row+=name; // name column + const String *name=(const String *)tracei.next(); + row+=name; // name column #ifndef NO_STRING_ORIGIN - const Origin& origin=name->origin(); - if(origin.file) { - row+=NEW String(pool(), origin.file, 0, true); // file column - char *buf=(char *)malloc(MAX_NUMBER); - size_t buf_size=snprintf(buf, MAX_NUMBER, "%d", 1+origin.line); - row+=NEW String(pool(), buf, buf_size, true); // line column - } -#endif - stack_trace+=&row; + const Origin& origin=name->origin(); + if(origin.file) { + row+=NEW String(pool(), origin.file, 0, true); // file column + char *buf=(char *)malloc(MAX_NUMBER); + size_t buf_size=snprintf(buf, MAX_NUMBER, "%d", 1+origin.line); + row+=NEW String(pool(), buf, buf_size, true); // line column } - frame.store_param(NEW VTable(pool(), &stack_trace)); - - // future $response:body= - // execute ^exception[origin;source;comment;type;code;stack] - body_string=&execute_method(frame, *method); +#endif + stack_trace+=&row; } + frame.store_param(NEW VTable(pool(), &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? @@ -423,14 +434,14 @@ t[9]-t[3] printed+=snprintf(buf+printed, MAX_STRING-printed, "'%s' ", problem_source->cstr()); } - if(const char *comment=e.comment(true)) + if(const char* comment=e.comment(true)) printed+=snprintf(buf+printed, MAX_STRING-printed, "%s", comment); - if(const char *type=e.type(true)) + 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(pool(), UNHANDLED_EXCEPTION_CONTENT_TYPE))); + NEW VString(StringPtr(new String(UNHANDLED_EXCEPTION_CONTENT_TYPE))); // future $response:body body_string=NEW String(pool(), buf); } @@ -439,22 +450,20 @@ t[9]-t[3] const VFile *body_file=body_vstring.as_vfile(); // ERROR. write it out - output_result(*body_file, header_only); + output_result(*body_file, header_only, false); } catch(const Exception& ) { /*re*/throw; } } } -VStateless_class *Request::use_file(const String& file_name, - bool ignore_class_path, - bool fail_on_read_problem, bool fail_on_file_absence, - const String *name, - VStateless_class *base_class) { +VStateless_classPtr Request::use_file(VStateless_class& aclass, + StringPtr file_name, bool ignore_class_path, + bool fail_on_read_problem, bool fail_on_file_absence) { // cyclic dependence check if(used_files.get(file_name)) - return base_class; - used_files.put(file_name, (Hash::Val *)true); + return 0; + used_files.put(file_name, true); const String *file_spec; if(ignore_class_path) // ignore_class_path? @@ -463,26 +472,25 @@ VStateless_class *Request::use_file(cons file_spec=&absolute(file_name); else { file_spec=0; - if(main_class) - 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? - } else if(Table *table=element->get_table()) { - int size=table->size(); - for(int i=size; i--; ) { - const String& path=*static_cast(table->get(i))->get_string(0); - if(file_spec=file_readable(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) - throw Exception("parser.runtime", - &file_name, - "not found along " MAIN_CLASS_NAME ":" CLASS_PATH_NAME); - } + 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? + } else if(Table *table=element->get_table()) { + int size=table->size(); + for(int i=size; i--; ) { + const String& path=*static_cast(table->get(i))->get_string(0); + if(file_spec=file_readable(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) + throw Exception("parser.runtime", + &file_name, + "not found along " MAIN_CLASS_NAME ":" CLASS_PATH_NAME); + } if(!file_spec) throw Exception("parser.runtime", &file_name, @@ -491,35 +499,35 @@ VStateless_class *Request::use_file(cons if(fail_on_read_problem && !fail_on_file_absence) // ignore file absence if asked for if(!entry_exists(*file_spec)) - return base_class; + return 0; char *source=file_read_text(pool(), *file_spec, fail_on_read_problem); if(!source) - return base_class; + return 0; - return use_buf(source, *file_spec, file_spec->cstr(), 0/*new class*/, name, base_class); + return use_buf(aclass, source, *file_spec, file_spec->cstr()); } -VStateless_class *Request::use_buf(const char *source, - const String& filespec, const char *filespec_cstr, - VStateless_class *aclass, const String *name, - VStateless_class *base_class) { - // compile loaded class - VStateless_class& cclass=COMPILE(source, aclass, name, base_class, filespec_cstr); +VStateless_classPtr Request::use_buf(VStateless_class& aclass, + const char* source, + const String& filespec, const char* filespec_cstr) { + // 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); - VString *vfilespec=NEW VString(filespec); + // compile loaded class + VStateless_class& cclass=COMPILE(aclass, source, filespec_cstr); // locate and execute possible @conf[] static + VString *vfilespec=NEW VString(filespec); const Method *method_called; execute_nonvirtual_method(cclass, *conf_method_name, vfilespec, 0/*no result needed*/, &method_called); - if(method_called) { - if(!main_class) - main_class=&cclass; // for method_frame auto.p, when main_class not assigned yet + if(method_called) configure_admin(cclass, &method_called->name); - } // locate and execute possible @auto[] static execute_nonvirtual_method(cclass, @@ -528,7 +536,7 @@ VStateless_class *Request::use_buf(const return &cclass; } -const String& Request::relative(const char *apath, const String& relative_name) { +const String& Request::relative(const char* apath, const String& relative_name) { int hpath_buf_size=strlen(apath)+1; char *hpath=(char *)malloc(hpath_buf_size); memcpy(hpath, apath, hpath_buf_size); @@ -541,17 +549,19 @@ const String& Request::relative(const ch const String& Request::absolute(const String& relative_name) { if(relative_name.first_char()=='/') { - String& result=*NEW String(pool(), info.document_root); + String& result=StringPtr(new String(info.document_root); result << relative_name; return result; } else - return relative(info.path_translated, relative_name); + return relative_name.pos("://")<0? relative(info.path_translated, relative_name) + :relative_name; // something like "http://xxx" } static void add_header_attribute(const Hash::Key& aattribute, Hash::Val *ameaning, void *info) { Request& r=*static_cast(info); if(aattribute==BODY_NAME + || aattribute==DOWNLOAD_NAME || aattribute==CHARSET_NAME) return; @@ -560,9 +570,10 @@ static void add_header_attribute(const H SAPI::add_header_attribute(pool, aattribute.cstr(), - attributed_meaning_to_string(lmeaning, String::UL_HTTP_HEADER).cstr()); + attributed_meaning_to_string(lmeaning, String::UL_HTTP_HEADER, false) + .cstr(String::UL_UNSPECIFIED)); } -void Request::output_result(const VFile& body_file, bool header_only) { +void Request::output_result(const VFile& body_file, bool header_only, bool as_attachment) { // header: cookies cookie.output_result(); @@ -576,14 +587,17 @@ void Request::output_result(const VFile& // default content type response.fields().put_dont_replace(*content_type_name, default_content_type?default_content_type - :NEW VString(*NEW String(pool(), DEFAULT_CONTENT_TYPE))); + :NEW VString(StringPtr(new String(DEFAULT_CONTENT_TYPE))); } // content-disposition if(VString *vfile_name=static_cast(body_file.fields().get(*name_name))) if(vfile_name->string()!=NONAME_DAT) { VHash& vhash=*NEW VHash(pool()); - vhash.hash(0).put(*content_disposition_filename_name, vfile_name); + Hash& hash=vhash.hash(0); + if(as_attachment) + hash.put(*value_name, NEW VString(*content_disposition_value)); + hash.put(*content_disposition_filename_name, vfile_name); response.fields().put(*content_disposition_name, &vhash); } @@ -619,9 +633,9 @@ void Request::output_result(const VFile& SAPI::send_body(pool(), client_body, client_content_length); } -const String& Request::mime_type_of(const char *user_file_name_cstr) { +const String& Request::mime_type_of(const char* user_file_name_cstr) { if(mime_types) - if(const char *cext=strrchr(user_file_name_cstr, '.')) { + if(const char* cext=strrchr(user_file_name_cstr, '.')) { String sext(pool(), ++cext); if(mime_types->locate(0, sext.change_case(pool(), String::CC_LOWER))) if(const String *result=mime_types->item(1)) @@ -631,5 +645,9 @@ const String& Request::mime_type_of(cons mime_types->origin_string(), MIME_TYPES_NAME " table column elements must not be empty"); } - return *NEW String(pool(), "application/octet-stream"); + return StringPtr(new String("application/octet-stream"); +} + +bool Request::origins_mode() { + return main_class.get_element(*origins_mode_name, main_class, false)!=0; // $ORIGINS mode }