--- parser3/src/main/pa_request.C 2001/04/11 07:44:15 1.110 +++ parser3/src/main/pa_request.C 2001/08/10 08:58:56 1.150 @@ -4,50 +4,48 @@ Copyright (c) 2001 ArtLebedev Group (http://www.artlebedev.com) Author: Alexander Petrosyan (http://design.ru/paf) - - $Id: pa_request.C,v 1.110 2001/04/11 07:44:15 paf Exp $ */ +static const char *RCSId="$Id: pa_request.C,v 1.150 2001/08/10 08:58:56 parser Exp $"; #include "pa_config_includes.h" -#include +#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_vmframe.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" +#include "pa_dictionary.h" -/// $LIMITS.post_max_size default 10M -const size_t MAX_POST_SIZE_DEFAULT=10*0x400*400; +const int MAX_EXECUTE_SECONDS=1; /// 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"; +const char *ORIGINS_CONTENT_TYPE="text/plain"; + +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), @@ -58,34 +56,96 @@ Request::Request(Pool& apool, used_files(apool), default_content_type(0), mime_types(0), - connection(0), protocol2library(0), - mail(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, + Value& ctype, const String& name, + unsigned char bit, + int group_offset=-1, + bool skip_ws=true) { + Value *value=ctype.get_element(name); + if(!value) + return; + + unsigned char *ctypes_table=tables+ctypes_offset; + const unsigned char *cstr= + (const unsigned char *)value->as_string().cstr(String::UL_AS_IS); + for(; *cstr; cstr++) { + unsigned char c=*cstr; + if(skip_ws && (c=='\n' || c=='\t' || c==' ')) + continue; + ctypes_table[c]|=bit; + + if(group_offset>=0) + tables[cbits_offset+group_offset+c/8] |= 1 << (c%8); + } +} +static void cstr2ctypes(unsigned char *tables, const unsigned char *cstr, + unsigned char bit) { + unsigned char *ctypes_table=tables+ctypes_offset; + ctypes_table[0]=bit; + for(; *cstr; cstr++) { + unsigned char c=*cstr; + ctypes_table[c]|=bit; + } +} +static void prepare_case_tables(unsigned char *tables) { + unsigned char *lcc_table=tables+lcc_offset; + unsigned char *fcc_table=tables+fcc_offset; + for(int i=0; i<0x100; i++) + lcc_table[i]=fcc_table[i]=i; +} +static void element2case(unsigned char *tables, Value& ctype, const String& name) { + Value *value=ctype.get_element(name); + if(!value) + return; + + unsigned char *lcc_table=tables+lcc_offset; + unsigned char *fcc_table=tables+fcc_offset; + const unsigned char *cstr= + (const unsigned char *)value->as_string().cstr(String::UL_AS_IS); + unsigned char from=0; + for(; *cstr; cstr++) { + unsigned char c=*cstr; + if(c=='\n' || c=='\t' || c==' ') + continue; + if(from) { + lcc_table[from]=c; + fcc_table[from]=c; fcc_table[c]=from; + from=0; + } else + from=c; + } } /** @@ -95,13 +155,11 @@ Request::Request(Pool& apool, the file user requested us to process all located classes become children of one another, composing class we name 'MAIN' - - @test get read of setlocale */ 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); @@ -112,37 +170,15 @@ void Request::core(const char *root_auto filespec.APPEND_CLEAN(root_auto_path, 0, "root_auto", 0); filespec.APPEND_CONST("/" AUTO_FILE_NAME); main_class=use_file( - filespec, root_auto_fail, + filespec, + true/*ignore class_path*/, root_auto_fail, 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) { @@ -150,7 +186,8 @@ void Request::core(const char *root_auto filespec.APPEND_CLEAN(site_auto_path, 0, "site_auto", 0); filespec.APPEND_CONST("/" AUTO_FILE_NAME); main_class=use_file( - filespec, site_auto_fail, + filespec, + true/*ignore class_path*/, site_auto_fail, main_class_name, main_class); } @@ -158,107 +195,116 @@ void Request::core(const char *root_auto // to the one beside requested file. // all assigned bases from upper dir { - /* /document/root */ - char *file_spec= - (char *)malloc(strlen(info.path_translated)+strlen(AUTO_FILE_NAME)+1); - size_t document_root_size=strlen(info.document_root); - if(info.document_root[document_root_size-1]=='/') - document_root_size--; - memcpy(file_spec, info.document_root, document_root_size); - - /* /requested/file.html */ - char *branches=(char *)malloc(strlen(info.path_translated)+1); - strcpy(branches, info.path_translated+document_root_size); - char *next=branches; - char *append_here=file_spec+document_root_size; - - size_t slash_auto_p_size=strlen("/" AUTO_FILE_NAME); - while(true) { - char *step=lsplit(&next, '/'); - if(next) { // not 'file.html' part - size_t step_size=strlen(step); - memcpy(append_here, step, step_size); - append_here+=step_size; - memcpy(append_here, "/" AUTO_FILE_NAME, slash_auto_p_size+1); - append_here++/* / */; - - String& sfile_spec=*NEW String(pool()); - sfile_spec.APPEND_CLEAN(file_spec, 0, "scanned", 0); - main_class=use_file(sfile_spec, false/*ignore read problem*/, - main_class_name, main_class); - } else - break; + Array ladder(pool()); + const char *after=info.path_translated; + size_t drlen=strlen(info.document_root); + if(memcmp(after, info.document_root, drlen)==0) { + after+=drlen; + if(after[-1]=='/') + --after; + } + + while(const char *before=strchr(after, '/')) { + String& step=*NEW String(pool()); + if(after!=info.path_translated) { + step.APPEND_CLEAN( + info.path_translated, before+1/* / */-info.path_translated, + "path-translated-scanned", ladder.size()); + step << AUTO_FILE_NAME; + ladder+=&step; + } + after=before+1; + } + 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 // meaning constructing @see attributed_meaning_to_string default_content_type=defaults?defaults->get_element(*content_type_name):0; - if(Value *element=main_class->get_element(*html_typo_name)) + if(Value *element=main_class->get_element(*user_html_name)) 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(); + pool().set_tag(NEW Dictionary(*table)); // $MAIN:MIME-TYPES if(Value *element=main_class->get_element(*mime_types_name)) if(Table *table=element->get_table()) mime_types=table; - // $MAIN:LOCALE.ctype[Russian_Russia.1251] -/* -#define LC_ALL 0 -#define LC_COLLATE 1 -#define LC_CTYPE 2 -#define LC_MONETARY 3 -#define LC_NUMERIC 4 -#define LC_TIME 5 -*/ - if(Value *locale=main_class->get_element(*locale_name)) - if(Value *element=locale->get_element(*locale_ctype_name)) { - const String& name=element->as_string(); - if(!setlocale(LC_CTYPE, name.cstr())) - THROW(0, 0, - &name, - "locale is invalid"); - } + /* + $MAIN:CTYPE[ + $.white-space[ + ^#09^#0A^#0B^#0C^#0D^#20] + $.digit[ + 0123456789] + $.hex-digit[ + 0123456789ABCDEFabcdef] + $.letter[ + ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz] + $.word[ + 0123456789ABCDEFGHIJKLMNOPQRSTUVWXYZ_abcdefghijklmnopqrstuvwxyz] + + $.lowercase[ + AaBbCcDdEeFfGgHhIiJjKkLlMmNnOoPpQqRrSsTtUuVvWwXxYyZz] + ] + */ + if(Value *ctype=main_class->get_element(*ctype_name)) { + // lowcase, flipcase, bits digit+word+whitespace, masks + pcre_tables=(unsigned char *)calloc(tables_length); + prepare_case_tables(pcre_tables); + + element2ctypes(pcre_tables, *ctype, *ctype_white_space_name, ctype_space, cbit_space, false); + element2ctypes(pcre_tables, *ctype, *ctype_digit_name, ctype_digit, cbit_digit); + element2ctypes(pcre_tables, *ctype, *ctype_hex_digit_name, ctype_xdigit); + element2ctypes(pcre_tables, *ctype, *ctype_letter_name, ctype_letter); + element2ctypes(pcre_tables, *ctype, *ctype_word_name, ctype_word, cbit_word); + 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); + const String *body_string=execute_virtual_method( + *main_class, *main_method_name); if(!body_string) THROW(0,0, - 0, - "'"MAIN_METHOD_NAME"' method not found"); + 0, + "'"MAIN_METHOD_NAME"' method not found"); 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); frame.set_self(*main_class); frame.store_param(method->name, @@ -267,13 +313,19 @@ void Request::core(const char *root_auto NEW VString(*execute_method(frame, *method)); } - const VFile *body_file=body_vstring_after_post_process->as_vfile(); + bool origins_mode=main_class->get_element(*origins_mode_name)!=0; + + const VFile *body_file=body_vstring_after_post_process->as_vfile( + String::UL_UNSPECIFIED, origins_mode); // 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(); + else if(origins_mode) + response.fields().put(*content_type_name, + NEW VString(*NEW String(pool(), ORIGINS_CONTENT_TYPE))); // OK. write out the result output_result(*body_file, header_only); @@ -283,7 +335,7 @@ void Request::core(const char *root_auto TRY { // log the beast const String *problem_source=e.problem_source(); - if(problem_source) + if(problem_source && problem_source->size()) SAPI::log(pool(), #ifndef NO_STRING_ORIGIN "%s(%d): " @@ -308,6 +360,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(); @@ -323,14 +377,14 @@ 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); frame.set_self(*main_class); const String *problem_source=e.problem_source(); // origin Value *origin_value=0; #ifndef NO_STRING_ORIGIN - if(problem_source) { + if(problem_source && problem_source->size()) { const Origin& origin=problem_source->origin(); if(origin.file) { char *buf=(char *)malloc(MAX_STRING); @@ -343,18 +397,18 @@ 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; - if(problem_source) { + 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 VUnknown(pool())); + source_value?source_value:NEW VVoid(pool())); // comment String *comment_value=NEW String(pool(), @@ -369,7 +423,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 @@ -379,7 +433,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= @@ -424,7 +478,7 @@ void Request::core(const char *root_auto body_string=NEW String(pool(), buf); } - const VString body_vstring(*body_string); + VString body_vstring(*body_string); const VFile *body_file=body_vstring.as_vfile(); // ERROR. write it out @@ -446,20 +500,51 @@ void Request::core(const char *root_auto rethrow_me.comment()); } -VStateless_class *Request::use_file(const String& file_spec, bool fail_on_read_problem, +VStateless_class *Request::use_file(const String& file_name, + bool ignore_class_path, bool fail_on_read_problem, const String *name, VStateless_class *base_class) { // cyclic dependence check - if(used_files.get(file_spec)) + if(used_files.get(file_name)) return base_class; - used_files.put(file_spec, (Hash::Val *)true); + used_files.put(file_name, (Hash::Val *)true); + const String *file_spec; + if(ignore_class_path || file_name.first_char()=='/') { + // ignore_class_path | absolute path, no need to scan MAIN:class_path + file_spec=&file_name; + } else { + file_spec=0; + if(main_class) + if(Value *element=main_class->get_element(*class_path_name)) + if(Table *table=element->get_table()) { + int size=table->size(); + for(int i=size; i--; ) { + const String& path=*static_cast(table->get(i))->get_string(0); + String *test_file_spec=NEW String(path); + *test_file_spec << "/"; + *test_file_spec << file_name; + if(file_readable(*test_file_spec)) { + file_spec=test_file_spec; // found along class_path + break; + } + } + if(!file_spec) + THROW(0, 0, + &file_name, + "not found along " CLASS_PATH_NAME); + } + if(!file_spec) + THROW(0, 0, + &file_name, + "can not be found because no " CLASS_PATH_NAME " were specified"); + } - char *source=file_read_text(pool(), file_spec, fail_on_read_problem); + 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->cstr(), 0/*new class*/, name, base_class); } VStateless_class *Request::use_buf(const char *source, const char *file, @@ -469,28 +554,16 @@ VStateless_class *Request::use_buf(const VStateless_class& cclass=COMPILE(source, aclass, name, base_class, file); // locate and execute possible @auto[] static method - execute_method(cclass, *auto_method_name, false /*no result needed*/); + execute_nonvirtual_method(cclass, *auto_method_name, false /*no result needed*/); return &cclass; } -/** - - fail_if_junction(true, junction = fail - - fail_if_junction(false, not junction = fail -*/ -void Request::fail_if_junction_(bool is, Value& value, - const String& method_name, const char *msg) { - - if((value.get_junction()!=0) ^ !is) - THROW(0, 0, - &method_name, - msg); -} - 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; @@ -515,9 +588,8 @@ static void add_header_attribute(const H Value& lmeaning=*static_cast(ameaning); Pool& pool=lmeaning.pool(); - String attribute(pool); SAPI::add_header_attribute(pool, - attribute.append(aattribute, String::UL_HTTP_HEADER, true).cstr(), + aattribute.cstr(String::UL_AS_IS), attributed_meaning_to_string(lmeaning, String::UL_HTTP_HEADER).cstr()); } void Request::output_result(const VFile& body_file, bool header_only) { @@ -537,11 +609,12 @@ void Request::output_result(const VFile& } // content-disposition - if(VString *vfile_name=static_cast(body_file.fields().get(*name_name))) { - VHash& vhash=*NEW VHash(pool()); - vhash.hash().put(*content_disposition_filename_name, vfile_name); - response.fields().put(*content_disposition_name, &vhash); - } + if(VString *vfile_name=static_cast(body_file.fields().get(*name_name))) + if(vfile_name->string()!=NONAME_DAT) { + VHash& vhash=*NEW VHash(pool()); + vhash.hash().put(*content_disposition_filename_name, vfile_name); + response.fields().put(*content_disposition_name, &vhash); + } // prepare header: $response:fields without :body response.fields().for_each(add_header_attribute, /*excluding*/ body_name); @@ -578,4 +651,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 +}