--- parser3/src/main/pa_request.C 2001/04/23 08:52:24 1.118 +++ parser3/src/main/pa_request.C 2001/07/13 10:58:03 1.142 @@ -4,36 +4,26 @@ Copyright (c) 2001 ArtLebedev Group (http://www.artlebedev.com) Author: Alexander Petrosyan (http://design.ru/paf) - - $Id: pa_request.C,v 1.118 2001/04/23 08:52:24 paf Exp $ */ +static const char *RCSId="$Id: pa_request.C,v 1.142 2001/07/13 10:58:03 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" #include "pa_request.h" #include "pa_wwrapper.h" #include "pa_vclass.h" -#include "_op.h" -#include "_table.h" -#include "_file.h" #include "pa_globals.h" #include "pa_vint.h" #include "pa_vmethod_frame.h" #include "pa_types.h" #include "pa_vtable.h" -#include "_random.h" #include "pa_vfile.h" -#include "_mail.h" -#include "_exec.h" -#include "_image.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"; @@ -41,14 +31,17 @@ const char *UNHANDLED_EXCEPTION_CONTENT_ /// content type of response when no $MAIN:defaults.content-type defined const char *DEFAULT_CONTENT_TYPE="text/html"; +Methoded *MOP_create(Pool&); + // Request::Request(Pool& apool, Info& ainfo, String::Untaint_lang adefault_lang) : Pooled(apool), stack(apool), - OP(apool), + OP(*MOP_create(apool)), env(apool), form(apool), + math(apool), request(apool, *this), response(apool), cookie(apool), @@ -59,35 +52,36 @@ 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) { - // root superclass, - // parent of all classes, - // operators holder - initialize_op_class(pool(), OP); - classes().put(*op_class_name, &OP); - // table class - classes().put(*table_class_name, table_class); - // file class - classes().put(*file_class_name, file_class); - // random class - classes().put(*random_class_name, random_class); + /// directly used + // operators + OP.register_directly_used(*this); + // classes: + // table, file, random, mail, image, ... + methoded_array->register_directly_used(*this); + + /// methodless // env class - classes().put(*env_class_name, &env); - // form class - classes().put(*form_class_name, &form); + classes().put(*NEW String(pool(), ENV_CLASS_NAME), &env); // request class - classes().put(*request_class_name, &request); - // response class - classes().put(*response_class_name, &response); + classes().put(*NEW String(pool(), REQUEST_CLASS_NAME), &request); // cookie class - classes().put(*cookie_class_name, &cookie); - // mail class - classes().put(*mail_class_name, mail_class); - // image class - classes().put(*image_class_name, image_class); + classes().put(*NEW String(pool(), COOKIE_CLASS_NAME), &cookie); + + /// methoded + // response class + classes().put(response.get_class()->name(), &response); + + /// bases used + // form class + classes().put(form.get_class()->base()->name(), &form); + // math class + classes().put(math.get_class()->base()->name(), &math); } static void element2ctypes(unsigned char *tables, @@ -160,7 +154,7 @@ static void element2case(unsigned char * void Request::core(const char *root_auto_path, bool root_auto_fail, const char *site_auto_path, bool site_auto_fail, bool header_only) { - VStateless_class *main_class=0; + //_asm { int 3 } bool need_rethrow=false; Exception rethrow_me; TRY { char *auto_filespec=(char *)malloc(MAX_STRING); @@ -175,33 +169,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) { @@ -237,19 +208,23 @@ void Request::core(const char *root_auto } after=before+1; } - for(int i=ladder.size(); --i>=0; ) { + for(int i=0; iconfigure_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 @@ -259,11 +234,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()) @@ -281,8 +251,6 @@ void Request::core(const char *root_auto ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz] $word[ 0123456789ABCDEFGHIJKLMNOPQRSTUVWXYZ_abcdefghijklmnopqrstuvwxyz] - $meta[ - ^#00$()*+.?[^{|] $lowercase[ AaBbCcDdEeFfGgHhIiJjKkLlMmNnOoPpQqRrSsTtUuVvWwXxYyZz] @@ -301,15 +269,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); @@ -321,13 +288,13 @@ void Request::core(const char *root_auto VString body_vstring_before_post_process(*body_string); VString *body_vstring_after_post_process=&body_vstring_before_post_process; - // post-process + // @postprocess if(Value *value=main_class->get_element(*post_process_method_name)) if(Junction *junction=value->get_junction()) if(const Method *method=junction->method) { // preparing to pass parameters to - // @post-process[data] - VMethodFrame frame(pool(), *junction, false); + // @postprocess[data] + VMethodFrame frame(pool(), value->name(), *junction, false); frame.set_self(*main_class); frame.store_param(method->name, @@ -341,7 +308,7 @@ void Request::core(const char *root_auto // extract response body Value *body_value=static_cast( response.fields().get(*body_name)); - if(body_value) // there is some $request.body + if(body_value) // there is some $response.body body_file=body_value->as_vfile(); // OK. write out the result @@ -377,6 +344,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(); @@ -392,7 +361,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(); @@ -412,7 +381,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; @@ -423,7 +392,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(), @@ -438,7 +407,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 @@ -448,7 +417,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= @@ -542,12 +511,12 @@ VStateless_class *Request::use_buf(const return &cclass; } -/// @test with commandline start "parser3 a.html" so that ^load[a.cfg] worked! [now doesnt] 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); - rsplit(lpath, '/'); + if(!rsplit(lpath, '/')) + strcpy(lpath, "."); String& result=*NEW String(pool(), lpath); result << "/" << relative_name; return result; @@ -635,4 +604,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 +}