--- parser3/src/main/pa_request.C 2001/04/05 19:35:16 1.98 +++ parser3/src/main/pa_request.C 2001/04/11 15:45:51 1.112 @@ -5,7 +5,7 @@ Author: Alexander Petrosyan (http://design.ru/paf) - $Id: pa_request.C,v 1.98 2001/04/05 19:35:16 paf Exp $ + $Id: pa_request.C,v 1.112 2001/04/11 15:45:51 paf Exp $ */ #include "pa_config_includes.h" @@ -17,18 +17,21 @@ #include "pa_request.h" #include "pa_wwrapper.h" #include "pa_vclass.h" -#include "_root.h" +#include "_op.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" +#include "_mail.h" +#include "_exec.h" +#include "_image.h" -/// $limits.post_max_size default 10M +/// $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 @@ -42,7 +45,7 @@ Request::Request(Pool& apool, Info& ainfo, String::Untaint_lang adefault_lang) : Pooled(apool), stack(apool), - ROOT(apool), + OP(apool), env(apool), form(apool), request(apool, *this), @@ -51,16 +54,18 @@ Request::Request(Pool& 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), - connection(0), protocol2library(0) + connection(0), protocol2library(0), + mail(0) { // root superclass, // parent of all classes, // operators holder - initialize_root_class(pool(), ROOT); - classes().put(*root_class_name, &ROOT); + initialize_op_class(pool(), OP); + classes().put(*op_class_name, &OP); // table class classes().put(*table_class_name, table_class); // file class @@ -77,21 +82,10 @@ Request::Request(Pool& apool, classes().put(*response_class_name, &response); // cookie class classes().put(*cookie_class_name, &cookie); -} - -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(); - - String attribute(pool); - SAPI::add_header_attribute(pool, - attribute.append(aattribute, String::UL_HEADER, true).cstr(), - attributed_meaning_to_string(lmeaning).cstr()); + // mail class + classes().put(*mail_class_name, mail_class); + // image class + classes().put(*image_class_name, image_class); } /** @@ -102,7 +96,7 @@ static void add_header_attribute(const H all located classes become children of one another, composing class we name 'MAIN' - @todo figure out 'setlocale' thread safety + @test get read of setlocale */ void Request::core(const char *root_auto_path, bool root_auto_fail, const char *site_auto_path, bool site_auto_fail, @@ -126,12 +120,25 @@ void Request::core(const char *root_auto // 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); + if(info.method && StrEqNc(info.method, "post", true)) { + // $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; + + if(size_t limit=max(0, min(info.content_length, post_max_size))) { + // read POST data + post_data=(char *)malloc(limit); + post_size=SAPI::read_post(pool(), post_data, limit); + if(post_size!=limit) + THROW(0, 0, + 0, + "post_size(%d)!=limit(%d)", + post_size, limit); + } + } + + form.fill_fields(*this); } // filling cookies @@ -227,6 +234,14 @@ void Request::core(const char *root_auto "locale is invalid"); } + // $MAIN:MAIL[$SMTP[mail.design.ru]] + if(Value *mail_element=main_class->get_element(*mail_name)) + if(!(mail=mail_element->get_hash())) + THROW(0, 0, + 0, + "$MAIN:MAIL is not hash"); + + // execute @main[] const String *body_string=execute_method(*main_class, *main_method_name); if(!body_string) @@ -278,17 +293,17 @@ 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 @@ -319,10 +334,10 @@ void Request::core(const char *root_auto 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); } } @@ -343,7 +358,7 @@ void Request::core(const char *root_auto // comment String *comment_value=NEW String(pool(), - e.comment(), true); + e.comment(), 0, true); frame.store_param(method->name, NEW VString(*comment_value)); @@ -388,18 +403,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 @@ -477,8 +492,7 @@ const String& Request::relative(const ch 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); + result << "/" << relative_name; return result; } @@ -486,12 +500,26 @@ 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(); + + String attribute(pool); + SAPI::add_header_attribute(pool, + attribute.append(aattribute, String::UL_HTTP_HEADER, true).cstr(), + 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(); @@ -509,11 +537,12 @@ void Request::output_result(const VFile& } // 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); - } + 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); @@ -525,7 +554,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); } @@ -536,3 +565,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"); +} \ No newline at end of file