--- parser3/src/main/pa_request.C 2002/02/08 07:27:48 1.193 +++ parser3/src/main/pa_request.C 2002/08/01 11:26:50 1.218 @@ -2,11 +2,11 @@ Parser: request class main part. @see compile.C and execute.C. Copyright (c) 2001, 2002 ArtLebedev Group (http://www.artlebedev.com) - Author: Alexander Petrosyan (http://paf.design.ru) - - $Id: pa_request.C,v 1.193 2002/02/08 07:27:48 paf Exp $ + Author: Alexandr Petrosian (http://paf.design.ru) */ +static const char* IDENT_REQUEST_C="$Id: pa_request.C,v 1.218 2002/08/01 11:26:50 paf Exp $"; + #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"; @@ -30,22 +33,21 @@ const char *DEFAULT_CONTENT_TYPE="text/h const char *ORIGINS_CONTENT_TYPE="text/plain"; Methoded *MOP_create(Pool&); - -static void load_charset(const Hash::Key& akey, Hash::Val *avalue, - void *) { - charsets->load_charset(akey, static_cast(avalue)->as_string()); -} +// op.C +VHash& exception2vhash(Pool& pool, const Exception& e); // 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), @@ -55,16 +57,18 @@ 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), fconnection(0), classes_conf(apool), anti_endless_execute_recoursion(0), - trace(apool) + exception_trace(apool) #ifdef RESOURCES_DEBUG - ,sql_connect_time(0),sql_request_time(0) + , sql_connect_time(0),sql_request_time(0) #endif + , self(0), root(0), rcontext(0), wcontext(0) { // default charsets pool().set_source_charset(*utf8_charset); @@ -98,6 +102,8 @@ Request::Request(Pool& apool, /// bases used // form class classes().put(form.get_class()->base()->name(), &form); + // mail class + classes().put(mail.get_class()->base()->name(), &mail); // math class classes().put(math.get_class()->base()->name(), &math); } @@ -112,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 root 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)) { + 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 root options + // until someone with less privileges have overriden them + OP.configure_admin(*this); + methoded_array->configure_admin(*this); +} /** load MAIN class, execute @main. @@ -125,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 @@ -138,44 +175,13 @@ gettimeofday(&mt[0],NULL); try { char *auto_filespec=(char *)malloc(MAX_STRING); - // loading root config - if(root_config_filespec) { - String& filespec=*NEW String(pool()); - filespec.APPEND_CLEAN(root_config_filespec, 0, "root_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(0, 0, - &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) { + // loading config + if(config_filespec) { String& filespec=*NEW String(pool()); - filespec.APPEND_CLEAN(site_config_filespec, 0, "site_config", 0); + filespec.APPEND_CLEAN(config_filespec, 0, "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, main_class_name, main_class); } @@ -215,6 +221,10 @@ gettimeofday(&mt[0],NULL); true/*ignore class_path*/, true/*don't ignore read problem*/, main_class_name, main_class); + // configure root options if not configured yet + if(!configure_admin_done) + configure_admin(*main_class, 0); + // configure not-root=user options OP.configure_user(*this); methoded_array->configure_user(*this); @@ -230,14 +240,17 @@ 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(0,0, + throw Exception("parser.runtime", 0, "'"MAIN_METHOD_NAME"' method not found"); @@ -249,31 +262,30 @@ 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))) 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))); @@ -307,28 +319,28 @@ 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 ORIGIN_FILE_LINE_FORMAT": " #endif - "'%s' %s [%s %s]", + "'%s' %s [%s]", + info.uri, #ifndef NO_STRING_ORIGIN problem_source->origin().file?problem_source->origin().file:"global", problem_source->origin().line, #endif problem_source->cstr(), e.comment(), - e.type()?e.type()->cstr():"-", - e.code()?e.code()->cstr():"-" + e.type() ); else SAPI::log(pool(), - "%s [%s %s]", - e.comment(), - e.type()?e.type()->cstr():"-", - e.code()?e.code()->cstr():"-" + "%s: " + "%s [%s]", + info.uri, + e.comment(), e.type() ); // reset language to default @@ -343,75 +355,24 @@ 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(*exception_method_name)) + if(Value *value=main_class->get_element( + *NEW String(pool(), UNHANDLED_EXCEPTION_METHOD_NAME))) if(Junction *junction=value->get_junction()) if(const Method *method=junction->method) { // preparing to pass parameters to - // @exception[origin;source;comment;type;code;stack] - VMethodFrame frame(pool(), value->name(), *junction); + // @unhandled_exception[exception;stack] + VMethodFrame frame(pool(), method->name, *junction); frame.set_self(*main_class); - const String *problem_source=e.problem_source(); - // origin - Value *origin_value=0; -#ifndef NO_STRING_ORIGIN - if(problem_source && problem_source->size()) { - const Origin& origin=problem_source->origin(); - if(origin.file) { - char *buf=(char *)malloc(MAX_STRING); - size_t buf_size=snprintf(buf, MAX_STRING, ORIGIN_FILE_LINE_FORMAT, - origin.file, 1+origin.line); - origin_value=NEW VString(*NEW String(pool(), - buf, buf_size, true)); - } - } -#endif - frame.store_param(method->name, - origin_value?origin_value:NEW VVoid(pool())); - - // source - Value *source_value=0; - if(problem_source && problem_source->size()) { - String& problem_source_copy=*NEW String(pool()); - problem_source_copy.append(*problem_source, - flang, true); - source_value=NEW VString(problem_source_copy); - } - frame.store_param(method->name, - source_value?source_value:NEW VVoid(pool())); - - // comment - String *comment_value=NEW String(pool(), - e.comment(), 0, true); - frame.store_param(method->name, - NEW VString(*comment_value)); - - // type - Value *type_value; - if(e.type()) { - String& type_copy=*NEW String(pool()); - type_value=NEW VString(type_copy.append(*e.type(), - flang, true)); - } else - type_value=NEW VVoid(pool()); - frame.store_param(method->name, type_value); - - // code - Value *code_value; - if(e.code()) { - String& code_copy=*NEW String(pool()); - code_value=NEW VString(code_copy.append(*e.code(), - flang, true)); - } else - code_value=NEW VVoid(pool()); - frame.store_param(method->name, code_value); - + // $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(), "origin"); + 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(trace); + Array_iter tracei(exception_trace); while(tracei.has_next()) { Array& row=*NEW Array(pool()); @@ -420,16 +381,15 @@ t[9]-t[3] #ifndef NO_STRING_ORIGIN const Origin& origin=name->origin(); if(origin.file) { - char *buf=(char *)malloc(MAX_STRING); - size_t buf_size=snprintf(buf, MAX_STRING, ORIGIN_FILE_LINE_FORMAT, - origin.file, 1+origin.line); - row+=NEW String(pool(), buf, buf_size, true); // origin column + 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; } - 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] @@ -443,8 +403,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) @@ -456,17 +415,10 @@ 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()); - const String *type=e.type(); - if(type) { - printed+=snprintf(buf+printed, MAX_STRING-printed, " type: %s", - type->cstr()); - const String *code=e.code(); - if(code) - printed+=snprintf(buf+printed, MAX_STRING-printed, ", code: %s", - code->cstr()); - } + 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, @@ -514,52 +466,68 @@ VStateless_class *Request::use_file(cons break; // found along class_path } } else - throw Exception(0, 0, - &element->name(), - "must be string or table"); + throw Exception("parser.runtime", + 0, + "$" CLASS_PATH_NAME " must be string or table"); if(!file_spec) - throw Exception(0, 0, + throw Exception("parser.runtime", &file_name, "not found along " MAIN_CLASS_NAME ":" CLASS_PATH_NAME); } if(!file_spec) - throw Exception(0, 0, + 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"); } 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); + + VString *vfilespec=NEW VString(filespec); - // locate and execute possible @auto[] static method - execute_nonvirtual_method(cclass, *auto_method_name, false /*no result needed*/); + // locate and execute possible @conf[] static + 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 root auto.p, when main_class not assigned yet + configure_admin(cclass, &method_called->name); + } + + // locate and execute possible @auto[] static + execute_nonvirtual_method(cclass, + *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; @@ -617,11 +585,9 @@ void Request::output_result(const VFile& ); // 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()); @@ -639,9 +605,9 @@ const String& Request::mime_type_of(cons if(const String *result=mime_types->item(1)) return *result; else - throw Exception(0, 0, + 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"); }