--- parser3/src/main/pa_request.C 2020/10/28 22:43:48 1.385 +++ parser3/src/main/pa_request.C 2020/11/16 21:37:13 1.391 @@ -33,7 +33,7 @@ #include "pa_vconsole.h" #include "pa_vdate.h" -volatile const char * IDENT_PA_REQUEST_C="$Id: pa_request.C,v 1.385 2020/10/28 22:43:48 moko Exp $" IDENT_PA_REQUEST_H IDENT_PA_REQUEST_CHARSETS_H IDENT_PA_REQUEST_INFO_H IDENT_PA_VCONSOLE_H; +volatile const char * IDENT_PA_REQUEST_C="$Id: pa_request.C,v 1.391 2020/11/16 21:37:13 moko Exp $" IDENT_PA_REQUEST_H IDENT_PA_REQUEST_CHARSETS_H IDENT_PA_REQUEST_INFO_H IDENT_PA_VCONSOLE_H; // consts @@ -44,6 +44,7 @@ const char* DEFAULT_CONTENT_TYPE="text/h const uint LOOP_LIMIT=20000; const uint EXECUTE_RECOURSION_LIMIT=1000; +const uint HTTPD_TIMEOUT=4; const size_t FILE_SIZE_LIMIT=512*1024*1024; // defines for globals @@ -75,6 +76,7 @@ static const String origin_key(ORIGIN_KE int pa_loop_limit=LOOP_LIMIT; int pa_execute_recoursion_limit=EXECUTE_RECOURSION_LIMIT; +int pa_httpd_timeout=HTTPD_TIMEOUT; size_t pa_file_size_limit=FILE_SIZE_LIMIT; // defines for statics @@ -86,6 +88,7 @@ size_t pa_file_size_limit=FILE_SIZE_LIMI #define LIMITS_NAME "LIMITS" #define LOOP_LIMIT_NAME "max_loop" #define RECOURSION_LIMIT_NAME "max_recoursion" +#define HTTPD_TIMEOUT_NAME "httpd_timeout" #define FILE_SIZE_LIMIT_NAME "max_file_size" #define LOCK_WAIT_TIMEOUT_NAME "lock_wait_timeout" #define CONF_METHOD_NAME "conf" @@ -106,6 +109,7 @@ static const String prototype_name(PROTO static const String limits_name(LIMITS_NAME); static const String loop_limit_name(LOOP_LIMIT_NAME); static const String recoursion_limit_name(RECOURSION_LIMIT_NAME); +static const String httpd_timeout_name(HTTPD_TIMEOUT_NAME); static const String file_size_limit_name(FILE_SIZE_LIMIT_NAME); static const String lock_wait_timeout_name(LOCK_WAIT_TIMEOUT_NAME); @@ -121,7 +125,6 @@ static const String body_name_upper(BODY static const String content_type_name_upper(HTTP_CONTENT_TYPE_UPPER); static const String content_disposition_name_upper(CONTENT_DISPOSITION_UPPER); -static const String content_disposition_inline(CONTENT_DISPOSITION_INLINE); static const String content_disposition_attachment(CONTENT_DISPOSITION_ATTACHMENT); // defines @@ -306,6 +309,16 @@ void Request::configure_admin(VStateless throw Exception(PARSER_RUNTIME, 0, "$" MAIN_CLASS_NAME ":LIMITS." RECOURSION_LIMIT_NAME " must be int"); } + pa_httpd_timeout=HTTPD_TIMEOUT; + if(limits) + if(Value* httpd_timeout=limits->get_element(httpd_timeout_name)) { + if(httpd_timeout->is_evaluated_expr()) { + pa_httpd_timeout=httpd_timeout->as_int(); + if(pa_httpd_timeout==0) pa_httpd_timeout=INT_MAX; + } else + throw Exception(PARSER_RUNTIME, 0, "$" MAIN_CLASS_NAME ":LIMITS." HTTPD_TIMEOUT_NAME " must be int"); + } + pa_file_size_limit=FILE_SIZE_LIMIT; if(limits) if(Value* file_size_limit=limits->get_element(file_size_limit_name)) { @@ -398,45 +411,19 @@ void Request::configure() { @test log stack trace */ -void Request::core(const char* config_filespec, bool header_only) { +void Request::core(const char* config_filespec, bool header_only, const String &amain_method_name) { try { // loading config if(config_filespec) - use_file_directly(main_class, *new String(config_filespec)); + use_file_directly(*new String(config_filespec)); // filling mail received mail.fill_received(*this); - // loading auto.p files from document_root/.. - // to the one beside requested file. - // all assigned bases from upper dir - { - const char* after=request_info.path_translated; - size_t drlen=strlen(request_info.document_root); - if(memcmp(after, request_info.document_root, drlen)==0) { - after+=drlen; - if(after[-1]=='/') - --after; - } - - while(const char* before=strchr(after, '/')) { - String& sfile_spec=*new String; - if(after!=request_info.path_translated) { - sfile_spec.append_strdup(request_info.path_translated, before-request_info.path_translated, String::L_CLEAN); - sfile_spec << "/" AUTO_FILE_NAME; - - use_file_directly(main_class, sfile_spec, false /*ignore absence, sole user*/); - } - for(after=before+1;*after=='/';after++); - } - } - try { // compile requested file - String& spath_translated=*new String; - spath_translated.append_help_length(request_info.path_translated, 0, String::L_TAINTED); - use_file_directly(main_class, spath_translated); - + if(request_info.path_translated) + use_file_directly(*new String(request_info.path_translated, String::L_TAINTED), true, true /* load auto.p files */); configure(); } catch(...) { configure(); // configure anyway, useful in @unhandled_exception [say, if they would want to mail by SMTP something] @@ -444,9 +431,9 @@ void Request::core(const char* config_fi } // execute @main[] - const String* body_string=execute_method(main_class, main_method_name); + const String* body_string=amain_method_name.is_empty() ? &String::Empty : execute_method(main_class, amain_method_name); if(!body_string) - throw Exception(PARSER_RUNTIME, 0, "'" MAIN_METHOD_NAME "' method not found"); + throw Exception(PARSER_RUNTIME, 0, "'%s' method not found", amain_method_name.cstr()); // extract response body Value* body_value=response.fields().get(download_name_upper); // $response:download? @@ -558,7 +545,7 @@ uint Request::register_file(String::Body return file_list.count()-1; } -void Request::use_file_directly(VStateless_class& aclass, const String& file_spec, bool fail_on_file_absence) { +void Request::use_file_directly(const String& file_spec, bool fail_on_file_absence, bool with_auto_p) { // cyclic dependence check if(used_files.get(file_spec)) return; @@ -567,19 +554,48 @@ void Request::use_file_directly(VStatele if(!fail_on_file_absence && !entry_exists(file_spec)) // ignore file absence if asked for return; + if(with_auto_p) { + // loading auto.p files from document_root/.. + // to the one beside requested file. + // all assigned bases from upper dir + const char* target=file_spec.cstr(); + + // all relative paths are calculated from main document + request_info.path_translated=target; + + const char* after=target; + size_t drlen=strlen(request_info.document_root); + if(memcmp(after, request_info.document_root, drlen)==0) { + after+=drlen; + if(after[-1]=='/') + --after; + } + + while(const char* before=strchr(after, '/')) { + String& sfile_spec=*new String; + if(after!=target) { + sfile_spec.append_strdup(target, before-target, String::L_CLEAN); + sfile_spec << "/" AUTO_FILE_NAME; + + use_file_directly(sfile_spec, false /*ignore absence, sole user*/); + } + for(after=before+1;*after=='/';after++); + } + } + if(const char* source=file_read_text(charsets, file_spec, true)) - use_buf(aclass, source, 0, register_file(file_spec)); + use_buf(main_class, source, 0, register_file(file_spec)); } -void Request::use_file(VStateless_class& aclass, const String& file_name, const String* use_filespec/*absolute*/) { +void Request::use_file(const String& file_name, const String* use_filespec/*absolute*/, bool with_auto_p) { if(file_name.is_empty()) throw Exception(PARSER_RUNTIME, 0, "usage failed - no filename was specified"); const String* filespec=0; if(file_name.first_char()=='/') //absolute path? [no need to scan MAIN:CLASS_PATH] - filespec=&absolute(file_name); + filespec=&full_disk_path(file_name); else if(use_filespec){ // search in current dir first size_t last_slash_pos=use_filespec->strrpbrk("/"); if(last_slash_pos!=STRING_NOT_FOUND) @@ -593,11 +609,11 @@ void Request::use_file(VStateless_class& searched_along_class_path.put(file_name, true); if(Value* element=main_class.get_element(class_path_name)) { if(element->is_string()) { - filespec=file_exist(absolute(element->as_string()), file_name); // found at class_path? + filespec=file_exist(full_disk_path(element->as_string()), file_name); // found at class_path? } else if(Table *table=element->get_table()) { for(size_t i=table->count(); i--; ) { const String& path=*(*table->get(i))[0]; - if(filespec=file_exist(absolute(path), file_name)) + if(filespec=file_exist(full_disk_path(path), file_name)) break; // found along class_path } } else @@ -608,7 +624,7 @@ void Request::use_file(VStateless_class& throw Exception(PARSER_RUNTIME, &file_name, "usage failed - no $" MAIN_CLASS_NAME ":" CLASS_PATH_NAME " were specified"); } - use_file_directly(aclass, *filespec); + use_file_directly(*filespec, true, with_auto_p); } void Request::use_file(const String& file_name, const String* use_filespec/*absolute*/, Operation::Origin origin) { @@ -666,22 +682,22 @@ const String& Request::relative(const ch return result; } -const String& Request::absolute(const String& relative_name) { +const String& Request::full_disk_path(const String& relative_name) { if(relative_name.first_char()=='/') { String& result=*new String(pa_strdup(request_info.document_root)); result << relative_name; return result; - } else - if(relative_name.pos("://")!=STRING_NOT_FOUND // something like "http://xxx" + } + if(relative_name.pos("://")!=STRING_NOT_FOUND // something like "http://xxx" #ifdef WIN32 - || relative_name.pos(":")==1 // DRIVE: - || relative_name.starts_with("\\\\") // UNC1 - || relative_name.starts_with("//") // UNC2 + || relative_name.pos(":")==1 // DRIVE: + || relative_name.starts_with("\\\\") // UNC1 + || relative_name.starts_with("//") // UNC2 #endif - ) - return relative_name; - else - return relative(request_info.path_translated, relative_name); + ) + return relative_name; + + return relative(request_info.path_translated ? request_info.path_translated : request_info.document_root, relative_name); } #ifndef DOXYGEN @@ -803,7 +819,7 @@ static void output_pieces(Request& r, bo SAPI::send_header(r.sapi_info); - const String& filespec=r.absolute(filename); + const String& filespec=r.full_disk_path(filename); size_t sent = 0; if(!header_only){ @@ -849,12 +865,12 @@ void Request::output_result(VFile* body_ if(vfile_name) { const String& sfile_name=vfile_name->as_string(); if(sfile_name!=NONAME_DAT) { - VHash& hash=*new VHash(); - HashStringValue &h=hash.hash(); - h.put(value_name, new VString( as_attachment ? content_disposition_attachment : content_disposition_inline )); - h.put(content_disposition_filename_name, new VString(*new String(sfile_name, String::L_HTTP_HEADER))); - - response.fields().put(content_disposition_name_upper, &hash); + if(as_attachment) { + VHash& hash=*new VHash(); + hash.hash().put(value_name, new VString(content_disposition_attachment)); + hash.hash().put(content_disposition_filename_name, new VString(*new String(sfile_name, String::L_HTTP_HEADER))); + response.fields().put(content_disposition_name_upper, &hash); + } if(!body_file_content_type) body_file_content_type=new VString(mime_type_of(sfile_name.cstr())); @@ -879,7 +895,7 @@ void Request::output_result(VFile* body_ const String& sresponse_body_file=vresponse_body_file->as_string(); uint64_t content_length=0; time_t atime=0, mtime=0, ctime=0; - file_stat(absolute(sresponse_body_file), content_length, atime, mtime, ctime); + file_stat(full_disk_path(sresponse_body_file), content_length, atime, mtime, ctime); VDate* vdate=0; if(Value* v=body_file->fields().get("mdate")) {