--- parser3/src/main/pa_request.C 2001/05/15 10:01:25 1.130 +++ parser3/src/main/pa_request.C 2001/09/30 12:06:04 1.159 @@ -2,16 +2,16 @@ Parser: request class main part. @see compile.C and execute.C. Copyright (c) 2001 ArtLebedev Group (http://www.artlebedev.com) - Author: Alexander Petrosyan (http://design.ru/paf) - $Id: pa_request.C,v 1.130 2001/05/15 10:01:25 parser Exp $ + $Id: pa_request.C,v 1.159 2001/09/30 12:06:04 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" @@ -24,15 +24,247 @@ #include "pa_types.h" #include "pa_vtable.h" #include "pa_vfile.h" +#include "pa_dictionary.h" + +#ifdef XML +# include +# include +# include +# include +#endif /// 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&); + +inline 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; +} +inline 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; + } +} +inline unsigned int to_wchar_code(const String *s) { + if(!s || s->size()==0) + return 0; + if(s->size()==1) + return (unsigned int)s->first_char(); + return (unsigned int)s->as_int(); +} +inline bool to_bool(const String *s) { + return s && s->size()!=0; +} +static void element2ctypes(unsigned char c, bool belongs, + unsigned char *tables, unsigned char bit, int group_offset=-1) { + if(!belongs) + return; + + unsigned char *ctypes_table=tables+ctypes_offset; + + ctypes_table[c]|=bit; + if(group_offset>=0) + tables[cbits_offset+group_offset+c/8] |= 1 << (c%8); +} +static void element2case(unsigned char from, unsigned char to, + unsigned char *tables) { + if(!to) + return; + + unsigned char *lcc_table=tables+lcc_offset; + unsigned char *fcc_table=tables+fcc_offset; + lcc_table[from]=to; + fcc_table[from]=to; fcc_table[to]=from; +} + +#ifndef DOXYGEN +struct CTYPE_Tables { + // pcre_tables + unsigned char *pcre_tables; +#ifdef XML + // transcoder + XMLCh *fromTable; + XMLTransService::TransRec *toTable; + unsigned int toTableSz; +#endif +}; +#endif + +static void ctype_table_row_to_CTYPE_tables(Array::Item *value, void *info) { + Array& row=*static_cast(value); + CTYPE_Tables& tables=*static_cast(info); + +// char white-space digit hex-digit letter word lowercase unicode1 unicode2 + unsigned int c=to_wchar_code(row.get_string(0)); + + // pcre_tables + element2ctypes(c, to_bool(row.get_string(1)), tables.pcre_tables, ctype_space, cbit_space); + element2ctypes(c, to_bool(row.get_string(2)), tables.pcre_tables, ctype_digit, cbit_digit); + element2ctypes(c, to_bool(row.get_string(3)), tables.pcre_tables, ctype_xdigit); + element2ctypes(c, to_bool(row.get_string(4)), tables.pcre_tables, ctype_letter); + element2ctypes(c, to_bool(row.get_string(5)), tables.pcre_tables, ctype_word, cbit_word); + element2case(c, to_wchar_code(row.get_string(6)), tables.pcre_tables); + +#ifdef XML + XMLCh unicode1=row.size()>7?(XMLCh)to_wchar_code(row.get_string(7)):0; + XMLCh unicode2=row.size()>8?(XMLCh)to_wchar_code(row.get_string(8)):0; + tables.toTable[tables.toTableSz].intCh=unicode1?unicode1:(XMLCh)c; + tables.toTable[tables.toTableSz].extCh=(XMLByte)c; + tables.toTableSz++; + if(unicode2) { + tables.toTable[tables.toTableSz].intCh=unicode2; + tables.toTable[tables.toTableSz].extCh=(XMLByte)c; + tables.toTableSz++; + } +#endif +} +static int sort_cmp_Trans_rec_intCh(const void *a, const void *b) { + const XMLCh ca=static_cast(a)->intCh; + const XMLCh cb=static_cast(b)->intCh; + // move zeros to end of table + if(ca==0) + return +1; + if(cb==0) + return -1; + + return ca-cb; +} + + +#ifdef XML +template class ENameMapFor2 : public ENameMap +{ +public : + // ----------------------------------------------------------------------- + // Constructors and Destructor + // ----------------------------------------------------------------------- + ENameMapFor2( + const XMLCh* const encodingName + , const XMLCh* const fromTable + , const XMLTransService::TransRec* const toTable + , const unsigned int toTableSize + ) : ENameMap(encodingName), + ffromTable(fromTable), + ftoTable(toTable), + ftoTableSize(toTableSize) {} + ~ENameMapFor2() {} + + // ----------------------------------------------------------------------- + // Implementation of virtual factory method + // ----------------------------------------------------------------------- + virtual XMLTranscoder* makeNew(const unsigned int blockSize) const { + return new TType( + getKey(), + blockSize, + ffromTable, + ftoTable, ftoTableSize); + } +private: + const XMLCh* const ffromTable; + const XMLTransService::TransRec* const ftoTable; + const unsigned int ftoTableSize; + +private : + // ----------------------------------------------------------------------- + // Unimplemented constructors and operators + // ----------------------------------------------------------------------- + ENameMapFor2(); + ENameMapFor2(const ENameMapFor2&); + void operator=(const ENameMapFor2&); +}; + +class XML256TableTranscoder2 : public XML256TableTranscoder +{ +public : + XML256TableTranscoder2( + const XMLCh* const encodingName + , const unsigned int blockSize + , const XMLCh* const fromTable + , const XMLTransService::TransRec* const toTable + , const unsigned int toTableSize + ) : XML256TableTranscoder(encodingName, blockSize, fromTable, toTable, toTableSize) {} + +private : + XML256TableTranscoder2(); + XML256TableTranscoder2(const XML256TableTranscoder2&); + void operator=(const XML256TableTranscoder2&); +}; +#endif + +static void load_ctype_for_charset(const Hash::Key& akey, Hash::Val *avalue, + void *info) { + Hash& CTYPE=*static_cast(info); + Pool& pool=CTYPE.pool(); + + CTYPE_Tables tables={ + // pcre_tables + // lowcase, flipcase, bits digit+word+whitespace, masks + (unsigned char *)pool.calloc(tables_length) // pcre_tables +#ifdef XML + // transcoder + , (XMLCh *)pool.calloc(sizeof(XMLCh)*0x100) // fromTable + , 0 // toTable + , 0 // toTableSz +#endif + }; + prepare_case_tables(tables.pcre_tables); + cstr2ctypes(tables.pcre_tables, (const unsigned char *)"*+?{^.$|()[", ctype_meta); + + // fill tables + Value& value=*static_cast(avalue); + if(Table *table=value.get_table()) { +#ifdef XML + tables.toTable=(XMLTransService::TransRec *)pool.calloc( + sizeof(XMLTransService::TransRec)*table->size()*2); +#endif + table->for_each(ctype_table_row_to_CTYPE_tables, &tables); +#ifdef XML + // sort by the Unicode code point + _qsort(tables.toTable, tables.toTableSz, sizeof(*tables.toTable), + sort_cmp_Trans_rec_intCh); +#endif + } else + PTHROW(0, 0, + &value.name(), + "must be hash"); + + // charset->pcre_tables + CTYPE.put(akey, tables.pcre_tables); + +#ifdef XML + // charset->transcoder + XalanDOMString skey(akey.cstr()); + const XMLCh* const auto_encoding_cstr=skey.c_str(); + int size=sizeof(XMLCh)*(skey.size()+1); + XMLCh* pool_encoding_cstr=(XMLCh*)malloc(size); + memcpy(pool_encoding_cstr, auto_encoding_cstr, size); + XMLString::upperCase(pool_encoding_cstr); + + XMLPlatformUtils::fgTransService->addEncoding( + pool_encoding_cstr, + new ENameMapFor2( + pool_encoding_cstr + , tables.fromTable + , tables.toTable + , tables.toTableSz + )); + // delete sencoding; somehow +#endif +} + // Request::Request(Pool& apool, Info& ainfo, @@ -41,10 +273,12 @@ Request::Request(Pool& apool, OP(*MOP_create(apool)), env(apool), form(apool), + math(apool), request(apool, *this), response(apool), cookie(apool), fclasses(apool), + CTYPE(apool), fdefault_lang(adefault_lang), flang(adefault_lang), info(ainfo), post_data(0), post_size(0), @@ -53,8 +287,8 @@ Request::Request(Pool& apool, mime_types(0), main_class(0), connection(0), - pcre_tables(0), - classes_conf(apool) + classes_conf(apool), + anti_endless_execute_recoursion(0) { /// directly used // operators @@ -78,67 +312,10 @@ Request::Request(Pool& apool, /// 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; - } -} /** load MAIN class, execute @main. MAIN class consists of all the auto.p files we'd manage to find @@ -147,21 +324,22 @@ static void element2case(unsigned char * all located classes become children of one another, composing class we name 'MAIN' */ -void Request::core(const char *root_auto_path, bool root_auto_fail, - const char *site_auto_path, bool site_auto_fail, +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, bool header_only) { //_asm { int 3 } bool need_rethrow=false; Exception rethrow_me; TRY { char *auto_filespec=(char *)malloc(MAX_STRING); - // loading root auto.p - if(root_auto_path) { + // loading root config + if(root_config_filespec) { String& filespec=*NEW String(pool()); - filespec.APPEND_CLEAN(root_auto_path, 0, "root_auto", 0); - filespec.APPEND_CONST("/" AUTO_FILE_NAME); + filespec.APPEND_CLEAN(root_config_filespec, 0, "root_config", 0); main_class=use_file( - filespec, root_auto_fail, + filespec, + true/*ignore class_path*/, root_config_fail_on_read_problem, main_class_name, main_class); } @@ -170,13 +348,13 @@ void Request::core(const char *root_auto OP.configure_admin(*this); methoded_array->configure_admin(*this); - // loading site auto.p - if(site_auto_path) { + // loading site config + if(site_config_filespec) { String& filespec=*NEW String(pool()); - filespec.APPEND_CLEAN(site_auto_path, 0, "site_auto", 0); - filespec.APPEND_CONST("/" AUTO_FILE_NAME); + filespec.APPEND_CLEAN(site_config_filespec, 0, "site_config", 0); main_class=use_file( - filespec, site_auto_fail, + filespec, + true/*ignore class_path*/, site_config_fail_on_read_problem, main_class_name, main_class); } @@ -184,7 +362,6 @@ void Request::core(const char *root_auto // to the one beside requested file. // all assigned bases from upper dir { - Array ladder(pool()); const char *after=info.path_translated; size_t drlen=strlen(info.document_root); if(memcmp(after, info.document_root, drlen)==0) { @@ -193,28 +370,28 @@ void Request::core(const char *root_auto --after; } + int step=0; while(const char *before=strchr(after, '/')) { - String& step=*NEW String(pool()); + String& sfile_spec=*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; + sfile_spec.APPEND_CLEAN( + info.path_translated, before-info.path_translated, + "path-translated-scanned", step++); + sfile_spec << "/" AUTO_FILE_NAME; + + main_class=use_file(sfile_spec, + true/*ignore class_path*/, false/*ignore read problem*/, + main_class_name, main_class); } after=before+1; } - for(int i=ladder.size(); --i>=0; ) { - const String& sfile_spec=*ladder.get_string(i); - main_class=use_file(sfile_spec, false/*ignore read problem*/, - main_class_name, main_class); - } } // compile requested file String& spath_translated=*NEW String(pool()); - spath_translated.APPEND_CLEAN(info.path_translated, 0, "user-request", 0); - main_class=use_file(spath_translated, true/*don't ignore read problem*/, + spath_translated.APPEND_TAINTED(info.path_translated, 0, "user-request", 0); + main_class=use_file(spath_translated, + true/*ignore class_path*/, true/*don't ignore read problem*/, main_class_name, main_class); // configure not-root=user options @@ -226,59 +403,45 @@ void Request::core(const char *root_auto // 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; +#ifdef XML + // record default charset + if(default_content_type) + if(Hash *hash=default_content_type->get_hash()) + if(Value *vcharset=(Value *)hash->get(*charset_name)) + pool().set_charset(vcharset->as_string()); +#endif + if(Value *element=main_class->get_element(*user_html_name)) if(Table *table=element->get_table()) - pool().set_tag(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: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); + if(Value *vctype=main_class->get_element(*ctype_name)) { + if(Hash *ctype=vctype->get_hash()) + ctype->for_each(load_ctype_for_charset, &CTYPE); + else + THROW(0, 0, + &vctype->name(), + "must be hash"); } // filling form fields - form.fill_fields(*this); + form.fill_fields_and_tables(*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; @@ -289,7 +452,7 @@ void Request::core(const char *root_auto if(const Method *method=junction->method) { // preparing to pass parameters to // @postprocess[data] - VMethodFrame frame(pool(), value->name(), *junction, false); + VMethodFrame frame(pool(), value->name(), *junction); frame.set_self(*main_class); frame.store_param(method->name, @@ -298,13 +461,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 $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); @@ -339,6 +508,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(); @@ -354,7 +525,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(), value->name(), *junction, false); + VMethodFrame frame(pool(), value->name(), *junction); frame.set_self(*main_class); const String *problem_source=e.problem_source(); @@ -374,7 +545,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; @@ -385,7 +556,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(), @@ -400,7 +571,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 @@ -410,7 +581,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= @@ -455,7 +626,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 @@ -477,20 +648,53 @@ 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) // ignore_class_path? + file_spec=&file_name; + else if(file_name.first_char()=='/') //absolute path, no need to scan MAIN:CLASS_PATH? + file_spec=&absolute(file_name); + else { + file_spec=0; + if(main_class) + if(Value *element=main_class->get_element(*class_path_name)) { + if(element->is_string()) { + file_spec=file_readable(element->as_string(), file_name); // found at class_path? + } else 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); + if(file_spec=file_readable(path, file_name)) + break; // found along class_path + } + } else + THROW(0, 0, + &element->name(), + "must be string or table"); + if(!file_spec) + THROW(0, 0, + &file_name, + "not found along " MAIN_CLASS_NAME ":" CLASS_PATH_NAME); + } + if(!file_spec) + THROW(0, 0, + &file_name, + "usage failed - no " MAIN_CLASS_NAME ":" 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, @@ -500,7 +704,7 @@ 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; } @@ -597,4 +801,11 @@ 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 +} + +unsigned char *Request::pcre_tables() { + if(unsigned char *result=(unsigned char *)CTYPE.get(pool().get_charset())) + return result; + + return pcre_default_tables; +}