--- parser3/src/main/pa_http.C 2012/06/02 22:52:36 1.54 +++ parser3/src/main/pa_http.C 2017/05/17 14:22:12 1.80 @@ -1,7 +1,7 @@ /** @file Parser: http support functions. - Copyright (c) 2001-2012 Art. Lebedev Studio (http://www.artlebedev.com) + Copyright (c) 2001-2017 Art. Lebedev Studio (http://www.artlebedev.com) Author: Alexandr Petrosian (http://paf.design.ru) */ @@ -13,7 +13,13 @@ #include "pa_vfile.h" #include "pa_random.h" -volatile const char * IDENT_PA_HTTP_C="$Id: pa_http.C,v 1.54 2012/06/02 22:52:36 misha Exp $" IDENT_PA_HTTP_H; +volatile const char * IDENT_PA_HTTP_C="$Id: pa_http.C,v 1.80 2017/05/17 14:22:12 moko Exp $" IDENT_PA_HTTP_H; + +#ifdef _MSC_VER +#include +#else +#define closesocket close +#endif // defines @@ -22,28 +28,44 @@ volatile const char * IDENT_PA_HTTP_C="$ #define HTTP_BODY_NAME "body" #define HTTP_TIMEOUT_NAME "timeout" #define HTTP_HEADERS_NAME "headers" -#define HTTP_COOKIES_NAME "cookies" #define HTTP_FORM_ENCTYPE_NAME "enctype" #define HTTP_ANY_STATUS_NAME "any-status" -#define HTTP_OMIT_POST_CHARSET_NAME "omit-post-charset" // ^file::load[...;http://...;$.form[...]$.method[post]] - // by default add charset to content-type - -#define HTTP_TABLES_NAME "tables" +#define HTTP_OMIT_POST_CHARSET_NAME "omit-post-charset" // ^file::load[...;http://...;$.method[post]] by default adds charset to content-type #define HTTP_USER "user" #define HTTP_PASSWORD "password" +#define HTTP_USER_AGENT "user-agent" #define DEFAULT_USER_AGENT "parser3" -# ifndef INADDR_NONE -# define INADDR_NONE ((ulong) -1) -# endif +#ifndef INADDR_NONE +#define INADDR_NONE ((ulong) -1) +#endif #undef CRLF #define CRLF "\r\n" // helpers -/// pa_internal_file_read_http uses this + +bool ResponseHeaders::add_header(const char *line){ + const char *value=strchr(line, ':'); + + if(value && value != line){ // we need only headers, not the response code + Header header(str_upper(line, value-line), String::Body(value+1).trim(String::TRIM_BOTH, " \t\n\r")); + + if(header.name == String::Body(HTTP_CONTENT_TYPE_UPPER) && content_type.is_empty()) + content_type=header.value; + + if(header.name == String::Body("CONTENT-LENGTH") && content_length==0) + content_length=pa_atoul(header.value.cstr(), 10); + + headers+=header; + + return true; + } + return false; +} + class Cookies_table_template_columns: public ArrayString { public: Cookies_table_template_columns() { @@ -64,138 +86,169 @@ static bool set_addr(struct sockaddr_in addr->sin_family=AF_INET; addr->sin_port=htons(port); if(host) { - ulong packed_ip=inet_addr(host); - if(packed_ip!=INADDR_NONE) - memcpy(&addr->sin_addr, &packed_ip, sizeof(packed_ip)); - else { - struct hostent *hostIP=gethostbyname(host); - if(hostIP) - memcpy(&addr->sin_addr, hostIP->h_addr, hostIP->h_length); - else - return false; - } - } else - addr->sin_addr.s_addr=INADDR_ANY; - return true; -} - -size_t guess_content_length(char* buf) { - char* ptr; - if((ptr=strstr(buf, "Content-Length:"))) // Apache - goto found; - if((ptr=strstr(buf, "content-length:"))) // Parser 3 before 3.4.0 - goto found; - if((ptr=strstr(buf, "Content-length:"))) // maybe 1 - goto found; - if((ptr=strstr(buf, "CONTENT-LENGTH:"))) // maybe 2 - goto found; - return 0; -found: - char *error_pos; - size_t result=(size_t)strtol(ptr+15/*strlen("Content-Length:")*/, &error_pos, 0); - - const size_t reasonable_initial_max=0x400*0x400*10 /*10M*/; - if(result>reasonable_initial_max) // sanity check - return reasonable_initial_max; - return 0;//result; + struct hostent *hostIP=gethostbyname(host); + if(hostIP && hostIP->h_addrtype == AF_INET){ + memcpy(&addr->sin_addr, hostIP->h_addr, hostIP->h_length); + return true; + } + } + return false; } -static int http_read_response(char*& response, size_t& response_size, int sock, bool fail_on_status_ne_200) { - int result=0; - // fetching some to local buffer, guessing on possible Content-Length - response_size=0x400*20; // initial size if Content-Length could not be determined - const size_t preview_size=0x400*20; - char preview_buf[preview_size+1/*terminator*/]; // 20K buffer to preview headers - ssize_t received_size=recv(sock, preview_buf, preview_size, 0); - if(received_size==0) - goto done; - if(received_size<0) { - if(int no=pa_socks_errno()) - throw Exception("http.timeout", - 0, - "error receiving response header: %s (%d)", pa_socks_strerr(no), no); - goto done; - } - // terminator [helps futher string searches] - preview_buf[received_size]=0; - // checking status - if(char* EOLat=strstr(preview_buf, "\n")) { - const String status_line(pa_strdup(preview_buf, EOLat-preview_buf)); - ArrayString astatus; - size_t pos_after=0; - status_line.split(astatus, pos_after, " "); - const String& status_code=*astatus.get(astatus.count()>1?1:0); - result=status_code.as_int(); - - if(fail_on_status_ne_200 && result!=200) - throw Exception("http.status", - &status_code, - "invalid HTTP response status"); +class HTTP_response { +public: + char *buf; + size_t length; + size_t buf_size; + size_t body_offset; + + ResponseHeaders headers; + String &url; + + HTTP_response(String& aurl) : buf(NULL), length(0), buf_size(0), body_offset(0), url(aurl){} + + void resize(size_t size){ + buf_size=size; + buf=(char *)pa_realloc(buf, size + 1); } - // detecting response_size - { - if(size_t content_length=guess_content_length(preview_buf)) - response_size=preview_size+content_length; // a little more than needed, will adjust response_size by actual received size later + + bool read(int sock, size_t size){ + if(length+size>buf_size) + resize(buf_size*2 + size); + ssize_t received_size=recv(sock, buf + length, size, 0); + if(received_size==0) + return false; + if(received_size<0) { + if(int no=pa_socks_errno()) + throw Exception("http.timeout", &url, "error receiving response body: %s (%d)", pa_socks_strerr(no), no); + return false; + } + length+=received_size; + buf[length]='\0'; + return true; } - // [gcc is happier this way, see goto above] - { - // allocating initial buf - response=(char*)pa_malloc_atomic(response_size+1/*terminator*/); // just setting memory block type - char* ptr=response; - size_t todo_size=response_size; - // coping part of already received body - memcpy(ptr, preview_buf, received_size); - ptr+=received_size; - todo_size-=received_size; - - // we use terminator byte for two purposes here: - // 1. we return there zero always, not knowing: maybe they would want to create String form $file.body? - // invariant: all Strings should have zero-terminated buffers - // 2. we use that out-of-size byte to detect if our Content-Length guess was wrong - // when recv gets more than we expected - // a) we know that the Content-Length guess was wrong - // b) we have space to put the first byte of extra data - // c) we use less code to detect normal situation: on last while-cycle recv expected to just return 0 - while(true) { - received_size=recv(sock, ptr, todo_size+1/*there is always a place for terminator*/, 0); - if(received_size==0) { - response_size-=todo_size; // in case we received less than expected, cut down the reported size + size_t status_size(){ + char *headers=strchr(buf, '\n'); + if(!headers) + return false; + + return headers-buf; + } + + const char *status_code(char *status_line, int &result){ + char* status_start = strchr(status_line, ' '); + + if(!(status_start++)) + return status_line; + + char* status_end=strchr(status_start, ' '); + + if(!status_end) + return status_line; + + if(status_end==status_start) + return status_line; + + const char *result_str=pa_strdup(status_start, status_end-status_start); + result=atoi(result_str); + return result_str; + } + + bool body_start(){ + char *p=buf; + while((p=strchr(p, '\n'))) { + if(p[1]=='\r' && p[2]=='\n'){ // \r\n\r\n + *p='\0'; + body_offset=p-buf+3; + return true; + } + if(p[1]=='\n') { // \n\n + *p='\0'; + body_offset=p-buf+2; + return true; + } + p++; + } + return false; + } + + void parse_headers(){ + const String header_block(buf, String::L_TAINTED); + + ArrayString aheaders; + header_block.split(aheaders, 0, "\n"); + + Array_iterator i(aheaders); + i.next(); // skipping status + for(;i.has_next();){ + const char *line=i.next()->cstr(); + if(!headers.add_header(line)) + throw Exception("http.response", &url, "bad response from host - bad header \"%s\"", line); + } + } + +}; + +enum HTTP_response_state { + HTTP_STATUS_CODE, + HTTP_HEADERS, + HTTP_BODY +}; + +static int http_read_response(HTTP_response& response, int sock, bool fail_on_status_ne_200) { + HTTP_response_state state=HTTP_STATUS_CODE; + int result=0; + + size_t chunk_size=0x400*16; + response.resize(2*chunk_size); + + while(response.read(sock, chunk_size)){ + switch(state){ + case HTTP_STATUS_CODE: { + size_t status_size=response.status_size(); + if(!status_size) + break; + + const char *status=response.status_code(pa_strdup(response.buf, status_size), result); + + if(!result || fail_on_status_ne_200 && result!=200) + throw Exception("http.status", status ? new String(status) : &String::Empty, "invalid HTTP response status"); + + state=HTTP_HEADERS; + } + + case HTTP_HEADERS: { + if(!response.body_start()) + break; + + response.parse_headers(); + + size_t content_length=check_file_size(response.headers.content_length, response.url); + if(content_length>0 && (content_length + response.body_offset) > response.length){ + response.resize(content_length + response.body_offset + 0x400*64); + } + + state=HTTP_BODY; break; } - if(received_size<0) { - if(int no=pa_socks_errno()) - throw Exception("http.timeout", - 0, - "error receiving response body: %s (%d)", pa_socks_strerr(no), no); + + case HTTP_BODY: { + chunk_size=0x400*64; break; } - // they've touched the terminator? - if((size_t)received_size>todo_size) - { - // that means that our guessed response_size was not big enough - const size_t grow_chunk_size=0x400*0x400; // 1M - response_size+=grow_chunk_size; - size_t ptr_offset=ptr-response; - response=(char*)pa_realloc(response, response_size+1/*terminator*/); - ptr=response+ptr_offset; - todo_size+=grow_chunk_size; - } - // can't do this before realloc: we need =0) closesocket(sock); - throw Exception("http.timeout", - 0, - "timeout occured while retrieving document"); + throw Exception("http.timeout", 0, "timeout occurred while retrieving document"); return 0; // never } else { alarm(timeout_secs); @@ -245,15 +290,11 @@ static int http_request(char*& response, struct sockaddr_in dest; if(!set_addr(&dest, host, port)) - throw Exception("http.host", - 0, - "can not resolve hostname \"%s\"", host); + throw Exception("http.host", 0, "can not resolve hostname \"%s\"", host); if((sock=socket(AF_INET, SOCK_STREAM, IPPROTO_TCP/*0*/))<0) { int no=pa_socks_errno(); - throw Exception("http.connect", - 0, - "can not make socket: %s (%d)", pa_socks_strerr(no), no); + throw Exception("http.connect", 0, "can not make socket: %s (%d)", pa_socks_strerr(no), no); } // To enable SO_DONTLINGER (that is, disable SO_LINGER) @@ -272,30 +313,26 @@ static int http_request(char*& response, if(connect(sock, (struct sockaddr *)&dest, sizeof(dest))) { int no=pa_socks_errno(); - throw Exception("http.connect", - 0, - "can not connect to host \"%s\": %s (%d)", host, pa_socks_strerr(no), no); + throw Exception("http.connect", 0, "can not connect to host \"%s\": %s (%d)", host, pa_socks_strerr(no), no); } if(send(sock, request, request_size, 0)!=(ssize_t)request_size) { int no=pa_socks_errno(); - throw Exception("http.timeout", - 0, - "error sending request: %s (%d)", pa_socks_strerr(no), no); + throw Exception("http.timeout", 0, "error sending request: %s (%d)", pa_socks_strerr(no), no); } - result=http_read_response(response, response_size, sock, fail_on_status_ne_200); - closesocket(sock); + result=http_read_response(response, sock, fail_on_status_ne_200); + closesocket(sock); #ifdef PA_USE_ALARM - alarm(0); + alarm(0); #endif return result; } catch(...) { #ifdef PA_USE_ALARM - alarm(0); + alarm(0); #endif - if(sock>=0) - closesocket(sock); + if(sock>=0) + closesocket(sock); rethrow; } #ifdef PA_USE_ALARM @@ -343,7 +380,7 @@ static void http_pass_header(HashStringV *info->user_agent_specified=true; if(strcasecmp(name_cstr, HTTP_CONTENT_TYPE)==0){ *info->content_type_specified=true; - *info->content_type_url_encoded=StrStartFromNC(value.cstr(), HTTP_CONTENT_TYPE_FORM_URLENCODED); + *info->content_type_url_encoded=pa_strncasecmp(value.cstr(), HTTP_CONTENT_TYPE_FORM_URLENCODED)==0; } } @@ -373,11 +410,7 @@ static const String* basic_authorization return result; } -static void form_string_value2string( - HashStringValue::key_type key, - const String& value, - String& result) -{ +static void form_string_value2string(HashStringValue::key_type key, const String& value, String& result) { result << String(key, String::L_URI) << "=" << String(value, String::L_URI) << "&"; } @@ -393,20 +426,16 @@ struct Form_table_value2string_info { static void form_table_value2string(Table::element_type row, Form_table_value2string_info* info) { form_string_value2string(info->key, *row->get(0), info->result); } -static void form_value2string( - HashStringValue::key_type key, - HashStringValue::value_type value, - String* result) -{ + +static void form_value2string(HashStringValue::key_type key, HashStringValue::value_type value, String* result) { if(const String* svalue=value->get_string()) form_string_value2string(key, *svalue, *result); else if(Table* tvalue=value->get_table()) { Form_table_value2string_info info(key, *result); tvalue->for_each(form_table_value2string, &info); } else - throw Exception(PARSER_RUNTIME, - new String(key, String::L_TAINTED), - "is %s, "HTTP_FORM_NAME" option value can be string or table only (file is allowed for $."HTTP_METHOD_NAME"[POST] + $."HTTP_FORM_ENCTYPE_NAME"["HTTP_CONTENT_TYPE_MULTIPART_FORMDATA"])", value->type()); + throw Exception(PARSER_RUNTIME, new String(key, String::L_TAINTED), + "is %s, " HTTP_FORM_NAME " option value can be string or table only (file is allowed for $." HTTP_METHOD_NAME "[POST] + $." HTTP_FORM_ENCTYPE_NAME "[" HTTP_CONTENT_TYPE_MULTIPART_FORMDATA "])", value->type()); } const char* pa_form2string(HashStringValue& form, Request_charsets& charsets) { @@ -458,11 +487,8 @@ struct FormPart { } }; -static void form_part_boundary_header(FormPart& part, String::Body name, const char* file_name=0){ - *part.string << "--" << part.boundary - << CRLF CONTENT_DISPOSITION_CAPITALIZED ": form-data; name=\"" - << name - << "\""; +static void form_part_boundary_header(FormPart& part, String::Body name, const char* file_name=0) { + *part.string << "--" << part.boundary << CRLF CONTENT_DISPOSITION_CAPITALIZED ": form-data; name=\"" << name << "\""; if(file_name){ if(strcmp(file_name, NONAME_DAT)!=0) *part.string << "; filename=\"" << file_name << "\""; @@ -471,20 +497,12 @@ static void form_part_boundary_header(Fo *part.string << CRLF CRLF; } -static void form_string_value2part( - HashStringValue::key_type key, - const String& value, - FormPart& part) -{ +static void form_string_value2part(HashStringValue::key_type key, const String& value, FormPart& part) { form_part_boundary_header(part, key); *part.string << value << CRLF; } -static void form_file_value2part( - HashStringValue::key_type key, - VFile& vfile, - FormPart& part) -{ +static void form_file_value2part(HashStringValue::key_type key, VFile& vfile, FormPart& part) { form_part_boundary_header(part, key, vfile.fields().get(name_name)->as_string().cstr()); part.blocks+=FormPart::BinaryBlock(part.string, part.r); part.blocks+=FormPart::BinaryBlock(vfile.value_ptr(), vfile.value_size()); @@ -496,11 +514,7 @@ static void form_table_value2part(Table: form_string_value2part(part->info->key, *row->get(0), *part); } -static void form_value2part( - HashStringValue::key_type key, - HashStringValue::value_type value, - FormPart& part) -{ +static void form_value2part(HashStringValue::key_type key, HashStringValue::value_type value, FormPart& part) { if(const String* svalue=value->get_string()) form_string_value2part(key, *svalue, part); else if(Table* tvalue=value->get_table()) { @@ -510,9 +524,7 @@ static void form_value2part( } else if(VFile* vfile=static_cast(value->as("file"))){ form_file_value2part(key, *vfile, part); } else - throw Exception(PARSER_RUNTIME, - new String(key, String::L_TAINTED), - "is %s, "HTTP_FORM_NAME" option value can be string, table or file only", value->type()); + throw Exception(PARSER_RUNTIME, new String(key, String::L_TAINTED), "is %s, " HTTP_FORM_NAME " option value can be string, table or file only", value->type()); } const char* pa_form2string_multipart(HashStringValue& form, Request& r, const char* boundary, size_t& post_size){ @@ -523,37 +535,18 @@ const char* pa_form2string_multipart(Has return formpart.post(post_size); } -static void find_headers_end(char* p, - char*& headers_end_at, - char*& raw_body) -{ - raw_body=p; - // \n\n - // \r\n\r\n - while((p=strchr(p, '\n'))) { - headers_end_at=++p; // \n>.< - if(*p=='\r') // \r\n>\r?<\n - p++; - if(*p=='\n') { // \r\n\r>\n?< - raw_body=p+1; - return; - } - } - headers_end_at=0; -} - // Set-Cookie: name=value; Domain=docs.foo.com; Path=/accounts; Expires=Wed, 13-Jan-2021 22:23:01 GMT; Secure; HttpOnly static ArrayString* parse_cookie(Request& r, const String& cookie) { - char *current=strdup(cookie.cstr()); + char *current=pa_strdup(cookie.cstr()); const String* name=0; - const String* value=0; - const String* expires=0; - const String* max_age=0; - const String* path=0; - const String* domain=0; - const String* httponly=0; - const String* secure=0; + const String* value=&String::Empty; + const String* expires=&String::Empty; + const String* max_age=&String::Empty; + const String* path=&String::Empty; + const String* domain=&String::Empty; + const String* httponly=&String::Empty; + const String* secure=&String::Empty; bool first_pair=true; @@ -608,14 +601,39 @@ static ArrayString* parse_cookie(Request return result; } +Table* parse_cookies(Request& r, Table *cookies){ + Table& result=*new Table(new Cookies_table_template_columns); + + for(Array_iterator i(*cookies); i.has_next(); ) + if(ArrayString* row=parse_cookie(r, *i.next()->get(0))) + result+=row; + + return &result; +} + +void tables_update(HashStringValue& tables, const String::Body name, const String& value){ + Table *table; + if(Value *valready=tables.get(name)) { + // second+ appearence + table=valready->get_table(); + } else { + // first appearence + Table::columns_type columns=new ArrayString(1); + *columns+=new String("value"); + table=new Table(columns); + tables.put(name, new VTable(table)); + } + // this string becomes next row + ArrayString& row=*new ArrayString(1); + row+=&value; + *table+=&row; +} + /// @todo build .cookies field. use ^file.tables.SET-COOKIES.menu{ for now -File_read_http_result pa_internal_file_read_http(Request& r, - const String& file_spec, - bool as_text, - HashStringValue *options, - bool transcode_text_result) { +File_read_http_result pa_internal_file_read_http(Request& r, const String& file_spec, bool as_text, HashStringValue *options, bool transcode_text_result) { File_read_http_result result; char host[MAX_STRING]; + const char *idna_host; const char* uri; short port=80; const char* method="GET"; @@ -627,7 +645,8 @@ File_read_http_result pa_internal_file_r Value* vheaders=0; Value* vcookies=0; Value* vbody=0; - Charset *asked_remote_charset=0; + Charset* asked_remote_charset=0; + Charset* real_remote_charset=0; const char* user_cstr=0; const char* password_cstr=0; const char* encode=0; @@ -671,8 +690,11 @@ File_read_http_result pa_internal_file_r omit_post_charset=vomit_post_charset->as_bool(); } if(Value* vcharset_name=options->get(PA_CHARSET_NAME)) { - asked_remote_charset=&charsets.get(vcharset_name->as_string(). - change_case(r.charsets.source(), String::CC_UPPER)); + asked_remote_charset=&pa_charsets.get(vcharset_name->as_string()); + } + if(Value* vresponse_charset_name=options->get(PA_RESPONSE_CHARSET_NAME)) { + valid_options++; + real_remote_charset=&pa_charsets.get(vresponse_charset_name->as_string()); } if(Value* vuser=options->get(HTTP_USER)) { valid_options++; @@ -691,28 +713,20 @@ File_read_http_result pa_internal_file_r if(encode){ if(method_is_get) - throw Exception(PARSER_RUNTIME, - 0, - "you can not use $."HTTP_FORM_ENCTYPE_NAME" option with method GET"); + throw Exception(PARSER_RUNTIME, 0, "you can not use $." HTTP_FORM_ENCTYPE_NAME " option with method GET"); multipart=strcasecmp(encode, HTTP_CONTENT_TYPE_MULTIPART_FORMDATA)==0; if(!multipart && strcasecmp(encode, HTTP_CONTENT_TYPE_FORM_URLENCODED)!=0) - throw Exception(PARSER_RUNTIME, - 0, - "$."HTTP_FORM_ENCTYPE_NAME" option value can be "HTTP_CONTENT_TYPE_FORM_URLENCODED" or "HTTP_CONTENT_TYPE_MULTIPART_FORMDATA" only"); + throw Exception(PARSER_RUNTIME, 0, "$." HTTP_FORM_ENCTYPE_NAME " option value can be " HTTP_CONTENT_TYPE_FORM_URLENCODED " or " HTTP_CONTENT_TYPE_MULTIPART_FORMDATA " only"); } if(vbody){ if(method_is_get) - throw Exception(PARSER_RUNTIME, - 0, - "you can not use $."HTTP_BODY_NAME" option with method GET"); + throw Exception(PARSER_RUNTIME, 0, "you can not use $." HTTP_BODY_NAME " option with method GET"); if(form) - throw Exception(PARSER_RUNTIME, - 0, - "you can not use options $."HTTP_BODY_NAME" and $."HTTP_FORM_NAME" together"); + throw Exception(PARSER_RUNTIME, 0, "you can not use options $." HTTP_BODY_NAME " and $." HTTP_FORM_NAME " together"); } //preparing request @@ -728,9 +742,7 @@ File_read_http_result pa_internal_file_r const char* current=connect_string_cstr; if(strncmp(current, "http://", 7)!=0) - throw Exception(PARSER_RUNTIME, - &connect_string, - "does not start with http://"); //never + throw Exception(PARSER_RUNTIME, &connect_string, "does not start with http://"); //never current+=7; strncpy(host, current, sizeof(host)-1); host[sizeof(host)-1]=0; @@ -745,30 +757,20 @@ File_read_http_result pa_internal_file_r throw Exception(PARSER_RUNTIME, &connect_string, "invalid port number '%s'", port_cstr); } + idna_host=pa_idna_encode(host, r.charsets.source()); + // making request head String head; head << method << " " << uri; if(method_is_get && form) head << (strchr(uri, '?')!=0?"&":"?") << pa_form2string(*form, r.charsets); - head <<" HTTP/1.0" CRLF "Host: "<< host; + head <<" HTTP/1.0" CRLF "Host: "<< idna_host; if (port != 80) head << ":" << port_cstr; head << CRLF; - char* boundary=0; - - if(multipart){ - uuid uuid=get_uuid(); - const int boundary_bufsize=10+32+1/*for zero-teminator*/+1/*for faulty snprintfs*/; - boundary=new(PointerFreeGC) char[boundary_bufsize]; - snprintf(boundary, boundary_bufsize, - "----------%08X%04X%04X%02X%02X%02X%02X%02X%02X%02X%02X", - uuid.time_low, uuid.time_mid, uuid.time_hi_and_version, - uuid.clock_seq >> 8, uuid.clock_seq & 0xFF, - uuid.node[0], uuid.node[1], uuid.node[2], - uuid.node[3], uuid.node[4], uuid.node[5]); - } + char* boundary= multipart ? get_uuid_boundary() : 0; String user_headers; bool user_agent_specified=false; @@ -784,9 +786,7 @@ File_read_http_result pa_internal_file_r &content_type_url_encoded}; headers->for_each(http_pass_header, &info); } else - throw Exception(PARSER_RUNTIME, - 0, - "headers param must be hash"); + throw Exception(PARSER_RUNTIME, 0, "headers param must be hash"); }; const char* request_body=0; @@ -812,11 +812,8 @@ File_read_http_result pa_internal_file_r request_body=vbody->as_string().untaint_and_transcode_cstr(String::L_URI, &(r.charsets)); } else { // content-type != application/x-www-form-urlencoded -> transcode only, don't url-encode! - request_body=Charset::transcode( - String::C(vbody->as_string().cstr(), vbody->as_string().length()), - r.charsets.source(), - *asked_remote_charset - ); + const String &sbody=vbody->as_string(); + request_body=Charset::transcode(String::C(sbody.cstr(), sbody.length()), r.charsets.source(), *asked_remote_charset).str; } post_size=strlen(request_body); } @@ -831,9 +828,7 @@ File_read_http_result pa_internal_file_r head << "User-Agent: " DEFAULT_USER_AGENT CRLF; if(form && !method_is_get && content_type_specified) // POST + form + content-type was specified - throw Exception(PARSER_RUNTIME, - 0, - "$.content-type can't be specified with method POST"); + throw Exception(PARSER_RUNTIME, 0, "$.content-type can't be specified with method POST"); if(vcookies && !vcookies->is_string()){ // allow empty if(HashStringValue* cookies=vcookies->get_hash()) { @@ -842,9 +837,7 @@ File_read_http_result pa_internal_file_r cookies->for_each(http_pass_cookie, &info); head << CRLF; } else - throw Exception(PARSER_RUNTIME, - 0, - "cookies param must be hash"); + throw Exception(PARSER_RUNTIME, 0, "cookies param must be hash"); } if(request_body) @@ -867,107 +860,49 @@ File_read_http_result pa_internal_file_r } } - char* response; - size_t response_size; + + HTTP_response response(connect_string); // sending request - int status_code=http_request(response, response_size, - host, port, request, request_size, - timeout_secs, fail_on_status_ne_200); - - // processing results - char* raw_body; size_t raw_body_size; - char* headers_end_at; - find_headers_end(response, - headers_end_at, - raw_body); - raw_body_size=response_size-(raw_body-response); - + int status_code=http_request(response, idna_host, port, request, request_size, timeout_secs, fail_on_status_ne_200); + + // processing results + char* raw_body=response.buf + response.body_offset; + size_t raw_body_size=response.length - response.body_offset; + result.headers=new HashStringValue; VHash* vtables=new VHash; - result.headers->put(HTTP_TABLES_NAME, vtables); - Charset* real_remote_charset=0; // undetected, yet + result.headers->put("tables", vtables); - if(headers_end_at) { - *headers_end_at=0; - const String header_block(String::C(response, headers_end_at-response), String::L_TAINTED); - - ArrayString aheaders; - HashStringValue& tables=vtables->hash(); + if (!real_remote_charset && !response.headers.content_type.is_empty()) + real_remote_charset=detect_charset(response.headers.content_type.cstr()); - size_t pos_after=0; - header_block.split(aheaders, pos_after, "\n"); - - // processing headers - size_t aheaders_count=aheaders.count(); - for(size_t i=1; iget_table(); - } else { - // first appearence - Table::columns_type columns=new ArrayString(1); - *columns+=new String("value"); - table=new Table(columns); - } - // this string becomes next row - ArrayString& row=*new ArrayString(1); - row+=&HEADER_VALUE; - *table+=&row; - // not existed before? add it - if(!existed) - tables.put(HEADER_NAME, new VTable(table)); - } + if(as_text) + real_remote_charset=pa_charsets.checkBOM(raw_body, raw_body_size, real_remote_charset); - result.headers->put(HEADER_NAME, new VString(HEADER_VALUE)); - } + if (!real_remote_charset) + real_remote_charset=asked_remote_charset; // never null - // filling $.cookies - if(Value *vcookie=(Value *)tables.get("SET-COOKIE")){ - Table& tcookies=*new Table(new Cookies_table_template_columns); + for(Array_iterator i(response.headers.headers); i.has_next(); ){ + ResponseHeaders::Header header=i.next(); - for(Array_iterator i(*vcookie->get_table()); i.has_next(); ) - if(ArrayString* row=parse_cookie(r, *i.next()->get(0))) - tcookies+=row; + header.transcode(*real_remote_charset, r.charsets.source()); - result.headers->put(HTTP_COOKIES_NAME, new VTable(&tcookies)); - } - } + String &header_value=*new String(header.value, String::L_TAINTED); - if(as_text && raw_body_size>=3 && strncmp(raw_body, "\xEF\xBB\xBF", 3)==0){ - // skip UTF-8 signature (BOM code) - raw_body+=3; - raw_body_size-=3; - if(!real_remote_charset) - real_remote_charset=&UTF8_charset; + tables_update(vtables->hash(), header.name, header_value); + result.headers->put(header.name, new VString(header_value)); } + // filling $.cookies + if(Value *vcookies=vtables->hash().get("SET-COOKIE")) + result.headers->put(HTTP_COOKIES_NAME, new VTable(parse_cookies(r, vcookies->get_table()))); + // output response String::C real_body=String::C(raw_body, raw_body_size); if(as_text && transcode_text_result && raw_body_size) { // raw_body_size must be checked because transcode returns CONST string in case length==0, which contradicts hacking few lines below - // defaulting to used-asked charset [it's never empty!] - if(!real_remote_charset) - real_remote_charset=asked_remote_charset; - real_body=Charset::transcode(real_body, *real_remote_charset, r.charsets.source()); - } result.str=const_cast(real_body.str); // hacking a little