--- parser3/src/main/pa_request.C 2002/04/16 09:32:00 1.199 +++ parser3/src/main/pa_request.C 2002/10/14 12:16:06 1.232 @@ -3,10 +3,10 @@ Copyright (c) 2001, 2002 ArtLebedev Group (http://www.artlebedev.com) Author: Alexandr Petrosian (http://paf.design.ru) - - $Id: pa_request.C,v 1.199 2002/04/16 09:32:00 paf Exp $ */ +static const char* IDENT_REQUEST_C="$Date: 2002/10/14 12:16:06 $"; + #include "pa_sapi.h" #include "pa_common.h" #include "pa_request.h" @@ -19,8 +19,11 @@ #include "pa_vtable.h" #include "pa_vfile.h" #include "pa_dictionary.h" -#include "pa_charsets.h" #include "pa_charset.h" +#include "pa_charsets.h" + +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"; @@ -33,21 +36,18 @@ Methoded *MOP_create(Pool&); // op.C VHash& exception2vhash(Pool& pool, const Exception& e); -static void load_charset(const Hash::Key& akey, Hash::Val *avalue, - void *) { - charsets->load_charset(akey, static_cast(avalue)->as_string()); -} - // 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), @@ -57,6 +57,7 @@ Request::Request(Pool& apool, 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), @@ -67,7 +68,7 @@ Request::Request(Pool& apool, #ifdef RESOURCES_DEBUG , sql_connect_time(0),sql_request_time(0) #endif - , self(0), root(0), rcontext(0), wcontext(0) + , self(0), method_frame(0), rcontext(0), wcontext(0) { // default charsets pool().set_source_charset(*utf8_charset); @@ -100,9 +101,11 @@ Request::Request(Pool& apool, /// bases used // form class - classes().put(form.get_class()->base()->name(), &form); + classes().put(form.get_class()->base_class()->name(), &form); + // mail class + classes().put(mail.get_class()->base_class()->name(), &mail); // math class - classes().put(math.get_class()->base()->name(), &math); + classes().put(math.get_class()->base_class()->name(), &math); } Request::~Request() { @@ -115,6 +118,38 @@ Request::~Request() { #endif } +static void load_charset(const Hash::Key& akey, Hash::Val *avalue, void *) { + charsets->load_charset(akey, static_cast(avalue)->as_string()); +} +void Request::configure_admin(VStateless_class& conf_class, const String *source) { + if(configure_admin_done) + throw Exception("parser.runtime", + source, + "parser already configured"); + configure_admin_done=true; + + // charsets must only be specified in method_frame config + // so that users would not interfere + + /* $MAIN:CHARSETS[ + $.charsetname1[/full/path/to/charset/file.cfg] + ... + ] + */ + 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"); + } + + // configure method_frame options + // until someone with less privileges have overriden them + OP.configure_admin(*this); + methoded_array->configure_admin(*this); +} /** load MAIN class, execute @main. @@ -128,8 +163,7 @@ Request::~Request() { */ void Request::core( - const char *root_config_filespec, bool root_config_fail_on_read_problem, - const char *site_config_filespec, bool site_config_fail_on_read_problem, + const char *config_filespec, bool config_fail_on_read_problem, bool header_only) { #ifdef RESOURCES_DEBUG @@ -141,44 +175,14 @@ gettimeofday(&mt[0],NULL); try { char *auto_filespec=(char *)malloc(MAX_STRING); - // loading root config - if(root_config_filespec) { + // loading config + if(config_filespec) { String& filespec=*NEW String(pool()); - filespec.APPEND_CLEAN(root_config_filespec, 0, "root_config", 0); + filespec.APPEND_CLEAN(config_filespec, 0, "config", 0); main_class=use_file( filespec, - true/*ignore class_path*/, root_config_fail_on_read_problem, - main_class_name, main_class); - } - // charsets must only be specified in root config - // so that users would not interfere - if(main_class) { - /* $MAIN:CHARSETS[ - $.charsetname1[/full/path/to/charset/file.cfg] - ... - ] - */ - if(Value *vcharsets=main_class->get_element(*charsets_name)) { - if(Hash *charsets=vcharsets->get_hash(0)) - charsets->for_each(load_charset); - else - throw Exception("parser.runtime", - &vcharsets->name(), - "must be hash"); - } - } - // configure root options - // until someone with less privileges have overriden them - OP.configure_admin(*this); - methoded_array->configure_admin(*this); - - // loading site config - if(site_config_filespec) { - String& filespec=*NEW String(pool()); - filespec.APPEND_CLEAN(site_config_filespec, 0, "site_config", 0); - main_class=use_file( - filespec, - true/*ignore class_path*/, site_config_fail_on_read_problem, + 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); } @@ -204,7 +208,8 @@ gettimeofday(&mt[0],NULL); sfile_spec << "/" AUTO_FILE_NAME; main_class=use_file(sfile_spec, - true/*ignore class_path*/, false/*ignore read problem*/, + true/* ignore class_path */, + true/* fail on read problem */, false/* but ignore absence, sole user */, main_class_name, main_class); } after=before+1; @@ -215,15 +220,20 @@ gettimeofday(&mt[0],NULL); 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/*don't ignore read problem*/, + true/* ignore class_path */, + true/* fail on read problem*/, true/* fail on abscence */, main_class_name, main_class); - // configure not-root=user options + // configure method_frame options if not configured yet + if(!configure_admin_done) + 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)) + if(Value *element=main_class->get_element(*mime_types_name, main_class, false)) if(Table *table=element->get_table()) mime_types=table; @@ -233,12 +243,15 @@ gettimeofday(&mt[0],NULL); // filling cookies cookie.fill_fields(*this); + // filling mail received + mail.fill_received(*this); + #ifdef RESOURCES_DEBUG //measure:after compile 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, @@ -252,31 +265,33 @@ 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(*post_process_method_name)) + if(Value *value=main_class->get_element( + *NEW String(pool(), 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(), value->name(), *junction); + VMethodFrame frame(pool(), method->name, *junction); frame.set_self(*main_class); - frame.store_param(method->name, - &body_vstring_before_post_process); + frame.store_param(&body_vstring_before_post_process); body_vstring_after_post_process= NEW VString(execute_method(frame, *method)); } - bool origins_mode=main_class->get_element(*origins_mode_name)!=0; + bool lorigins_mode=origins_mode(); const VFile *body_file=body_vstring_after_post_process->as_vfile( - String::UL_UNSPECIFIED, origins_mode); + String::UL_UNSPECIFIED, lorigins_mode); // extract response body Value *body_value=static_cast( response.fields().get(*body_name)); - if(body_value) // there is some $response.body + if(body_value) // there is some $response:body body_file=body_value->as_vfile(); - else if(origins_mode) + else if(lorigins_mode) response.fields().put(*content_type_name, NEW VString(*NEW String(pool(), ORIGINS_CONTENT_TYPE))); @@ -310,8 +325,7 @@ t[9]-t[3] // we're returning not result, but error explanation try { // log the beast - const String *problem_source=e.problem_source(); - if(problem_source && problem_source->size()) + if(const String *problem_source=e.problem_source()) SAPI::log(pool(), "%s: " #ifndef NO_STRING_ORIGIN @@ -325,15 +339,14 @@ t[9]-t[3] #endif problem_source->cstr(), e.comment(), - e.type()?e.type():"-" + e.type() ); else SAPI::log(pool(), "%s: " "%s [%s]", info.uri, - e.comment(), - e.type()?e.type():"-" + e.comment(), e.type() ); // reset language to default @@ -348,16 +361,19 @@ t[9]-t[3] 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(*unhandled_exception_method_name)) + 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(), value->name(), *junction); + VMethodFrame frame(pool(), method->name, *junction); frame.set_self(*main_class); // $exception - frame.store_param(method->name, &exception2vhash(pool(), e)); + 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"); @@ -381,11 +397,10 @@ t[9]-t[3] #endif stack_trace+=&row; } - frame.store_param(method->name, - NEW VTable(pool(), &stack_trace)); + frame.store_param(NEW VTable(pool(), &stack_trace)); // future $response:body= - // execute ^exception[origin;source;comment;type;code;stack] + // execute ^unhandled_exception[exception;stack] body_string=&execute_method(frame, *method); } } @@ -396,8 +411,7 @@ t[9]-t[3] // make up result: $origin $source $comment $type $code char *buf=(char *)malloc(MAX_STRING); size_t printed=0; - const String *problem_source=e.problem_source(); - if(problem_source) { + if(const String *problem_source=e.problem_source()) { #ifndef NO_STRING_ORIGIN const Origin& origin=problem_source->origin(); if(origin.file) @@ -409,9 +423,9 @@ t[9]-t[3] printed+=snprintf(buf+printed, MAX_STRING-printed, "'%s' ", problem_source->cstr()); } - printed+=snprintf(buf+printed, MAX_STRING-printed, "%s", - e.comment()); - if(const char *type=e.type()) + 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 @@ -433,7 +447,8 @@ t[9]-t[3] } VStateless_class *Request::use_file(const String& file_name, - bool ignore_class_path, bool fail_on_read_problem, + bool ignore_class_path, + bool fail_on_read_problem, bool fail_on_file_absence, const String *name, VStateless_class *base_class) { // cyclic dependence check @@ -449,7 +464,7 @@ VStateless_class *Request::use_file(cons else { file_spec=0; if(main_class) - if(Value *element=main_class->get_element(*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()) { @@ -461,8 +476,8 @@ VStateless_class *Request::use_file(cons } } else throw Exception("parser.runtime", - &element->name(), - "must be string or table"); + 0, + "$" CLASS_PATH_NAME " must be string or table"); if(!file_spec) throw Exception("parser.runtime", &file_name, @@ -471,41 +486,62 @@ VStateless_class *Request::use_file(cons if(!file_spec) throw Exception("parser.runtime", &file_name, - "usage failed - no " MAIN_CLASS_NAME ":" CLASS_PATH_NAME " were specified"); + "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 base_class; + char *source=file_read_text(pool(), *file_spec, fail_on_read_problem); if(!source) return base_class; - return use_buf(source, file_spec->cstr(), 0/*new class*/, name, base_class); + return use_buf(source, *file_spec, file_spec->cstr(), 0/*new class*/, name, base_class); } -VStateless_class *Request::use_buf(const char *source, const char *file, + +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, file); + VStateless_class& cclass=COMPILE(source, aclass, name, base_class, filespec_cstr); - // locate and execute possible @auto[] static method - execute_nonvirtual_method(cclass, *auto_method_name, false /*no result needed*/); + VString *vfilespec=NEW VString(filespec); + + // locate and execute possible @conf[] static + const Method *method_called; + execute_nonvirtual_method(cclass, + cclass.get_method(*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 + configure_admin(cclass, &method_called->name); + } + + // locate and execute possible @auto[] static + execute_nonvirtual_method( + &cclass==&OP?*main_class:cclass, // execute operators@auto in MAIN context + cclass.get_method(*auto_method_name), vfilespec, + 0/*no result needed*/); return &cclass; } const String& Request::relative(const char *apath, const String& relative_name) { - int lpath_buf_size=strlen(apath)+1; - char *lpath=(char *)malloc(lpath_buf_size); - memcpy(lpath, apath, lpath_buf_size); - if(!rsplit(lpath, '/')) - strcpy(lpath, "."); - String& result=*NEW String(pool(), lpath); - result << "/" << relative_name; + int hpath_buf_size=strlen(apath)+1; + char *hpath=(char *)malloc(hpath_buf_size); + memcpy(hpath, apath, hpath_buf_size); + String& result=*NEW String(pool()); + if(rsplit(hpath, '/')) // if something/splitted + result << hpath << "/"; + result << relative_name; return result; } const String& Request::absolute(const String& relative_name) { - char *relative_name_cstr=relative_name.cstr(); - if(relative_name_cstr[0]=='/') { + if(relative_name.first_char()=='/') { String& result=*NEW String(pool(), info.document_root); result << relative_name; return result; @@ -531,9 +567,10 @@ void Request::output_result(const VFile& // header: cookies cookie.output_result(); + Value *body_file_content_type; // set content-type - if(String *body_file_content_type=static_cast( - body_file.fields().get(*vfile_mime_type_name))) { + if(body_file_content_type=static_cast( + body_file.fields().get(*content_type_name))) { // body file content type response.fields().put(*content_type_name, body_file_content_type); } else { @@ -554,20 +591,26 @@ void Request::output_result(const VFile& // prepare header: $response:fields without :body response.fields().for_each(add_header_attribute, this); - // transcode const void *client_body; size_t client_content_length; - Charset::transcode(pool(), - pool().get_source_charset(), body_file.value_ptr(), body_file.value_size(), - pool().get_client_charset(), client_body, client_content_length - ); + // transcode text body when "text/*" or simple result + if(body_file_content_type) + if(Hash *hash=body_file_content_type->get_hash(0)) + body_file_content_type=static_cast(hash->get(*value_name)); + if(!body_file_content_type/*vstring.as_vfile*/ || body_file_content_type->as_string().pos("text/")==0) { + Charset::transcode(pool(), + pool().get_source_charset(), body_file.value_ptr(), body_file.value_size(), + pool().get_client_charset(), client_body, client_content_length + ); + } else { + client_body=body_file.value_ptr(); + client_content_length=body_file.value_size(); + } // prepare header: content-length - if(client_content_length) { // useful for redirecting [header "location: http://..."] - char content_length_cstr[MAX_NUMBER]; - snprintf(content_length_cstr, MAX_NUMBER, "%u", client_content_length); - SAPI::add_header_attribute(pool(), "content-length", content_length_cstr); - } + char content_length_cstr[MAX_NUMBER]; + snprintf(content_length_cstr, MAX_NUMBER, "%u", client_content_length); + SAPI::add_header_attribute(pool(), "content-length", content_length_cstr); // send header SAPI::send_header(pool()); @@ -581,13 +624,13 @@ const String& Request::mime_type_of(cons if(mime_types) if(const char *cext=strrchr(user_file_name_cstr, '.')) { String sext(pool(), ++cext); - if(mime_types->locate(0, sext)) + if(mime_types->locate(0, sext.change_case(pool(), String::CC_LOWER))) if(const String *result=mime_types->item(1)) return *result; else throw Exception("parser.runtime", mime_types->origin_string(), - "MIME-TYPE table column elements must not be empty"); + MIME_TYPES_NAME " table column elements must not be empty"); } return *NEW String(pool(), "application/octet-stream"); }