--- parser3/src/main/pa_http.C 2021/01/02 23:01:11 1.117 +++ parser3/src/main/pa_http.C 2026/04/25 13:38:46 1.135 @@ -1,8 +1,8 @@ /** @file Parser: http support functions. - Copyright (c) 2001-2020 Art. Lebedev Studio (http://www.artlebedev.com) - Author: Alexandr Petrosian (http://paf.design.ru) + Copyright (c) 2001-2026 Art. Lebedev Studio (https://www.artlebedev.com) + Authors: Konstantin Morshnev , Alexandr Petrosian */ #include "pa_http.h" @@ -14,14 +14,7 @@ #include "pa_vfile.h" #include "pa_random.h" -volatile const char * IDENT_PA_HTTP_C="$Id: pa_http.C,v 1.117 2021/01/02 23:01:11 moko Exp $" IDENT_PA_HTTP_H; - -#ifdef _MSC_VER -#include -#define socklen_t int -#else -#define closesocket close -#endif +volatile const char * IDENT_PA_HTTP_C="$Id: pa_http.C,v 1.135 2026/04/25 13:38:46 moko Exp $" IDENT_PA_HTTP_H; // defines @@ -49,11 +42,37 @@ volatile const char * IDENT_PA_HTTP_C="$ // helpers +#ifdef HTTPD_DEBUG +void pa_log(const char* fmt, ...); +#define LOG(action) action +#else +#define LOG(action) +#endif + +ssize_t pa_send(int sock, const char *buffer, size_t len){ + size_t total_sent = 0; + while (total_sent < len) { + ssize_t bytes_sent=send(sock, buffer + total_sent, len - total_sent, 0); + if (bytes_sent < 0) { + return bytes_sent; + } else if (bytes_sent == 0) { + // Connection closed by the remote peer? + break; + } + LOG( + if(bytes_sent != len - total_sent) + pa_log("httpd [%d] partial send %d of (%d)", sock, bytes_sent, len - total_sent) + ); + total_sent += bytes_sent; + } + return total_sent; +} + bool HTTP_Headers::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")); + Header header = Header(String::Body(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; @@ -113,7 +132,7 @@ public: buf=(char *)pa_realloc(buf, size + 1); } - bool read(int sock, size_t size){ + bool read(SOCKET sock, size_t size){ if(length + size > buf_size) resize(buf_size * 2 + size); ssize_t received_size=recv(sock, buf + length, size, 0); @@ -180,16 +199,16 @@ public: ArrayString aheaders; header_block.split(aheaders, 0, "\n"); - Array_iterator i(aheaders); + ArrayString::Iterator i(aheaders); i.next(); // skipping status - for(;i.has_next();){ + for(;i;){ const char *line=i.next()->cstr(); if(!headers.add_header(line)) throw Exception("http.response", 0, "bad response from host - bad header \"%s\"", line); } } - int read_response(int sock, bool fail_on_status_ne_200); + int read_response(SOCKET sock, bool fail_on_status_ne_200); }; enum HTTP_response_state { @@ -198,7 +217,7 @@ enum HTTP_response_state { HTTP_BODY }; -int HTTP_response::read_response(int sock, bool fail_on_status_ne_200) { +int HTTP_response::read_response(SOCKET sock, bool fail_on_status_ne_200) { HTTP_response_state state=HTTP_STATUS_CODE; int result=0; @@ -264,7 +283,10 @@ static sigjmp_buf timeout_env; static void timeout_handler(int /*sig*/){ siglongjmp(timeout_env, 1); } -#define ALARM(value) alarm(value) + +#define PA_NO_THREADS (HTTPD_Server::mode != HTTPD_Server::MULTITHREADED) + +#define ALARM(value) if(PA_NO_THREADS) alarm(value) #else #define ALARM(value) #endif @@ -273,13 +295,13 @@ static int http_request(HTTP_response& r if(!host) throw Exception("http.host", 0, "zero hostname"); //never - volatile int sock=-1; // to prevent makeing it register variable, because it will be clobbered by longjmp [thanks gcc warning] + volatile SOCKET sock=INVALID_SOCKET; // to prevent makeing it register variable, because it will be clobbered by longjmp [thanks gcc warning] #ifdef PA_USE_ALARM - signal(SIGALRM, timeout_handler); - if(sigsetjmp(timeout_env, 1)) { + if(PA_NO_THREADS) signal(SIGALRM, timeout_handler); + if(PA_NO_THREADS && sigsetjmp(timeout_env, 1)) { // duplicating closesocket to make code more simple for old compilers - if(sock>=0) + if(sock != INVALID_SOCKET) closesocket(sock); throw Exception("http.timeout", 0, "timeout occurred while retrieving document"); return 0; // never @@ -292,11 +314,11 @@ static int http_request(HTTP_response& r 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, "cannot resolve hostname \"%s\"", host); - if((sock=socket(AF_INET, SOCK_STREAM, IPPROTO_TCP/*0*/))<0) { + if((sock=socket(AF_INET, SOCK_STREAM, IPPROTO_TCP/*0*/)) == INVALID_SOCKET) { 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, "cannot make socket: %s (%d)", pa_socks_strerr(no), no); } // To enable SO_DONTLINGER (that is, disable SO_LINGER) @@ -315,10 +337,10 @@ static int http_request(HTTP_response& r 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, "cannot connect to host \"%s\": %s (%d)", host, pa_socks_strerr(no), no); } - if(send(sock, request, request_size, 0)!=(ssize_t)request_size) { + if(pa_send(sock, request, request_size) < 0) { int no=pa_socks_errno(); throw Exception("http.timeout", 0, "error sending request: %s (%d)", pa_socks_strerr(no), no); } @@ -329,7 +351,7 @@ static int http_request(HTTP_response& r return result; } catch(...) { ALARM(0); - if(sock>=0) + if(sock != INVALID_SOCKET) closesocket(sock); rethrow; } @@ -515,7 +537,7 @@ static void form_value2part(HashStringVa Form_table_value2string_info info(key, *part.string); part.info = &info; tvalue->for_each(form_table_value2part, &part); - } else if(VFile* vfile=static_cast(value->as("file"))){ + } else if(VFile* vfile=dynamic_cast(value)){ 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()); @@ -555,7 +577,8 @@ static ArrayString* parse_cookie(Request if(first_pair) { // name + value name=sname; - value=smeaning; + if(smeaning) + value=smeaning; first_pair=false; } else { const String& slower=sname->change_case(r.charsets.source(), String::CC_LOWER); @@ -598,7 +621,7 @@ static ArrayString* parse_cookie(Request Table* parse_cookies(Request& r, Table *cookies){ Table& result=*new Table(new Cookies_table_template_columns); - for(Array_iterator i(*cookies); i.has_next(); ) + for(Array_iterator i(*cookies); i; ) if(ArrayString* row=parse_cookie(r, *i.next()->get(0))) result+=row; @@ -707,7 +730,7 @@ 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 cannot use $." HTTP_FORM_ENCTYPE_NAME " option with method GET"); multipart=strcasecmp(encode, HTTP_CONTENT_TYPE_MULTIPART_FORMDATA)==0; @@ -717,10 +740,10 @@ File_read_http_result pa_internal_file_r 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 cannot 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 cannot use options $." HTTP_BODY_NAME " and $." HTTP_FORM_NAME " together"); } //preparing request @@ -739,7 +762,7 @@ File_read_http_result pa_internal_file_r 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; + pa_strncpy(host, current, sizeof(host)); char* host_uri=lsplit(host, '/'); uri=host_uri?current+(host_uri-1-host):"/"; char* port_cstr=lsplit(host, ':'); @@ -835,7 +858,7 @@ File_read_http_result pa_internal_file_r } if(request_body) - head << "Content-Length: " << format(post_size, "%u") << CRLF; + head << "Content-Length: " << pa_uitoa(post_size) << CRLF; head << CRLF; @@ -867,7 +890,7 @@ File_read_http_result pa_internal_file_r result.headers=new HashStringValue; VHash* vtables=new VHash; - result.headers->put("tables", vtables); + HASH_PUT_CSTR(*result.headers, "tables", vtables); if (!real_remote_charset && !response.headers.content_type.is_empty()) real_remote_charset=detect_charset(response.headers.content_type.cstr()); @@ -878,7 +901,7 @@ File_read_http_result pa_internal_file_r if (!real_remote_charset) real_remote_charset=asked_remote_charset; // never null - for(Array_iterator i(response.headers.headers); i.has_next(); ){ + for(Array_iterator i(response.headers.headers); i; ){ HTTP_Headers::Header header=i.next(); header.transcode(*real_remote_charset, r.charsets.source()); @@ -891,7 +914,7 @@ File_read_http_result pa_internal_file_r // filling $.cookies if(vcookies=vtables->hash().get("SET-COOKIE")) - result.headers->put(HTTP_COOKIES_NAME, new VTable(parse_cookies(r, vcookies->get_table()))); + HASH_PUT_CSTR(*result.headers, HTTP_COOKIES_NAME, new VTable(parse_cookies(r, vcookies->get_table()))); // output response String::C real_body=String::C(raw_body, raw_body_size); @@ -913,13 +936,6 @@ File_read_http_result pa_internal_file_r /* ********************** httpd *************************** */ -#ifdef HTTPD_DEBUG -void pa_log(const char* fmt, ...); -#define LOG(action) action -#else -#define LOG(action) -#endif - enum EscapeState { Initial, Default, @@ -929,7 +945,7 @@ enum EscapeState { static bool check_uri(const char *uri){ EscapeState state=Initial; - uint escapedValue; + uint escapedValue=0; const char *pattern="/../"; const char *pos=pattern; @@ -988,9 +1004,9 @@ public: HTTPD_request() : HTTP_response(), method(NULL), uri(NULL){}; - ssize_t pa_recv(int sockfd, char *buf, size_t len); + ssize_t pa_recv(SOCKET sockfd, char *buf, size_t len); - bool read(int sock, size_t size){ + bool read(SOCKET sock, size_t size){ if(length + size > buf_size) resize(buf_size * 2 + size); ssize_t received_size=pa_recv(sock, buf + length, size); @@ -1025,8 +1041,8 @@ public: } - bool read_header(int); - size_t read_post(int, char *, size_t); + bool read_header(SOCKET); + size_t read_post(SOCKET, char *, size_t); }; enum HTTPD_request_state { @@ -1034,17 +1050,12 @@ enum HTTPD_request_state { HTTPD_HEADERS }; -ssize_t HTTPD_request::pa_recv(int sockfd, char *buffer, size_t len){ +ssize_t HTTPD_request::pa_recv(SOCKET sockfd, char *buffer, size_t len){ LOG(pa_log("httpd [%d] recv %d appending to %d ...", sockfd, len, length)); - if(HTTPD_Server::mode == HTTPD_Server::MULTITHREADED){ - ssize_t result=recv(sockfd, buffer, len, 0); - LOG(pa_log("httpd [%d] recv got %d bytes", sockfd, result)); - return result; - } #ifdef PA_USE_ALARM - signal(SIGALRM, timeout_handler); - if(sigsetjmp(timeout_env, 1)) { + if(PA_NO_THREADS) signal(SIGALRM, timeout_handler); + if(PA_NO_THREADS && sigsetjmp(timeout_env, 1)) { LOG(pa_log("httpd [%d] recv got %d sec timeout", sockfd, pa_httpd_timeout)); if(length) // timeout on "void" connection is normal throw Exception("httpd.timeout", 0, "timeout occurred while receiving request"); @@ -1075,7 +1086,7 @@ static bool valid_http_method(const char ); } -bool HTTPD_request::read_header(int sock) { +bool HTTPD_request::read_header(SOCKET sock) { enum HTTPD_request_state state = HTTPD_METHOD; size_t chunk_size = 0x400*4; @@ -1122,7 +1133,7 @@ bool HTTPD_request::read_header(int sock return true; } -size_t HTTPD_request::read_post(int sock, char *body, size_t max_bytes) { +size_t HTTPD_request::read_post(SOCKET sock, char *body, size_t max_bytes) { size_t total_read = min(length - body_offset, max_bytes); memcpy(body, buf + body_offset, total_read); @@ -1178,34 +1189,32 @@ size_t HTTPD_Connection::read_post(char size_t HTTPD_Connection::send_body(const void *buf, size_t size) { LOG(pa_log("httpd [%d] response %d bytes", sock, size)); LOG(pa_log("httpd [%d] %s", sock, buf)); - if(send(sock, (const char*)buf, size, 0) != (ssize_t)size) { + ssize_t result=pa_send(sock, (const char*)buf, size); + if(result < 0) { int no=pa_socks_errno(); throw Exception("httpd.write", 0, "error sending response: %s (%d)", pa_socks_strerr(no), no); } - return size; + return result; } HTTPD_Connection::~HTTPD_Connection(){ - if(sock != -1){ + if(sock != INVALID_SOCKET){ LOG(pa_log("httpd [%d] closed", sock)); closesocket(sock); } } -static int sock_ready(int fd,int operation,int timeout_value){ +static int sock_ready(SOCKET fd, int timeout_value){ struct timeval timeout = {0, timeout_value * 1000}; fd_set fds; FD_ZERO(&fds); FD_SET(fd, &fds); - switch (operation){ - case 0: return select(fd + 1, &fds, NULL, NULL, &timeout)>0; /* read */ - case 1: return select(fd + 1, NULL, &fds, NULL, &timeout)>0; /* write */ - default: return select(fd + 1, &fds, &fds, NULL, &timeout)>0; /* both */ - } + int nfds = (int)fd + 1; /* typecast as nfds is ignored in MSVC anyway */ + return select(nfds, &fds, NULL, NULL, &timeout)>0; /* read */ } -bool HTTPD_Connection::accept(int server_sock, int timeout_value) { - int ready = sock_ready(server_sock, 0, timeout_value); +bool HTTPD_Connection::accept(SOCKET server_sock, int timeout_value) { + int ready = sock_ready(server_sock, timeout_value); if (ready < 0) { int no=pa_socks_errno(); if(no == EINTR) @@ -1220,11 +1229,15 @@ bool HTTPD_Connection::accept(int server memset(&addr, 0, sock_addr_len); sock = ::accept(server_sock, (struct sockaddr *)&addr, &sock_addr_len); - if(server_sock == -1){ + if(sock == INVALID_SOCKET){ int no=pa_socks_errno(); throw Exception("httpd.accept", 0, "error accepting connection: %s (%d)", pa_socks_strerr(no), no); } +// Has no positive performance effect, requires include +// static int sock_on=1; +// setsockopt(sock, IPPROTO_TCP, TCP_NODELAY, (char *)&sock_on, sizeof(sock_on)); + remote_addr = pa_strdup(inet_ntoa(addr.sin_addr)); LOG(pa_log("httpd [%d] accepted from %s", sock, remote_addr)); return true; @@ -1246,7 +1259,7 @@ void HTTPD_Server::set_mode(const String #endif } -int HTTPD_Server::bind(const char *host_port){ +SOCKET HTTPD_Server::bind(const char *host_port){ struct sockaddr_in me; port = strchr(host_port, ':'); @@ -1261,15 +1274,15 @@ int HTTPD_Server::bind(const char *host_ if(!set_addr(&me, host, (short)pa_atoui(port))){ if (host) - throw Exception("httpd.bind", 0, "can not resolve hostname \"%s\"", host); + throw Exception("httpd.bind", 0, "cannot resolve hostname \"%s\"", host); me.sin_addr.s_addr=INADDR_ANY; } - int sock = socket(AF_INET, SOCK_STREAM, IPPROTO_TCP/*0*/); + SOCKET sock = socket(AF_INET, SOCK_STREAM, IPPROTO_TCP/*0*/); - if(sock < 0){ + if(sock == INVALID_SOCKET){ int no=pa_socks_errno(); - throw Exception("httpd.bind", 0, "can not make socket: %s (%d)", pa_socks_strerr(no), no); + throw Exception("httpd.bind", 0, "cannot make socket: %s (%d)", pa_socks_strerr(no), no); } static int sock_on = 1; @@ -1280,7 +1293,7 @@ int HTTPD_Server::bind(const char *host_ listen(sock, 16)) { closesocket(sock); int no = pa_socks_errno(); - throw Exception("httpd.bind", 0, "can not bind socket: %s (%d)", pa_socks_strerr(no), no); + throw Exception("httpd.bind", 0, "cannot bind socket: %s (%d)", pa_socks_strerr(no), no); } return sock; }