--- parser3/src/main/pa_request.C 2001/03/24 14:30:59 1.76 +++ parser3/src/main/pa_request.C 2001/03/29 15:00:22 1.88 @@ -5,7 +5,7 @@ Author: Alexander Petrosyan (http://design.ru/paf) - $Id: pa_request.C,v 1.76 2001/03/24 14:30:59 paf Exp $ + $Id: pa_request.C,v 1.88 2001/03/29 15:00:22 paf Exp $ */ #include "pa_config_includes.h" @@ -17,14 +17,22 @@ #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_types.h" +#include "pa_vtable.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"; + // Request::Request(Pool& apool, Info& ainfo, @@ -39,8 +47,9 @@ Request::Request(Pool& apool, fclasses(apool), fdefault_lang(adefault_lang), flang(adefault_lang), info(ainfo), + used_files(apool), default_content_type(0), - used_files(apool) + mime_types(0) { // root superclass, // parent of all classes, @@ -49,7 +58,8 @@ Request::Request(Pool& apool, classes().put(*root_class_name, &ROOT); // table class classes().put(*table_class_name, table_class); - + // file class + classes().put(*file_class_name, file_class); // env class classes().put(*env_class_name, &env); // form class @@ -95,31 +105,36 @@ void Request::core(const char *root_auto // loading root auto.p if(root_auto_path) { - strncpy(auto_filespec, root_auto_path, MAX_STRING-strlen("/" AUTO_FILE_NAME)); - strcat(auto_filespec, "/" AUTO_FILE_NAME); + String& filespec=*NEW String(pool()); + filespec.APPEND_CLEAN(root_auto_path, 0, "root_auto", 0); + filespec.APPEND_CONST("/" AUTO_FILE_NAME); main_class=use_file( - auto_filespec, root_auto_fail, + filespec, root_auto_fail, main_class_name, main_class); } - // $MAIN:limits hash used here, + // $MAIN:LIMITS hash used here, // until someone with less privileges have overriden them - Value *limits=main_class?main_class->get_element(*limits_name):0; - Value *element; - // $limits.post_max_size default 10M - element=limits?limits->get_element(*post_max_size_name):0; - size_t value=element?(size_t)element->get_double():0; - size_t post_max_size=value?value:MAX_POST_SIZE_DEFAULT; + { + 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); + } - form.fill_fields(*this, post_max_size); + // filling cookies cookie.fill_fields(*this); // loading site auto.p if(site_auto_path) { - strncpy(auto_filespec, site_auto_path, MAX_STRING-strlen("/" AUTO_FILE_NAME)); - strcat(auto_filespec, "/" AUTO_FILE_NAME); + String& filespec=*NEW String(pool()); + filespec.APPEND_CLEAN(site_auto_path, 0, "site_auto", 0); + filespec.APPEND_CONST("/" AUTO_FILE_NAME); main_class=use_file( - auto_filespec, site_auto_fail, + filespec, site_auto_fail, main_class_name, main_class); } @@ -128,16 +143,19 @@ void Request::core(const char *root_auto // all assigned bases from upper dir { /* /document/root */ - char *monkey_auto_path= + char *file_spec= (char *)malloc(strlen(info.path_translated)+strlen(AUTO_FILE_NAME)+1); - strcpy(monkey_auto_path, info.document_root); + 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+strlen(info.document_root)); + strcpy(branches, info.path_translated+document_root_size); char *next=branches; + char *append_here=file_spec+document_root_size; - char *append_here=monkey_auto_path+strlen(monkey_auto_path); size_t slash_auto_p_size=strlen("/" AUTO_FILE_NAME); while(true) { char *step=lsplit(&next, '/'); @@ -148,7 +166,9 @@ void Request::core(const char *root_auto memcpy(append_here, "/" AUTO_FILE_NAME, slash_auto_p_size+1); append_here++/* / */; - main_class=use_file(monkey_auto_path, false/*ignore read problem*/, + 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; @@ -156,16 +176,24 @@ void Request::core(const char *root_auto } // compiling requested file - main_class=use_file(info.path_translated, true/*don't ignore read problem*/, + 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*/, main_class_name, main_class); - // $MAIN:defaults - Value *defaults=main_class?main_class->get_element(*defaults_name):0; + // $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) - :NEW VString(*NEW String(pool(), "text/html")); + default_content_type=defaults?defaults->get_element(*content_type_name):0; + if(Value *element=main_class->get_element(*html_typo_name)) + if(Table *table=element->get_table()) + pool().set_tag(table); + + // $MAIN:MIME-TYPES + if(Value *element=main_class->get_element(*mime_types_name)) + if(Table *table=element->get_table()) + mime_types=table; // execute @main[] const String *body_string=execute_method(*main_class, *main_method_name); @@ -174,6 +202,9 @@ void Request::core(const char *root_auto 0, "'"MAIN_METHOD_NAME"' method not found"); + // post-process + // todo + // extract response body Value *body_value=static_cast( response.fields().get(*body_name)); @@ -329,7 +360,7 @@ void Request::core(const char *root_auto // future $response:content-type response.fields().put(*content_type_name, - NEW VString(*NEW String(pool(), "text/plain"))); + NEW VString(*NEW String(pool(), UNHANDLED_EXCEPTION_CONTENT_TYPE))); // future $response:body body_string=NEW String(pool(), buf); } @@ -354,21 +385,20 @@ void Request::core(const char *root_auto } -VStateless_class *Request::use_file(const char *file, bool fail_on_read_problem, +VStateless_class *Request::use_file(const String& file_spec, bool fail_on_read_problem, const String *name, VStateless_class *base_class) { // cyclic dependence check - String& sfile=*NEW String(pool(), file); - if(used_files.get(sfile)) + if(used_files.get(file_spec)) return base_class; - used_files.put(sfile, (Hash::Val *)true); + used_files.put(file_spec, (Hash::Val *)true); - char *source=file_read_text(pool(), file, 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, 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, @@ -395,23 +425,25 @@ void Request::fail_if_junction_(bool is, msg); } -char *Request::relative(const char *path, const char *file) { - char *result=(char *)malloc(strlen(path)+strlen(file)+1); - strcpy(result, path); - rsplit(result, '/'); - strcat(result, "/"); - strcat(result, file); +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, '/'); + String& result=*NEW String(pool(), lpath); + result.APPEND_CONST("/"); + result.append(relative_name, String::UL_PASS_APPENDED); return result; } -char *Request::absolute(const char *name) { - if(name[0]=='/') { - char *result=(char *)malloc(strlen(info.document_root)+strlen(name)+1); - strcpy(result, info.document_root); - strcat(result, name); +const String& Request::absolute(const String& relative_name) { + 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); return result; } else - return relative(info.path_translated, name); + return relative(info.path_translated, relative_name); } void Request::output_result(const String& body_string, bool header_only) { @@ -419,7 +451,9 @@ void Request::output_result(const String cookie.output_result(); // set default content-type - response.fields().put_dont_replace(*content_type_name, default_content_type); + response.fields().put_dont_replace(*content_type_name, + default_content_type?default_content_type + :NEW VString(*NEW String(pool(), DEFAULT_CONTENT_TYPE))); // prepare header: $response:fields without :body response.fields().for_each(add_header_attribute, /*excluding*/ body_name);