Allow body-up-to-EOF HTTP responses

Implements the same heuristic as Curl (and web browsers): if no `Content-Length`, no `Connection: keep-alive` and no chunked transfer encoding, assume th rest of the data until EOF is the body, gracefully setting the HTTP client back to the disconnected state.

Theoretically, this is not compliant with HTTP 1.1, by which `keep-alive` is the default, but in practice, an explicit header is sent by servers.
This commit is contained in:
Pedro J. Estébanez 2018-04-18 20:50:31 +02:00
parent b22f048700
commit 2587fcccee
4 changed files with 52 additions and 15 deletions

View File

@ -248,6 +248,7 @@ void HTTPClient::close() {
body_size = 0; body_size = 0;
body_left = 0; body_left = 0;
chunk_left = 0; chunk_left = 0;
read_until_eof = false;
response_num = 0; response_num = 0;
} }
@ -352,10 +353,17 @@ Error HTTPClient::poll() {
chunked = false; chunked = false;
body_left = 0; body_left = 0;
chunk_left = 0; chunk_left = 0;
read_until_eof = false;
response_str.clear(); response_str.clear();
response_headers.clear(); response_headers.clear();
response_num = RESPONSE_OK; response_num = RESPONSE_OK;
// Per the HTTP 1.1 spec, keep-alive is the default, but in practice
// it's safe to assume it only if the explicit header is found, allowing
// to handle body-up-to-EOF responses on naive servers; that's what Curl
// and browsers do
bool keep_alive = false;
for (int i = 0; i < responses.size(); i++) { for (int i = 0; i < responses.size(); i++) {
String header = responses[i].strip_edges(); String header = responses[i].strip_edges();
@ -365,13 +373,14 @@ Error HTTPClient::poll() {
if (s.begins_with("content-length:")) { if (s.begins_with("content-length:")) {
body_size = s.substr(s.find(":") + 1, s.length()).strip_edges().to_int(); body_size = s.substr(s.find(":") + 1, s.length()).strip_edges().to_int();
body_left = body_size; body_left = body_size;
}
if (s.begins_with("transfer-encoding:")) { } else if (s.begins_with("transfer-encoding:")) {
String encoding = header.substr(header.find(":") + 1, header.length()).strip_edges(); String encoding = header.substr(header.find(":") + 1, header.length()).strip_edges();
if (encoding == "chunked") { if (encoding == "chunked") {
chunked = true; chunked = true;
} }
} else if (s.begins_with("connection: keep-alive")) {
keep_alive = true;
} }
if (i == 0 && responses[i].begins_with("HTTP")) { if (i == 0 && responses[i].begins_with("HTTP")) {
@ -384,11 +393,16 @@ Error HTTPClient::poll() {
} }
} }
if (body_size == 0 && !chunked) { if (body_size || chunked) {
status = STATUS_CONNECTED; // Ready for new requests
} else {
status = STATUS_BODY; status = STATUS_BODY;
} else if (!keep_alive) {
read_until_eof = true;
status = STATUS_BODY;
} else {
status = STATUS_CONNECTED;
} }
return OK; return OK;
} }
@ -515,34 +529,53 @@ PoolByteArray HTTPClient::read_response_body_chunk() {
} else { } else {
int to_read = MIN(body_left, read_chunk_size); int to_read = !read_until_eof ? MIN(body_left, read_chunk_size) : read_chunk_size;
PoolByteArray ret; PoolByteArray ret;
ret.resize(to_read); ret.resize(to_read);
int _offset = 0; int _offset = 0;
while (to_read > 0) { while (read_until_eof || to_read > 0) {
int rec = 0; int rec = 0;
{ {
PoolByteArray::Write w = ret.write(); PoolByteArray::Write w = ret.write();
err = _get_http_data(w.ptr() + _offset, to_read, rec); err = _get_http_data(w.ptr() + _offset, to_read, rec);
} }
if (rec > 0) { if (rec < 0) {
body_left -= rec;
to_read -= rec;
_offset += rec;
} else {
if (to_read > 0) // Ended up reading less if (to_read > 0) // Ended up reading less
ret.resize(_offset); ret.resize(_offset);
break; break;
} else {
_offset += rec;
if (!read_until_eof) {
body_left -= rec;
to_read -= rec;
} else {
if (rec < to_read) {
ret.resize(_offset);
err = ERR_FILE_EOF;
break;
}
ret.resize(_offset + to_read);
}
} }
} }
if (body_left == 0) { if (!read_until_eof) {
status = STATUS_CONNECTED; if (body_left == 0) {
status = STATUS_CONNECTED;
}
return ret;
} else {
if (err == ERR_FILE_EOF) {
err = OK; // EOF is expected here
close();
return ret;
}
} }
return ret;
} }
if (err != OK) { if (err != OK) {
close(); close();
if (err == ERR_FILE_EOF) { if (err == ERR_FILE_EOF) {
status = STATUS_DISCONNECTED; // Server disconnected status = STATUS_DISCONNECTED; // Server disconnected
@ -602,6 +635,7 @@ HTTPClient::HTTPClient() {
body_size = 0; body_size = 0;
chunked = false; chunked = false;
body_left = 0; body_left = 0;
read_until_eof = false;
chunk_left = 0; chunk_left = 0;
response_num = 0; response_num = 0;
ssl = false; ssl = false;

View File

@ -173,6 +173,7 @@ private:
int chunk_left; int chunk_left;
int body_size; int body_size;
int body_left; int body_left;
bool read_until_eof;
Ref<StreamPeerTCP> tcp_connection; Ref<StreamPeerTCP> tcp_connection;
Ref<StreamPeer> connection; Ref<StreamPeer> connection;

View File

@ -290,6 +290,7 @@ Error StreamPeerTCPPosix::read(uint8_t *p_buffer, int p_bytes, int &r_received,
status = STATUS_NONE; status = STATUS_NONE;
peer_port = 0; peer_port = 0;
peer_host = IP_Address(); peer_host = IP_Address();
r_received = total_read;
return ERR_FILE_EOF; return ERR_FILE_EOF;
} else { } else {

View File

@ -212,6 +212,7 @@ Error StreamPeerTCPWinsock::read(uint8_t *p_buffer, int p_bytes, int &r_received
_block(sockfd, true, false); _block(sockfd, true, false);
} else if (read == 0) { } else if (read == 0) {
disconnect_from_host(); disconnect_from_host();
r_received = total_read;
return ERR_FILE_EOF; return ERR_FILE_EOF;
} else { } else {