--- parser3/src/main/pa_request.C 2001/03/20 18:24:44 1.61.2.2 +++ parser3/src/main/pa_request.C 2001/03/24 08:54:03 1.72 @@ -5,11 +5,12 @@ Author: Alexander Petrosyan (http://design.ru/paf) - $Id: pa_request.C,v 1.61.2.2 2001/03/20 18:24:44 paf Exp $ + $Id: pa_request.C,v 1.72 2001/03/24 08:54:03 paf Exp $ */ -#include +#include "pa_config_includes.h" +#include "pa_sapi.h" #include "pa_common.h" #include "pa_request.h" #include "pa_wwrapper.h" @@ -21,6 +22,10 @@ #include "pa_vmframe.h" #include "pa_types.h" +/// $limits.post_max_size default 10M +const size_t MAX_POST_SIZE_DEFAULT=10*0x400*400; + +// Request::Request(Pool& apool, Info& ainfo, String::Untaint_lang adefault_lang) : Pooled(apool), @@ -56,85 +61,107 @@ Request::Request(Pool& apool, classes().put(*cookie_class_name, &cookie); } -static void output_response_attribute(const Hash::Key& aattribute, Hash::Val *ameaning, - void *info) { +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; - String attribute(aattribute.pool()); - attribute.append(aattribute, String::UL_HEADER, true); + Value& lmeaning=*static_cast(ameaning); + Pool& pool=lmeaning.pool(); - (*service_funcs.output_header_attribute)( - attribute.cstr(), - attributed_meaning_string(static_cast(ameaning)).cstr()); + String attribute(pool); + SAPI::add_header_attribute(pool, + attribute.append(aattribute, String::UL_HEADER, true).cstr(), + attributed_meaning_to_string(lmeaning).cstr()); } -void Request::core(Exception& system_exception, - const char *sys_auto_path1, - const char *sys_auto_path2) { +/** + load MAIN class, execute @main. + MAIN class consists of all the auto.p files we'd manage to find + plus + the file user requested us to process + 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, + bool header_only) { VStateless_class *main_class=0; bool need_rethrow=false; Exception rethrow_me; TRY { char *auto_filespec=(char *)malloc(MAX_STRING); - // load MAIN class, - // it consists of all the auto.p files we'd manage to find - // plus - // the file user requested us to process - // all located classes become children of one another, - // composing class we name 'MAIN' - - // loading system auto.p 1 - if(sys_auto_path1) { - strncpy(auto_filespec, sys_auto_path1, MAX_STRING-strlen(AUTO_FILE_NAME)); - strcat(auto_filespec, AUTO_FILE_NAME); - main_class=use_file( - auto_filespec, false/*ignore possible read problem*/, - main_class_name, main_class); - } - - // loading system auto.p 2 - if(sys_auto_path2) { - strncpy(auto_filespec, sys_auto_path2, MAX_STRING-strlen(AUTO_FILE_NAME)); - strcat(auto_filespec, AUTO_FILE_NAME); + // 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); main_class=use_file( - auto_filespec, false/*ignore possible read problem*/, + auto_filespec, root_auto_fail, main_class_name, main_class); } - Value *element; // $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; - int value=element?(size_t)element->get_double():0; - int post_max_size=value?value:10*0x400*400; + size_t value=element?(size_t)element->get_double():0; + size_t post_max_size=value?value:MAX_POST_SIZE_DEFAULT; form.fill_fields(*this, post_max_size); cookie.fill_fields(*this); - // TODO: load site auto.p files, all assigned bases from upper dir - /*char *site_auto_file="Y:\\parser3\\src\\auto.p"; - main_class=use_file( - site_auto_file, false/*ignore possible read problem* /, - main_class_name, main_class);*/ - - // $MAIN:defaults - Value *defaults=main_class?main_class->get_element(*defaults_name):0; - fdefault_content_type=defaults?defaults->get_element(*content_type_name):0; + // 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); + main_class=use_file( + auto_filespec, site_auto_fail, + main_class_name, main_class); + } - // there must be some auto.p - if(!main_class) - THROW(0,0, - 0, - "no 'auto.p' found (nither system nor any site's)"); + // loading auto.p files from document_root/.. + // to the one beside requested file. + // all assigned bases from upper dir + { + /* /document/root */ + char *monkey_auto_path= + (char *)malloc(strlen(info.path_translated)+strlen(AUTO_FILE_NAME)+1); + strcpy(monkey_auto_path, info.document_root); + + /* /requested/file.html */ + char *branches=(char *)malloc(strlen(info.path_translated)+1); + strcpy(branches, info.path_translated+strlen(info.document_root)); + char *next=branches; + + 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, '/'); + 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++/* / */; + + main_class=use_file(monkey_auto_path, false/*ignore read problem*/, + main_class_name, main_class); + } else + break; + } + } // compiling requested file main_class=use_file(info.path_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; + fdefault_content_type=defaults?defaults->get_element(*content_type_name):0; + // execute @main[] const String *body_string=execute_method(*main_class, *main_method_name); if(!body_string) @@ -149,7 +176,7 @@ void Request::core(Exception& system_exc body_string=&body_value->as_string();// TODO: IMAGE&FILE // OK. write out the result - output_result(*body_string); + output_result(*body_string, header_only); } CATCH(e) { TRY { @@ -279,7 +306,7 @@ void Request::core(Exception& system_exc } // ERROR. write it out - output_result(*body_string); + output_result(*body_string, header_only); } CATCH(e) { // exception in request exception handler @@ -292,15 +319,14 @@ void Request::core(Exception& system_exc // any throw() would try to use zero exception() pointer if(need_rethrow) // there were an exception set for us to rethrow? - system_exception._throw(rethrow_me.type(), rethrow_me.code(), + THROW(rethrow_me.type(), rethrow_me.code(), rethrow_me.problem_source(), rethrow_me.comment()); } /// @todo find|solve cyclic dependences -VStateless_class *Request::use_file( - const char *file, bool fail_on_read_problem, +VStateless_class *Request::use_file(const char *file, bool fail_on_read_problem, const String *name, VStateless_class *base_class) { char *source=file_read_text(pool(), file, fail_on_read_problem); @@ -310,8 +336,7 @@ VStateless_class *Request::use_file( return use_buf(source, file, 0/*new class*/, name, base_class); } -VStateless_class *Request::use_buf( - const char *source, const char *file, +VStateless_class *Request::use_buf(const char *source, const char *file, VStateless_class *aclass, const String *name, VStateless_class *base_class) { // compile loaded class @@ -338,8 +363,8 @@ void Request::fail_if_junction_(bool is, char *Request::relative(const char *path, const char *file) { char *result=(char *)malloc(strlen(path)+strlen(file)+1); strcpy(result, path); - rsplit(result, PATH_DELIMITER_CHAR); - strcat(result, PATH_DELIMITER_STRING); + rsplit(result, '/'); + strcat(result, "/"); strcat(result, file); return result; } @@ -354,7 +379,7 @@ char *Request::absolute(const char *name return relative(info.path_translated, name); } -void Request::output_result(const String& body_string) { +void Request::output_result(const String& body_string, bool header_only) { // header: cookies cookie.output_result(); @@ -362,17 +387,24 @@ void Request::output_result(const String if(fdefault_content_type) response.fields().put_dont_replace(*content_type_name, fdefault_content_type); - // header: $response:fields without :body - response.fields().foreach(output_response_attribute, /*excluding*/ body_name); + // prepare header: $response:fields without :body + response.fields().foreach(add_header_attribute, /*excluding*/ body_name); - // prepare + // prepare... const char *body=body_string.cstr(); size_t content_length=strlen(body); - // header: content-length - char content_length_cstr[MAX_NUMBER]; - snprintf(content_length_cstr, MAX_NUMBER, "%d", content_length); - (*service_funcs.output_header_attribute)("content-length", content_length_cstr); - // body - (*service_funcs.output_body)(body, content_length); + // 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); + SAPI::add_header_attribute(pool(), "content-length", content_length_cstr); + } + + // send header + SAPI::send_header(pool()); + + // send body + if(!header_only) + SAPI::send_body(pool(), body, content_length); }