--- parser3/src/main/pa_request.C 2001/04/03 07:02:43 1.91 +++ parser3/src/main/pa_request.C 2001/07/13 10:58:03 1.142 @@ -4,93 +4,145 @@ Copyright (c) 2001 ArtLebedev Group (http://www.artlebedev.com) Author: Alexander Petrosyan (http://design.ru/paf) - - $Id: pa_request.C,v 1.91 2001/04/03 07:02:43 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 "_root.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" -/// $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"; +Methoded *MOP_create(Pool&); + // Request::Request(Pool& apool, Info& ainfo, String::Untaint_lang adefault_lang) : Pooled(apool), stack(apool), - ROOT(apool), + OP(*MOP_create(apool)), env(apool), form(apool), + math(apool), request(apool, *this), response(apool), cookie(apool), fclasses(apool), fdefault_lang(adefault_lang), flang(adefault_lang), info(ainfo), + post_data(0), post_size(0), used_files(apool), default_content_type(0), - mime_types(0) + mime_types(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_root_class(pool(), ROOT); - classes().put(*root_class_name, &ROOT); - // 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); + 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 add_header_attribute(const Hash::Key& aattribute, Hash::Val *ameaning, - void *info) { - String *attribute_to_exclude=static_cast(info); - if(aattribute==*attribute_to_exclude) +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; - Value& lmeaning=*static_cast(ameaning); - Pool& pool=lmeaning.pool(); - - String attribute(pool); - SAPI::add_header_attribute(pool, - attribute.append(aattribute, String::UL_HEADER, true).cstr(), - attributed_meaning_to_string(lmeaning).cstr()); + 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; + } +} /** load MAIN class, execute @main. MAIN class consists of all the auto.p files we'd manage to find @@ -98,13 +150,11 @@ static void add_header_attribute(const H the file user requested us to process all located classes become children of one another, composing class we name 'MAIN' - - @test post-process */ 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); @@ -119,20 +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; - // $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; - - form.fill_fields(*this, post_max_size); - } - - // filling cookies - cookie.fill_fields(*this); + OP.configure_admin(*this); + methoded_array->configure_admin(*this); // loading site auto.p if(site_auto_path) { @@ -148,51 +188,49 @@ 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); @@ -201,6 +239,45 @@ void Request::core(const char *root_auto if(Table *table=element->get_table()) mime_types=table; + /* + $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; + + // 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); if(!body_string) @@ -211,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); + // @postprocess[data] + VMethodFrame frame(pool(), value->name(), *junction, false); frame.set_self(*main_class); frame.store_param(method->name, @@ -231,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 @@ -242,7 +319,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): " @@ -252,21 +329,23 @@ void Request::core(const char *root_auto problem_source->origin().file?problem_source->origin().file:"global", problem_source->origin().line, #endif - problem_source->cstr(), + problem_source->cstr(String::UL_AS_IS), e.comment(), - e.type()?e.type()->cstr():"-", - e.code()?e.code()->cstr():"-" + e.type()?e.type()->cstr(String::UL_AS_IS):"-", + e.code()?e.code()->cstr(String::UL_AS_IS):"-" ); else SAPI::log(pool(), "%s [%s %s]", e.comment(), - e.type()?e.type()->cstr():"-", - e.code()?e.code()->cstr():"-" + e.type()?e.type()->cstr(String::UL_AS_IS):"-", + e.code()?e.code()->cstr(String::UL_AS_IS):"-" ); // 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(); @@ -282,42 +361,42 @@ 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); + VMethodFrame frame(pool(), value->name(), *junction, false); 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); - snprintf(buf, MAX_STRING, "%s(%d):", + size_t buf_size=snprintf(buf, MAX_STRING, "%s(%d):", origin.file, 1+origin.line); String *origin_file_line=NEW String(pool(), - buf, true); + buf, buf_size, true); origin_value=NEW VString(*origin_file_line); } } #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(), - e.comment(), true); + e.comment(), 0, true); frame.store_param(method->name, NEW VString(*comment_value)); @@ -328,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 @@ -338,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= @@ -362,18 +441,18 @@ void Request::core(const char *root_auto origin.file, 1+origin.line); #endif printed+=snprintf(buf+printed, MAX_STRING-printed, "'%s' ", - problem_source->cstr()); + problem_source->cstr(String::UL_AS_IS)); } 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()); + type->cstr(String::UL_AS_IS)); const String *code=e.code(); if(code) printed+=snprintf(buf+printed, MAX_STRING-printed, ", code: %s", - code->cstr()); + code->cstr(String::UL_AS_IS)); } // future $response:content-type @@ -403,7 +482,6 @@ void Request::core(const char *root_auto THROW(rethrow_me.type(), rethrow_me.code(), rethrow_me.problem_source(), rethrow_me.comment()); - } VStateless_class *Request::use_file(const String& file_spec, bool fail_on_read_problem, @@ -433,27 +511,14 @@ VStateless_class *Request::use_buf(const 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.APPEND_CONST("/"); - result.append(relative_name, String::UL_PASS_APPENDED); + result << "/" << relative_name; return result; } @@ -461,12 +526,25 @@ const String& Request::absolute(const St char *relative_name_cstr=relative_name.cstr(); if(relative_name_cstr[0]=='/') { String& result=*NEW String(pool(), info.document_root); - result.append(relative_name, String::UL_PASS_APPENDED); + result << relative_name; return result; } else return relative(info.path_translated, relative_name); } +static void add_header_attribute(const Hash::Key& aattribute, Hash::Val *ameaning, + void *info) { + String *attribute_to_exclude=static_cast(info); + if(aattribute==*attribute_to_exclude) + return; + + Value& lmeaning=*static_cast(ameaning); + Pool& pool=lmeaning.pool(); + + SAPI::add_header_attribute(pool, + 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) { // header: cookies cookie.output_result(); @@ -483,6 +561,14 @@ void Request::output_result(const VFile& :NEW VString(*NEW String(pool(), DEFAULT_CONTENT_TYPE))); } + // content-disposition + 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); @@ -493,7 +579,7 @@ void Request::output_result(const VFile& // prepare header: content-length if(content_length) { // useful for redirecting [header "location: http://..."] char content_length_cstr[MAX_NUMBER]; - snprintf(content_length_cstr, MAX_NUMBER, "%lu", content_length); + snprintf(content_length_cstr, MAX_NUMBER, "%u", content_length); SAPI::add_header_attribute(pool(), "content-length", content_length_cstr); } @@ -504,3 +590,18 @@ void Request::output_result(const VFile& if(!header_only) SAPI::send_body(pool(), body, content_length); } + +const String& Request::mime_type_of(const char *user_file_name_cstr) { + if(mime_types) + if(const char *cext=strrchr(user_file_name_cstr, '.')) { + String sext(pool(), ++cext); + if(mime_types->locate(0, sext)) + if(const String *result=mime_types->item(1)) + return *result; + else + THROW(0, 0, + mime_types->origin_string(), + "MIME-TYPE table column elements must not be empty"); + } + return *NEW String(pool(), "application/octet-stream"); +}