--- parser3/src/main/pa_request.C 2004/07/30 10:55:22 1.269 +++ parser3/src/main/pa_request.C 2005/11/21 11:30:27 1.277 @@ -1,11 +1,11 @@ /** @file Parser: request class main part. @see compile.C and execute.C. - Copyright (c) 2001-2004 ArtLebedev Group (http://www.artlebedev.com) + Copyright (c) 2001-2005 ArtLebedev Group (http://www.artlebedev.com) Author: Alexandr Petrosian (http://paf.design.ru) */ -static const char * const IDENT_REQUEST_C="$Date: 2004/07/30 10:55:22 $"; +static const char * const IDENT_REQUEST_C="$Date: 2005/11/21 11:30:27 $"; #include "pa_sapi.h" #include "pa_common.h" @@ -53,7 +53,6 @@ const char* ORIGINS_CONTENT_TYPE="text/p #define EXCEPTION_TYPE_PART_NAME "type" #define EXCEPTION_SOURCE_PART_NAME "source" #define EXCEPTION_COMMENT_PART_NAME "comment" -#define RESPONSE_BODY_FILE_NAME "file" // globals @@ -67,7 +66,6 @@ const String exception_type_part_name(EX const String exception_source_part_name(EXCEPTION_SOURCE_PART_NAME); const String exception_comment_part_name(EXCEPTION_COMMENT_PART_NAME); const String exception_handled_part_name(EXCEPTION_HANDLED_PART_NAME); -const String response_body_file_name(RESPONSE_BODY_FILE_NAME); // defines for statics @@ -78,6 +76,7 @@ const String response_body_file_name(RES #define POST_PROCESS_METHOD_NAME "postprocess" #define DOWNLOAD_NAME "download" #define CLASS_PATH_NAME "CLASS_PATH" +#define RESPONSE_BODY_FILE_NAME "file" // statics @@ -89,6 +88,7 @@ static const String conf_method_name(CON static const String post_process_method_name(POST_PROCESS_METHOD_NAME); static const String download_name(DOWNLOAD_NAME); static const String class_path_name(CLASS_PATH_NAME); +static const String response_body_file_name(RESPONSE_BODY_FILE_NAME); // defines @@ -271,6 +271,20 @@ const char* Request::get_exception_cstr( return result; } + +void Request::configure() { + // configure admin options if not configured yet + if(!configure_admin_done) + configure_admin(main_class); + + // configure not-admin=user options + methoded_array().configure_user(*this); + + // $MAIN:MIME-TYPES + if(Value* element=main_class.get_element(mime_types_name, main_class, false)) + if(Table *table=element->get_table()) + mime_types=table; +} /** load MAIN class, execute @main. MAIN class consists of all the auto.p files we'd manage to find @@ -290,6 +304,12 @@ struct timeval mt[10]; gettimeofday(&mt[0],NULL); #endif try { + // filling cookies + cookie.fill_fields(request_info); + + // filling mail received + mail.fill_received(*this); + // loading config if(config_filespec) { const String& filespec=*new String(config_filespec); @@ -331,31 +351,20 @@ gettimeofday(&mt[0],NULL); } } - // compile requested file - String& spath_translated=*new String; - spath_translated.append_help_length(request_info.path_translated, 0, String::L_TAINTED); - use_file(main_class, - spath_translated, - 0 /*main_alias*/, - true /*ignore class_path*/); - - // configure method_frame options if not configured yet - if(!configure_admin_done) - configure_admin(main_class); - - // configure not-method_frame=user options - methoded_array().configure_user(*this); - - // $MAIN:MIME-TYPES - if(Value* element=main_class.get_element(mime_types_name, main_class, false)) - if(Table *table=element->get_table()) - mime_types=table; - - // filling cookies - cookie.fill_fields(request_info); - - // filling mail received - mail.fill_received(*this); + try { + // compile requested file + String& spath_translated=*new String; + spath_translated.append_help_length(request_info.path_translated, 0, String::L_TAINTED); + use_file(main_class, + spath_translated, + 0 /*main_alias*/, + true /*ignore class_path*/); + + configure(); + } catch(...) { + configure(); // configure anyway, useful in @unhandled_exception [say, if they would want to mail by SMTP something] + rethrow; + } #ifdef RESOURCES_DEBUG //measure:after compile @@ -380,6 +389,13 @@ gettimeofday(&mt[2],NULL); body_value=response.fields().get(body_name); // $response:body if(!body_value) body_value=new VString(*body_string); // just result of ^main[] + // ensure that body_value has no just L_TAINTED parts left + if(body_value->is_string()) + { + String& untainted=*new String(); + untainted.append(*body_value->get_string(), flang); + body_value=new VString(untainted); + } // @postprocess if(Value* value=main_class.get_element(post_process_method_name, main_class, false)) @@ -429,8 +445,6 @@ t[9]-t[3] Request::Exception_details details=get_details(e); const char* exception_cstr=get_exception_cstr(e, details); - // log the beast - SAPI::log(sapi_info, "%s", exception_cstr); // reset language to default flang=fdefault_lang; @@ -499,11 +513,19 @@ body_string=&execute_method(frame, *meth VString body_vstring(*body_string); VFile* body_file=body_vstring.as_vfile(String::L_UNSPECIFIED, &charsets); + // conditionally log it + Value* vhandled=details.vhash.hash().get(exception_handled_part_name); + if(!vhandled || !vhandled->as_bool()) { + SAPI::log(sapi_info, "%s", exception_cstr); + } + // ERROR. write it out output_result(body_file, header_only, false); - } catch(const Exception& e) { + } catch(const Exception& e) { // exception in unhandled exception Request::Exception_details details=get_details(e); const char* exception_cstr=get_exception_cstr(e, details); + // unconditionally log the beast + SAPI::log(sapi_info, "%s", exception_cstr); throw Exception(0, 0, @@ -651,139 +673,6 @@ static void add_header_attribute( info->add_last_modified = false; } -/* - if(v = opts->get("mdate")){ - ++valid_options; - if(Value* vdate=v->as(VDATE_TYPE, false)) - date=static_cast(vdate); - else throw Exception("parser.runtime", 0, "mdate must be a date"); - } - if(v = opts->get("disposition")){ - ++valid_options; - if(!v->is("string")) throw Exception("parser.runtime", 0, "disposition must be a string"); - disposition = v->get_string()->cstr(); - if(strcmp(disposition, "inline") && strcmp(disposition, "attachment")) throw Exception("parser.runtime", 0, "disposition can be only 'inline' or 'attachment'"); - } - if(valid_options != opts->count()) - throw Exception("parser.runtime", 0, "invalid option passed"); - } - - auto_file f = fopen(c_from_file_name, "rb"); - if(f == 0) - throw Exception("parser.runtime", 0, "Can't open file"); - - if(fseek(f, 0, SEEK_END)!=0) - throw Exception("parser.runtime", 0, "Can't seek file"); - - size_t file_length = (size_t)ftell(f); - if(file_length == (size_t)-1) - throw Exception("parser.runtime", 0, "can't get file size"); - if(file_length <= offset) - throw Exception("parser.runtime", 0, "offset too big"); - - size_t content_length = file_length-offset; - if(limit != (size_t)-1) - content_length = limit ar; - parse_range(new String(range), ar); - size_t count = ar.count(); - if(count == 1){ - Range &rg = ar.get_ref(0); - if(rg.start == (size_t)-1 && rg.end == (size_t)-1){ - SAPI::add_header_attribute(r.sapi_info, "status", "416 Requested Range Not Satisfiable"); - return; - } - if(rg.start == (size_t)-1 && rg.end != (size_t)-1){ - rg.start = content_length - rg.end; - rg.end = content_length; - offset += rg.start; - part_length = rg.end-rg.start; - }else if(rg.start != (size_t)-1 && rg.end == (size_t)-1){ - rg.end = content_length-1; - offset += rg.start; - part_length -= rg.start; - } - if(part_length == 0){ - SAPI::add_header_attribute(r.sapi_info, "status", "204 No Content"); - return; - } - SAPI::add_header_attribute(r.sapi_info, "status", "206 Partial Content"); - snprintf((char*)buf, BUFSIZE, "bytes %u-%u/%u", rg.start, rg.end, content_length); - SAPI::add_header_attribute(r.sapi_info, "Content-Range", (char*)buf); - }else if(count != 0){ - SAPI::add_header_attribute(r.sapi_info, "status", "501 Not Implemented"); - return; - } - } - - fseek(f, offset, SEEK_SET); - snprintf((char*)buf, BUFSIZE, "%u", part_length); - SAPI::add_header_attribute(r.sapi_info, "Content-Length", (char*)buf); - - if(info.add_content_disposition && disposition){ - const char *fname = 0; - if(to_file_name){ - fname = to_file_name->as_string().cstr(); - }else{ - const char *fname = c_from_file_name; - const char *p1 = strrchr(fname, '/'); - const char *p2 = strrchr(fname, '\\'); - if(p1 || p2) - fname = max(p1, p2)+1; - } - - snprintf((char*)buf, BUFSIZE, "%s; filename=\"%s\"", disposition, fname); - SAPI::add_header_attribute(r.sapi_info, "Content-Disposition", (char*)buf); - } - if(info.add_content_type) - SAPI::add_header_attribute(r.sapi_info, "Content-Type", r.mime_type_of(c_from_file_name).cstr()); - if(info.add_last_modified){ - if(date == 0){ - struct stat st; - if(stat(c_from_file_name, &st)!=0) throw Exception("parser.runtime", 0, "can't get file stat"); - date = new VDate(st.st_mtime); - } - const String &s = attributed_meaning_to_string(*date, String::L_AS_IS, true); - SAPI::add_header_attribute(r.sapi_info, "Last-Modified", s.cstr()); - } - r.cookie.output_result(r.sapi_info); - SAPI::send_header(r.sapi_info); - - const char* request_method=getenv("REQUEST_METHOD"); - bool header_only=request_method && strcasecmp(request_method, "HEAD")==0; - size_t sent = 0; - if(!header_only){ - size_t to_read = 0; - size_t size = 0; - do{ - to_read = part_lengthfields().get(name_name); if(!vfile_name) { vfile_name=body_file->fields().get(response_body_file_name); - const String& sfile_name=vfile_name->as_string(); + if(vfile_name) + { + const String& sfile_name=vfile_name->as_string(); - char* name_cstr=sfile_name.cstrm(); - if(char *after_slash=rsplit(name_cstr, '\\')) - name_cstr=after_slash; - if(char *after_slash=rsplit(name_cstr, '/')) - name_cstr=after_slash; - vfile_name=new VString(*new String(name_cstr)); + char* name_cstr=sfile_name.cstrm(); + if(char *after_slash=rsplit(name_cstr, '\\')) + name_cstr=after_slash; + if(char *after_slash=rsplit(name_cstr, '/')) + name_cstr=after_slash; + vfile_name=new VString(*new String(name_cstr)); + } } if(vfile_name) { const String& sfile_name=vfile_name->as_string(); if(sfile_name!=NONAME_DAT) { - VHash& hash=*new VHash(); - HashStringValue &h=hash.hash(); if(as_attachment) + { + VHash& hash=*new VHash(); + HashStringValue &h=hash.hash(); h.put(value_name, new VString(content_disposition_value)); - h.put(content_disposition_filename_name, vfile_name); - response.fields().put(content_disposition_name, &hash); + h.put(content_disposition_filename_name, vfile_name); + response.fields().put(content_disposition_name, &hash); + } if(!body_file_content_type) body_file_content_type=new VString(mime_type_of(sfile_name.cstr()));