--- parser3/src/main/pa_request.C 2002/05/07 07:23:11 1.204.2.1 +++ parser3/src/main/pa_request.C 2002/08/06 09:07:59 1.222 @@ -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.204.2.1 2002/05/07 07:23:11 paf Exp $ */ +static const char* IDENT_REQUEST_C="$Date: 2002/08/06 09:07:59 $"; + #include "pa_sapi.h" #include "pa_common.h" #include "pa_request.h" @@ -19,8 +19,8 @@ #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"; @@ -36,11 +36,6 @@ 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, @@ -52,6 +47,7 @@ Request::Request(Pool& apool, env(apool), status(apool), form(apool), + mail(apool), math(apool), request(apool, *this), response(apool), @@ -61,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), @@ -105,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); } @@ -119,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. @@ -132,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 @@ -145,44 +175,13 @@ 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", - 0, - "$" 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); - - // 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, main_class_name, main_class); } @@ -222,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); @@ -237,6 +240,9 @@ 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); @@ -277,7 +283,7 @@ gettimeofday(&mt[2],NULL); // 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(lorigins_mode) response.fields().put(*content_type_name, @@ -313,8 +319,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 @@ -328,15 +333,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 @@ -399,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) @@ -412,9 +415,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 @@ -481,34 +484,50 @@ VStateless_class *Request::use_file(cons 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; @@ -534,9 +553,10 @@ void Request::output_result(const VFile& // header: cookies cookie.output_result(); + VString *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 { @@ -557,13 +577,18 @@ 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/*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 char content_length_cstr[MAX_NUMBER]; @@ -582,13 +607,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"); }