--- parser3/src/main/pa_request.C 2001/03/24 19:12:20 1.78 +++ parser3/src/main/pa_request.C 2001/04/05 18:23:00 1.97 @@ -5,11 +5,13 @@ Author: Alexander Petrosyan (http://design.ru/paf) - $Id: pa_request.C,v 1.78 2001/03/24 19:12:20 paf Exp $ + $Id: pa_request.C,v 1.97 2001/04/05 18:23:00 paf Exp $ */ #include "pa_config_includes.h" +#include + #include "pa_sapi.h" #include "pa_common.h" #include "pa_request.h" @@ -17,15 +19,24 @@ #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" +#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"; + // Request::Request(Pool& apool, Info& ainfo, @@ -40,8 +51,10 @@ 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), + connection(0), protocol2library(0) { // root superclass, // parent of all classes, @@ -50,7 +63,10 @@ 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); + // random class + classes().put(*random_class_name, random_class); // env class classes().put(*env_class_name, &env); // form class @@ -85,6 +101,8 @@ 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' + + @todo figure out 'setlocale' thread safety */ void Request::core(const char *root_auto_path, bool root_auto_fail, const char *site_auto_path, bool site_auto_fail, @@ -97,20 +115,20 @@ void Request::core(const char *root_auto // loading root auto.p if(root_auto_path) { String& filespec=*NEW String(pool()); - filespec.APPEND(root_auto_path, 0, "root_auto", 0); + filespec.APPEND_CLEAN(root_auto_path, 0, "root_auto", 0); filespec.APPEND_CONST("/" AUTO_FILE_NAME); main_class=use_file( 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; // $limits.post_max_size default 10M Value *element=limits?limits->get_element(*post_max_size_name):0; - size_t value=element?(size_t)element->get_double():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); @@ -122,7 +140,7 @@ void Request::core(const char *root_auto // loading site auto.p if(site_auto_path) { String& filespec=*NEW String(pool()); - filespec.APPEND(site_auto_path, 0, "site_auto", 0); + filespec.APPEND_CLEAN(site_auto_path, 0, "site_auto", 0); filespec.APPEND_CONST("/" AUTO_FILE_NAME); main_class=use_file( filespec, site_auto_fail, @@ -136,14 +154,17 @@ void Request::core(const char *root_auto /* /document/root */ char *file_spec= (char *)malloc(strlen(info.path_translated)+strlen(AUTO_FILE_NAME)+1); - strcpy(file_spec, 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=file_spec+strlen(file_spec); size_t slash_auto_p_size=strlen("/" AUTO_FILE_NAME); while(true) { char *step=lsplit(&next, '/'); @@ -155,7 +176,7 @@ void Request::core(const char *root_auto append_here++/* / */; String& sfile_spec=*NEW String(pool()); - sfile_spec.APPEND(file_spec, 0, "scanned", 0); + 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 @@ -165,20 +186,46 @@ void Request::core(const char *root_auto // compiling requested file String& spath_translated=*NEW String(pool()); - spath_translated.APPEND(info.path_translated, 0, "user-request", 0); + 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 + // $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(VTable *vtable=element->get_vtable()) - pool().set_tag(&vtable->table()); + 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(); + + // $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"); + } // execute @main[] const String *body_string=execute_method(*main_class, *main_method_name); @@ -187,14 +234,34 @@ void Request::core(const char *root_auto 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 + 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); + frame.set_self(*main_class); + + frame.store_param(method->name, + &body_vstring_before_post_process); + body_vstring_after_post_process= + NEW VString(*execute_method(frame, *method)); + } + + const VFile *body_file=body_vstring_after_post_process->as_vfile(); + // extract response body Value *body_value=static_cast( response.fields().get(*body_name)); if(body_value) // there is some $request.body - body_string=&body_value->as_string();// TODO: IMAGE&FILE + body_file=body_value->as_vfile(); // OK. write out the result - output_result(*body_string, header_only); + output_result(*body_file, header_only); } CATCH(e) { // request handling problem // we're returning not result, but error explanation @@ -246,7 +313,6 @@ void Request::core(const char *root_auto const String *problem_source=e.problem_source(); // origin - String origin_name(pool(), "origin"); Value *origin_value=0; #ifndef NO_STRING_ORIGIN if(problem_source) { @@ -261,11 +327,10 @@ void Request::core(const char *root_auto } } #endif - frame.store_param(origin_name, + frame.store_param(method->name, origin_value?origin_value:NEW VUnknown(pool())); // source - String source_name(pool(), "source"); Value *source_value=0; if(problem_source) { String& problem_source_copy=*NEW String(pool()); @@ -273,18 +338,16 @@ void Request::core(const char *root_auto flang, true); source_value=NEW VString(problem_source_copy); } - frame.store_param(source_name, + frame.store_param(method->name, source_value?source_value:NEW VUnknown(pool())); // comment - String comment_name(pool(), "comment"); String *comment_value=NEW String(pool(), e.comment(), true); - frame.store_param(comment_name, + frame.store_param(method->name, NEW VString(*comment_value)); // type - String type_name(pool(), "type"); Value *type_value; if(e.type()) { String& type_copy=*NEW String(pool()); @@ -292,10 +355,9 @@ void Request::core(const char *root_auto flang, true)); } else type_value=NEW VUnknown(pool()); - frame.store_param(type_name, type_value); + frame.store_param(method->name, type_value); // code - String code_name(pool(), "code"); Value *code_value; if(e.code()) { String& code_copy=*NEW String(pool()); @@ -303,7 +365,7 @@ void Request::core(const char *root_auto flang, true)); } else code_value=NEW VUnknown(pool()); - frame.store_param(code_name, code_value); + frame.store_param(method->name, code_value); // future $response:body= // execute ^exception[origin;source;comment;type;code] @@ -342,13 +404,16 @@ 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); } + const VString body_vstring(*body_string); + const VFile *body_file=body_vstring.as_vfile(); + // ERROR. write it out - output_result(*body_string, header_only); + output_result(*body_file, header_only); } CATCH(e) { // exception in request exception handler @@ -360,11 +425,10 @@ void Request::core(const char *root_auto END_CATCH // do not use pool() after this point - no exception handler set // any throw() would try to use zero exception() pointer - if(need_rethrow) // there were an exception set for us to rethrow? + if(need_rethrow) // were there an exception for us to rethrow? 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, @@ -428,19 +492,35 @@ const String& Request::absolute(const St return relative(info.path_translated, relative_name); } -void Request::output_result(const String& body_string, bool header_only) { +void Request::output_result(const VFile& body_file, bool header_only) { // header: cookies cookie.output_result(); - // set default content-type - response.fields().put_dont_replace(*content_type_name, default_content_type); + // set content-type + if(String *body_file_content_type=static_cast( + body_file.fields().get(*vfile_mime_type_name))) { + // body file content type + response.fields().put(*content_type_name, body_file_content_type); + } else { + // 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))); + } + + // 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); + } // prepare header: $response:fields without :body response.fields().for_each(add_header_attribute, /*excluding*/ body_name); // prepare... - const char *body=body_string.cstr(); - size_t content_length=strlen(body); + const void *body=body_file.value_ptr(); + size_t content_length=body_file.value_size(); // prepare header: content-length if(content_length) { // useful for redirecting [header "location: http://..."]