--- parser3/src/main/pa_request.C 2001/04/27 15:19:30 1.122.2.1 +++ parser3/src/main/pa_request.C 2001/06/28 07:44:17 1.140 @@ -4,14 +4,14 @@ Copyright (c) 2001 ArtLebedev Group (http://www.artlebedev.com) Author: Alexander Petrosyan (http://design.ru/paf) - - $Id: pa_request.C,v 1.122.2.1 2001/04/27 15:19:30 paf Exp $ */ +static const char *RCSId="$Id: pa_request.C,v 1.140 2001/06/28 07:44:17 parser Exp $"; #include "pa_config_includes.h" #include "pcre.h" #include "internal.h" +extern "C" unsigned char pcre_default_tables[]; // pcre/chartables.c #include "pa_sapi.h" #include "pa_common.h" @@ -25,16 +25,13 @@ #include "pa_vtable.h" #include "pa_vfile.h" -/// $LIMITS.post_max_size default 10M -const size_t MAX_POST_SIZE_DEFAULT=10*0x400*400; - /// content type of exception response, when no @MAIN:exception handler defined 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"; -MOP_create(Pool&); +Methoded *MOP_create(Pool&); // Request::Request(Pool& apool, @@ -54,26 +51,34 @@ Request::Request(Pool& apool, used_files(apool), default_content_type(0), mime_types(0), - connection(0), protocol2library(0), - mail(0), - pcre_tables(0) + main_class(0), + connection(0), + pcre_tables(0), + classes_conf(apool), + anti_endless_execute_recoursion(0) { + /// directly used // operators - OP.register_directly_used(r); + OP.register_directly_used(*this); + // classes: + // table, file, random, mail, image, ... + methoded_array->register_directly_used(*this); + + /// methodless // env class - classes().put(NEW String(ENV_CLASS_NAME), &env); - // form class - classes().put(form.get_class().name(), &form); + classes().put(*NEW String(pool(), ENV_CLASS_NAME), &env); // request class - classes().put(NEW String(REQUEST_CLASS_NAME), &request); - // response class - classes().put(response.get_class().name(), &response); + classes().put(*NEW String(pool(), REQUEST_CLASS_NAME), &request); // cookie class - classes().put(NEW String(COOKIE_CLASS_NAME), &cookie); + classes().put(*NEW String(pool(), COOKIE_CLASS_NAME), &cookie); - // classes: - // table, file, random, mail, image - methoded_array->register_directly_used(*this); + /// methoded + // response class + classes().put(response.get_class()->name(), &response); + + /// bases used + // form class + classes().put(form.get_class()->base()->name(), &form); } static void element2ctypes(unsigned char *tables, @@ -147,7 +152,6 @@ void Request::core(const char *root_auto const char *site_auto_path, bool site_auto_fail, bool header_only) { //_asm { int 3 } - VStateless_class *main_class=0; bool need_rethrow=false; Exception rethrow_me; TRY { char *auto_filespec=(char *)malloc(MAX_STRING); @@ -162,33 +166,10 @@ void Request::core(const char *root_auto main_class_name, main_class); } - // $MAIN:LIMITS hash used here, + // configure root options // until someone with less privileges have overriden them - { - Value *limits=main_class?main_class->get_element(*limits_name):0; - if(info.method && StrEqNc(info.method, "post", true)) { - // $limits.post_max_size default 10M - Value *element=limits?limits->get_element(*post_max_size_name):0; - size_t value=element?(size_t)element->as_double():0; - size_t post_max_size=value?value:MAX_POST_SIZE_DEFAULT; - - if(size_t limit=max(0, min(info.content_length, post_max_size))) { - // read POST data - post_data=(char *)malloc(limit); - post_size=SAPI::read_post(pool(), post_data, limit); - if(post_size!=limit) - THROW(0, 0, - 0, - "post_size(%d)!=limit(%d)", - post_size, limit); - } - } - - form.fill_fields(*this); - } - - // filling cookies - cookie.fill_fields(*this); + OP.configure_admin(*this); + methoded_array->configure_admin(*this); // loading site auto.p if(site_auto_path) { @@ -231,12 +212,16 @@ void Request::core(const char *root_auto } } - // compiling requested file + // compile requested file String& spath_translated=*NEW String(pool()); - spath_translated.APPEND_CLEAN(info.path_translated, 0, "user-request", 0); + spath_translated.APPEND_TAINTED(info.path_translated, 0, "user-request", 0); main_class=use_file(spath_translated, true/*don't ignore read problem*/, main_class_name, main_class); + // configure not-root=user options + OP.configure_user(*this); + methoded_array->configure_user(*this); + // $MAIN:DEFAULTS Value *defaults=main_class->get_element(*defaults_name); // value must be allocated on request's pool for that pool used on @@ -246,11 +231,6 @@ void Request::core(const char *root_auto if(Table *table=element->get_table()) pool().set_tag(table); - // $MAIN:SQL.drivers - if(Value *sql=main_class->get_element(*main_sql_name)) - if(Value *element=sql->get_element(*main_sql_drivers_name)) - protocol2library=element->get_table(); - // $MAIN:MIME-TYPES if(Value *element=main_class->get_element(*mime_types_name)) if(Table *table=element->get_table()) @@ -268,8 +248,6 @@ void Request::core(const char *root_auto ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz] $word[ 0123456789ABCDEFGHIJKLMNOPQRSTUVWXYZ_abcdefghijklmnopqrstuvwxyz] - $meta[ - ^#00$()*+.?[^{|] $lowercase[ AaBbCcDdEeFfGgHhIiJjKkLlMmNnOoPpQqRrSsTtUuVvWwXxYyZz] @@ -288,15 +266,14 @@ void Request::core(const char *root_auto cstr2ctypes(pcre_tables, (const unsigned char *)"*+?{^.$|()[", ctype_meta); element2case(pcre_tables, *ctype, *ctype_lowercase_name); - } + } else + pcre_tables=pcre_default_tables; - // $MAIN:MAIL[$SMTP[mail.design.ru]] - if(Value *mail_element=main_class->get_element(*mail_name)) - if(!(mail=mail_element->get_hash())) - THROW(0, 0, - 0, - "$MAIN:MAIL is not hash"); + // filling form fields + form.fill_fields(*this); + // filling cookies + cookie.fill_fields(*this); // execute @main[] const String *body_string=execute_method(*main_class, *main_method_name); @@ -314,7 +291,7 @@ void Request::core(const char *root_auto if(const Method *method=junction->method) { // preparing to pass parameters to // @postprocess[data] - VMethodFrame frame(pool(), *junction, false); + VMethodFrame frame(pool(), value->name(), *junction, false); frame.set_self(*main_class); frame.store_param(method->name, @@ -364,6 +341,8 @@ void Request::core(const char *root_auto // reset language to default flang=fdefault_lang; + if(flang==String::UL_USER_HTML) + flang=String::UL_HTML; // no _ & Co conversions in @exception[params] // reset response response.fields().clear(); @@ -379,7 +358,7 @@ void Request::core(const char *root_auto if(const Method *method=junction->method) { // preparing to pass parameters to // @exception[origin;source;comment;type;code] - VMethodFrame frame(pool(), *junction, false); + VMethodFrame frame(pool(), value->name(), *junction, false); frame.set_self(*main_class); const String *problem_source=e.problem_source(); @@ -399,7 +378,7 @@ void Request::core(const char *root_auto } #endif frame.store_param(method->name, - origin_value?origin_value:NEW VUnknown(pool())); + origin_value?origin_value:NEW VVoid(pool())); // source Value *source_value=0; @@ -410,7 +389,7 @@ void Request::core(const char *root_auto source_value=NEW VString(problem_source_copy); } frame.store_param(method->name, - source_value?source_value:NEW VUnknown(pool())); + source_value?source_value:NEW VVoid(pool())); // comment String *comment_value=NEW String(pool(), @@ -425,7 +404,7 @@ void Request::core(const char *root_auto type_value=NEW VString(type_copy.append(*e.type(), flang, true)); } else - type_value=NEW VUnknown(pool()); + type_value=NEW VVoid(pool()); frame.store_param(method->name, type_value); // code @@ -435,7 +414,7 @@ void Request::core(const char *root_auto code_value=NEW VString(code_copy.append(*e.code(), flang, true)); } else - code_value=NEW VUnknown(pool()); + code_value=NEW VVoid(pool()); frame.store_param(method->name, code_value); // future $response:body= @@ -622,4 +601,4 @@ const String& Request::mime_type_of(cons "MIME-TYPE table column elements must not be empty"); } return *NEW String(pool(), "application/octet-stream"); -} \ No newline at end of file +}