--- parser3/src/main/pa_request.C 2020/11/16 21:37:13 1.391 +++ parser3/src/main/pa_request.C 2020/12/07 23:38:46 1.399 @@ -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.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; +volatile const char * IDENT_PA_REQUEST_C="$Id: pa_request.C,v 1.399 2020/12/07 23:38:46 moko Exp $" IDENT_PA_REQUEST_H IDENT_PA_REQUEST_CHARSETS_H IDENT_PA_REQUEST_INFO_H IDENT_PA_VCONSOLE_H; // consts @@ -81,42 +81,32 @@ size_t pa_file_size_limit=FILE_SIZE_LIMI // defines for statics -#define CHARSETS_NAME "CHARSETS" #define MIME_TYPES_NAME "MIME-TYPES" -#define STRICT_VARS_NAME "STRICT-VARS" -#define PROTOTYPE_NAME "OBJECT-PROTOTYPE" -#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" -#define POST_PROCESS_METHOD_NAME "postprocess" #define CLASS_PATH_NAME "CLASS_PATH" -#define RESPONSE_BODY_FILE_NAME "file" #define DOWNLOAD_NAME_UPPER "DOWNLOAD" #define BODY_NAME_UPPER "BODY" // statics -static const String charsets_name(CHARSETS_NAME); static const String main_class_name(MAIN_CLASS_NAME); static const String mime_types_name(MIME_TYPES_NAME); -static const String strict_vars_name(STRICT_VARS_NAME); -static const String prototype_name(PROTOTYPE_NAME); -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); - -static const String conf_method_name(CONF_METHOD_NAME); -static const String post_process_method_name(POST_PROCESS_METHOD_NAME); static const String class_path_name(CLASS_PATH_NAME); -static const String response_body_file_name(RESPONSE_BODY_FILE_NAME); + +static const String charsets_name("CHARSETS"); +static const String strict_vars_name("STRICT-VARS"); +static const String prototype_name("OBJECT-PROTOTYPE"); +static const String limits_name("LIMITS"); +static const String loop_limit_name("max_loop"); +static const String recoursion_limit_name("max_recoursion"); +static const String file_size_limit_name("max_file_size"); +static const String lock_wait_timeout_name("lock_wait_timeout"); +static const String httpd_name("HTTPD"); +static const String httpd_timeout_name("timeout"); + +static const String conf_method_name("conf"); +static const String post_process_method_name("postprocess"); +static const String response_body_file_name("file"); static const String download_name_upper(DOWNLOAD_NAME_UPPER); static const String body_name_upper(BODY_NAME_UPPER); @@ -125,6 +115,7 @@ 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 @@ -245,6 +236,16 @@ static void load_charset(HashStringValue pa_charsets.load_charset(*charsets, akey, avalue->as_string()); } + +#define CONF_OPTION(config, name, code, exception_name) \ + if(config) \ + if(Value* option=config->get_element(name)) { \ + if(option->is_evaluated_expr()) { \ + code; \ + } else \ + throw Exception(PARSER_RUNTIME, 0, "$main:" exception_name, name.cstr()); \ + } + void Request::configure_admin(VStateless_class& conf_class) { if(configure_admin_done) throw Exception(PARSER_RUNTIME, 0, "parser already configured"); @@ -263,7 +264,7 @@ void Request::configure_admin(VStateless if(HashStringValue* charsets=vcharsets->get_hash()) charsets->for_each(load_charset, &this->charsets); else - throw Exception(PARSER_RUNTIME, 0, "$" MAIN_CLASS_NAME ":" CHARSETS_NAME " must be hash"); + throw Exception(PARSER_RUNTIME, 0, "$main:%s must be hash", charsets_name.cstr()); } } @@ -273,7 +274,7 @@ void Request::configure_admin(VStateless if(strict_vars->is_bool()) VVoid::strict_vars=strict_vars->as_bool(); else - throw Exception(PARSER_RUNTIME, 0, "$" MAIN_CLASS_NAME ":" STRICT_VARS_NAME " must be bool"); + throw Exception(PARSER_RUNTIME, 0, "$main:%s must be bool", strict_vars_name.cstr()); } #endif @@ -283,66 +284,49 @@ void Request::configure_admin(VStateless if(prototype->is_bool()) VClass::prototype=prototype->as_bool(); else - throw Exception(PARSER_RUNTIME, 0, "$" MAIN_CLASS_NAME ":" PROTOTYPE_NAME " must be bool"); + throw Exception(PARSER_RUNTIME, 0, "$main:%s must be bool", prototype_name.cstr()); } #endif Value* limits=conf_class.get_element(limits_name); pa_loop_limit=LOOP_LIMIT; - if(limits) - if(Value* loop_limit=limits->get_element(loop_limit_name)) { - if(loop_limit->is_evaluated_expr()) { - pa_loop_limit=loop_limit->as_int(); - if(pa_loop_limit==0) pa_loop_limit=INT_MAX; - } else - throw Exception(PARSER_RUNTIME, 0, "$" MAIN_CLASS_NAME ":LIMITS." LOOP_LIMIT_NAME " must be int"); - } + CONF_OPTION(limits, loop_limit_name, { + pa_loop_limit=option->as_int(); + if(pa_loop_limit==0) pa_loop_limit=INT_MAX; + }, "LIMITS.%s must be int"); pa_execute_recoursion_limit=EXECUTE_RECOURSION_LIMIT; - if(limits) - if(Value* recoursion_limit=limits->get_element(recoursion_limit_name)) { - if(recoursion_limit->is_evaluated_expr()) { - pa_execute_recoursion_limit=recoursion_limit->as_int(); - if(pa_execute_recoursion_limit==0) pa_execute_recoursion_limit=INT_MAX; - } else - 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"); - } + CONF_OPTION(limits, recoursion_limit_name, { + pa_execute_recoursion_limit=option->as_int(); + if(pa_execute_recoursion_limit==0) pa_execute_recoursion_limit=INT_MAX; + }, "LIMITS.%s must be int"); pa_file_size_limit=FILE_SIZE_LIMIT; - if(limits) - if(Value* file_size_limit=limits->get_element(file_size_limit_name)) { - if(file_size_limit->is_evaluated_expr()) { - double limit=file_size_limit->as_double(); - if(limit >= (double)SSIZE_MAX) - throw Exception(PARSER_RUNTIME, 0, "$" MAIN_CLASS_NAME ":LIMITS." FILE_SIZE_LIMIT_NAME " must be less then %.15g", (double)SSIZE_MAX); - pa_file_size_limit=(size_t)limit; - if(pa_file_size_limit==0) pa_file_size_limit=SSIZE_MAX; - } else - throw Exception(PARSER_RUNTIME, 0, "$" MAIN_CLASS_NAME ":LIMITS." FILE_SIZE_LIMIT_NAME " must be number"); - } + CONF_OPTION(limits, file_size_limit_name, { + double limit=option->as_double(); + if(limit >= (double)SSIZE_MAX) + throw Exception(PARSER_RUNTIME, 0, "$main:LIMITS.%s must be less then %.15g", file_size_limit_name.cstr(), (double)SSIZE_MAX); + pa_file_size_limit=(size_t)limit; + if(pa_file_size_limit==0) + pa_file_size_limit=SSIZE_MAX; + }, "LIMITS.%s must be number"); pa_lock_attempts=PA_LOCK_ATTEMPTS; - if(limits) - if(Value* lock_wait_timeout=limits->get_element(lock_wait_timeout_name)) { - if(lock_wait_timeout->is_evaluated_expr()) { - double limit=lock_wait_timeout->as_double(); - if(limit >= 3600*24) - throw Exception(PARSER_RUNTIME, 0, "$" MAIN_CLASS_NAME ":LIMITS." LOCK_WAIT_TIMEOUT_NAME " must be less then %d", 3600*24); - pa_lock_attempts=(unsigned int)(limit*2)+1; - } else - throw Exception(PARSER_RUNTIME, 0, "$" MAIN_CLASS_NAME ":LIMITS." LOCK_WAIT_TIMEOUT_NAME " must be number"); - } + CONF_OPTION(limits, lock_wait_timeout_name, { + double limit=option->as_double(); + if(limit >= 3600*24) + throw Exception(PARSER_RUNTIME, 0, "$main:LIMITS.%s must be less then %d", lock_wait_timeout_name.cstr(), 3600*24); + pa_lock_attempts=(unsigned int)(limit*2)+1; + }, "LIMITS.%s must be number"); + + Value* httpd=conf_class.get_element(httpd_name); + + pa_httpd_timeout=HTTPD_TIMEOUT; + CONF_OPTION(httpd, httpd_timeout_name, { + pa_httpd_timeout=option->as_int(); + if(pa_httpd_timeout==0) pa_httpd_timeout=INT_MAX; + }, "HTTPD.%s must be int"); // configure method_frame options // until someone with less privileges have overriden them @@ -398,7 +382,7 @@ void Request::configure() { // $MAIN:MIME-TYPES if(Value* element=main_class.get_element(mime_types_name)) if(Table *table=element->get_table()) - mime_types=table; + mime_types=table; } /** load MAIN class, execute @main. @@ -619,9 +603,9 @@ void Request::use_file(const String& fil } else throw Exception(PARSER_RUNTIME, 0, "$" CLASS_PATH_NAME " must be string or table"); if(!filespec) - throw Exception(PARSER_RUNTIME, &file_name, "not found along $" MAIN_CLASS_NAME ":" CLASS_PATH_NAME); + throw Exception(PARSER_RUNTIME, &file_name, "not found along $main:" CLASS_PATH_NAME); } else - throw Exception(PARSER_RUNTIME, &file_name, "usage failed - no $" MAIN_CLASS_NAME ":" CLASS_PATH_NAME " were specified"); + throw Exception(PARSER_RUNTIME, &file_name, "usage failed - no $main:" CLASS_PATH_NAME " were specified"); } use_file_directly(*filespec, true, with_auto_p); @@ -744,25 +728,28 @@ static void output_sole_piece(Request& r #ifndef DOXYGEN struct Range { - size_t start; - size_t end; + uint64_t start; + uint64_t end; }; #endif + +#define UNSET ((uint64_t)-1) + static void parse_range(const String* s, Array &ar) { const char *p = s->cstr(); if(s->starts_with("bytes=")) p += 6; Range r; while(*p){ - r.start = (size_t)-1; - r.end = (size_t)-1; + r.start = UNSET; + r.end = UNSET; if(*p >= '0' && *p <= '9'){ - r.start = atol(p); + r.start = pa_atoul(p); while(*p>='0' && *p<='9') ++p; } if(*p++ != '-') break; if(*p >= '0' && *p <= '9'){ - r.end = atol(p); + r.end = pa_atoul(p); while(*p>='0' && *p<='9') ++p; } if(*p == ',') ++p; @@ -770,30 +757,30 @@ static void parse_range(const String* s, } } -static void output_pieces(Request& r, bool header_only, const String& filename, size_t content_length, Value& date, bool add_last_modified) { +static void output_pieces(Request& r, bool header_only, const String& filename, uint64_t content_length, Value& date, bool add_last_modified) { SAPI::add_header_attribute(r.sapi_info, "accept-ranges", "bytes"); const size_t BUFSIZE = 128*0x400; char buf[BUFSIZE]; const char *range = SAPI::Env::get(r.sapi_info, "HTTP_RANGE"); - size_t offset=0; - size_t part_length=content_length; + uint64_t offset=0; + uint64_t part_length=content_length; if(range){ Array ar; parse_range(new String(range), ar); - size_t count = ar.count(); + int count = ar.count(); if(count == 1){ Range &rg = ar.get_ref(0); - if(rg.start == (size_t)-1 && rg.end == (size_t)-1){ + if(rg.start == UNSET && rg.end == UNSET){ SAPI::add_header_attribute(r.sapi_info, HTTP_STATUS, "416 Requested Range Not Satisfiable"); return; } - if(rg.start == (size_t)-1 && rg.end != (size_t)-1){ + if(rg.start == UNSET && rg.end != UNSET){ 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){ + }else if(rg.start != UNSET && rg.end == UNSET){ rg.end = content_length-1; offset += rg.start; part_length -= rg.start; @@ -803,7 +790,7 @@ static void output_pieces(Request& r, bo return; } SAPI::add_header_attribute(r.sapi_info, HTTP_STATUS, "206 Partial Content"); - snprintf(buf, BUFSIZE, "bytes %u-%u/%u", rg.start, rg.end, content_length); + snprintf(buf, BUFSIZE, "bytes %.15g-%.15g/%.15g", (double)rg.start, (double)rg.end, (double)content_length); SAPI::add_header_attribute(r.sapi_info, "content-range", buf); }else if(count != 0){ SAPI::add_header_attribute(r.sapi_info, HTTP_STATUS, "501 Not Implemented"); @@ -812,7 +799,7 @@ static void output_pieces(Request& r, bo } - SAPI::add_header_attribute(r.sapi_info, HTTP_CONTENT_LENGTH, format(part_length, "%u")); + SAPI::add_header_attribute(r.sapi_info, HTTP_CONTENT_LENGTH, format((double)part_length, "%.15g")); if(add_last_modified) SAPI::add_header_attribute(r.sapi_info, "last-modified", attributed_meaning_to_string(date, String::L_AS_IS, true).cstr()); @@ -821,24 +808,20 @@ static void output_pieces(Request& r, bo const String& filespec=r.full_disk_path(filename); - size_t sent = 0; if(!header_only){ - size_t to_read = 0; - size_t size = 0; do{ - to_read = part_length < BUFSIZE ? part_length : BUFSIZE; + size_t to_read = part_length < BUFSIZE ? (size_t)part_length : BUFSIZE; File_read_result read_result=file_read_binary(filespec, true /*fail on problem*/, buf, offset, to_read); to_read=read_result.length; if(to_read == 0) break; offset += to_read; - size = SAPI::send_body(r.sapi_info, read_result.str, to_read); - sent += size; + size_t size = SAPI::send_body(r.sapi_info, read_result.str, to_read); if(size != to_read) break; part_length -= to_read; - }while(part_length); + } while (part_length); } } @@ -846,35 +829,31 @@ void Request::output_result(VFile* body_ // header: cookies cookie.output_result(sapi_info); - // _file_ content-type might be specified - Value* body_file_content_type=body_file->fields().get(content_type_name); + // $.file and $.name (when body is real vfile) + Value* vfile = body_file->fields().get(response_body_file_name); + Value* vname = body_file->fields().get(name_name); + + const String* sfile = vfile ? &vfile->as_string() : NULL; + const String* sname = vname ? &vname->as_string() : NULL; + + if(sname && *sname == NONAME_DAT) + sname = NULL; // Content-Disposition - Value* vfile_name=body_file->fields().get(name_name); - if(!vfile_name) { - vfile_name=body_file->fields().get(response_body_file_name); - if(vfile_name) { - char* name_cstr=vfile_name->as_string().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) { - 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); - } + const String* disposition_name = sname ? sname->is_empty() ? NULL : sname : sfile; + if(disposition_name) { + VHash& hash=*new VHash(); + hash.hash().put(value_name, new VString(as_attachment ? content_disposition_attachment : content_disposition_inline)); + hash.hash().put(content_disposition_filename_name, new VString(*new String(*disposition_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())); - } + // _file_ content-type might be specified + Value* body_file_content_type = body_file->fields().get(content_type_name); + if(!body_file_content_type){ + const String* scontent_name = sname && !sname->is_empty() ? sname : sfile; + if(scontent_name) + body_file_content_type = new VString(mime_type_of(scontent_name->cstr())); } // set Content-Type @@ -890,12 +869,11 @@ void Request::output_result(VFile* body_ Add_header_attribute_info info(*this); response.fields().for_each(add_header_attribute, &info); - if(Value* vresponse_body_file=body_file->fields().get(response_body_file_name)) { + if(sfile) { // $response:[download|body][$.file[filespec]] -- optput specified file - 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(full_disk_path(sresponse_body_file), content_length, atime, mtime, ctime); + file_stat(full_disk_path(*sfile), content_length, atime, mtime, ctime); VDate* vdate=0; if(Value* v=body_file->fields().get("mdate")) { @@ -907,7 +885,7 @@ void Request::output_result(VFile* body_ if(!vdate) vdate=new VDate((pa_time_t)mtime); - output_pieces(*this, header_only, sresponse_body_file, (size_t)content_length, *vdate, info.add_last_modified); + output_pieces(*this, header_only, *sfile, content_length, *vdate, info.add_last_modified); } else { if(body_file_content_type) if(HashStringValue *hash=body_file_content_type->get_hash()) @@ -930,7 +908,7 @@ const String& Request::mime_type_of(cons if(const String* result=mime_types->item(1)) return *result; else - throw Exception(PARSER_RUNTIME, 0, MIME_TYPES_NAME " table column elements must not be empty"); + throw Exception(PARSER_RUNTIME, 0, MIME_TYPES_NAME " table column elements must not be empty"); } }