--- parser3/src/main/pa_request.C 2020/12/03 22:48:09 1.397 +++ parser3/src/main/pa_request.C 2020/12/15 12:16:04 1.403 @@ -25,6 +25,7 @@ #include "pa_charset.h" #include "pa_charsets.h" #include "pa_cache_managers.h" +#include "pa_http.h" #include "pa_vmail.h" #include "pa_vform.h" #include "pa_vcookie.h" @@ -33,7 +34,7 @@ #include "pa_vconsole.h" #include "pa_vdate.h" -volatile const char * IDENT_PA_REQUEST_C="$Id: pa_request.C,v 1.397 2020/12/03 22:48:09 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.403 2020/12/15 12:16:04 moko Exp $" IDENT_PA_REQUEST_H IDENT_PA_REQUEST_CHARSETS_H IDENT_PA_REQUEST_INFO_H IDENT_PA_VCONSOLE_H; // consts @@ -103,6 +104,7 @@ static const String file_size_limit_name 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 httpd_mode_name("mode"); static const String conf_method_name("conf"); static const String post_process_method_name("postprocess"); @@ -328,6 +330,13 @@ void Request::configure_admin(VStateless if(pa_httpd_timeout==0) pa_httpd_timeout=INT_MAX; }, "HTTPD.%s must be int"); + if(httpd) + if(Value* option=httpd->get_element( httpd_mode_name)) { + if(option->get_junction()) + throw Exception(PARSER_RUNTIME, 0, "$main:HTTPD:mode must be string"); + HTTPD_Server::set_mode(option->as_string()); + } + // configure method_frame options // until someone with less privileges have overriden them methoded_array().configure_admin(*this); @@ -743,85 +752,118 @@ static void parse_range(const String* s, while(*p){ r.start = UNSET; r.end = UNSET; + + while(*p==' ' || *p=='\t') p++; + if(*p >= '0' && *p <= '9'){ - r.start = pa_atoul(p); - while(*p>='0' && *p<='9') ++p; + const char *s=p; + while(*p>='0' && *p<='9') p++; + r.start = pa_atoul(pa_strdup(s,p-s)); } + + while(*p==' ' || *p=='\t') p++; + if(*p++ != '-') break; + + while(*p==' ' || *p=='\t') p++; + if(*p >= '0' && *p <= '9'){ - r.end = pa_atoul(p); - while(*p>='0' && *p<='9') ++p; + const char *s=p; + while(*p>='0' && *p<='9') p++; + r.end = pa_atoul(pa_strdup(s,p-s)); } - if(*p == ',') ++p; + + while(*p==' ' || *p=='\t') p++; + + if(*p) + if(*p++ != ',') break; + ar += r; } } -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"); +struct Send_range_action_info { + Request *r; + uint64_t offset; + uint64_t part_length; +}; + +static void send_range(struct stat& /*finfo*/, int f, const String& /*file_spec*/, void *context){ + Send_range_action_info &info = *(Send_range_action_info*)context; + + pa_lseek(f, info.offset, SEEK_SET); const size_t BUFSIZE = 128*0x400; char buf[BUFSIZE]; + do{ + size_t to_read = info.part_length < BUFSIZE ? (size_t)info.part_length : BUFSIZE; + size_t to_write = file_block_read(f, buf, to_read); + + if(to_write == 0) + break; + + size_t size = SAPI::send_body(info.r->sapi_info, buf, to_write); + if(size != to_write) + break; + + info.part_length -= to_write; + } while (info.part_length); +} + +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 char *range = SAPI::Env::get(r.sapi_info, "HTTP_RANGE"); uint64_t offset=0; uint64_t part_length=content_length; - if(range){ + + if(range && content_length){ Array ar; parse_range(new String(range), ar); int count = ar.count(); if(count == 1){ Range &rg = ar.get_ref(0); - 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 == UNSET && rg.end == UNSET) + return SAPI::send_error(r.sapi_info, "", "416"); + 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 != UNSET && rg.end == UNSET){ + if(rg.end > content_length) + rg.end = content_length; + rg = { content_length - rg.end, content_length-1 }; + } else if(rg.start != UNSET && rg.end == UNSET){ + if(rg.start >= content_length) + return SAPI::send_error(r.sapi_info, "", "416"); rg.end = content_length-1; - offset += rg.start; - part_length -= rg.start; - } - if(part_length == 0){ - SAPI::add_header_attribute(r.sapi_info, HTTP_STATUS, "204 No Content"); - return; + } else { + if(rg.start >= content_length || rg.start > rg.end) + return SAPI::send_error(r.sapi_info, "", "416"); + if(rg.end >= content_length) + rg.end = content_length-1; } - SAPI::add_header_attribute(r.sapi_info, HTTP_STATUS, "206 Partial Content"); - snprintf(buf, BUFSIZE, "bytes %.15g-%.15g/%.15g", (double)rg.start, (double)rg.end, (double)content_length); + + offset = rg.start; + part_length = rg.end-rg.start+1; + + char buf[MAX_STRING]; + snprintf(buf, MAX_STRING, "bytes %.15g-%.15g/%.15g", (double)rg.start, (double)rg.end, (double)content_length); + SAPI::add_header_attribute(r.sapi_info, HTTP_STATUS, "206"); 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"); - return; + } else { + return SAPI::send_error(r.sapi_info, count ? "Multiple ranges not supported" : "Invalid range", count ? "501" : "400"); } } - - SAPI::add_header_attribute(r.sapi_info, HTTP_CONTENT_LENGTH, format(part_length, "%.15g")); + 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()); SAPI::send_header(r.sapi_info); - const String& filespec=r.full_disk_path(filename); - if(!header_only){ - do{ - size_t to_read = part_length < BUFSIZE ? 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_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); + Send_range_action_info info = { &r, offset, part_length}; + file_read_action_under_lock(r.full_disk_path(filename), "send", send_range, &info); } } @@ -885,7 +927,7 @@ void Request::output_result(VFile* body_ if(!vdate) vdate=new VDate((pa_time_t)mtime); - output_pieces(*this, header_only, *sfile, (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())