jyapayne/Simple-Web-Server
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Fixes #173: added server support for chunked transfer encoded requests

Browse source
This commit is contained in:
eidheim 2017-11-18 13:34:28 +01:00
commit 101a471ca9
2 changed files with 103 additions and 6 deletions
Download patch file Download diff file Expand all files Collapse all files

6
client_http.hpp
View file

@ -492,7 +492,7 @@ namespace SimpleWeb {
session->callback(session->connection, ec);
}
else if((header_it = session->response->header.find("Transfer-Encoding")) != session->response->header.end() && header_it->second == "chunked") {
auto chunks_streambuf = std::make_shared<asio::streambuf>();
auto chunks_streambuf = std::make_shared<asio::streambuf>(this->config.max_response_streambuf_size);
this->read_chunked_transfer_encoded(session, chunks_streambuf);
}
else if(session->response->http_version < "1.1" || ((header_it = session->response->header.find("Session")) != session->response->header.end() && header_it->second == "close")) {
@ -613,8 +613,8 @@ namespace SimpleWeb {
read_chunked_transfer_encoded(session, chunks_streambuf);
else {
if(chunks_streambuf->size() > 0) {
std::ostream response_stream(&session->response->streambuf);
response_stream << chunks_streambuf.get();
std::ostream ostream(&session->response->streambuf);
ostream << chunks_streambuf.get();
}
error_code ec;
session->callback(session->connection, ec);

103
server_http.hpp
View file

@ -460,11 +460,11 @@ namespace SimpleWeb {
}
// If content, read that as well
auto it = session->request->header.find("Content-Length");
if(it != session->request->header.end()) {
auto header_it = session->request->header.find("Content-Length");
if(header_it != session->request->header.end()) {
unsigned long long content_length = 0;
try {
content_length = stoull(it->second);
content_length = stoull(header_it->second);
}
catch(const std::exception &e) {
if(this->on_error)
@ -496,6 +496,10 @@ namespace SimpleWeb {
else
this->find_resource(session);
}
else if((header_it = session->request->header.find("Transfer-Encoding")) != session->request->header.end() && header_it->second == "chunked") {
auto chunks_streambuf = std::make_shared<asio::streambuf>(this->config.max_request_streambuf_size);
this->read_chunked_transfer_encoded(session, chunks_streambuf);
}
else
this->find_resource(session);
}
@ -504,6 +508,99 @@ namespace SimpleWeb {
});
}
void read_chunked_transfer_encoded(const std::shared_ptr<Session> &session, const std::shared_ptr<asio::streambuf> &chunks_streambuf) {
session->connection->set_timeout(config.timeout_content);
asio::async_read_until(*session->connection->socket, session->request->streambuf, "\r\n", [this, session, chunks_streambuf](const error_code &ec, size_t bytes_transferred) {
session->connection->cancel_timeout();
auto lock = session->connection->handler_runner->continue_lock();
if(!lock)
return;
if((!ec || ec == asio::error::not_found) && session->request->streambuf.size() == session->request->streambuf.max_size()) {
auto response = std::shared_ptr<Response>(new Response(session, this->config.timeout_content));
response->write(StatusCode::client_error_payload_too_large);
response->send();
if(this->on_error)
this->on_error(session->request, make_error_code::make_error_code(errc::message_size));
return;
}
if(!ec) {
std::string line;
getline(session->request->content, line);
bytes_transferred -= line.size() + 1;
line.pop_back();
unsigned long length = 0;
try {
length = stoul(line, 0, 16);
}
catch(...) {
if(this->on_error)
this->on_error(session->request, make_error_code::make_error_code(errc::protocol_error));
return;
}
auto num_additional_bytes = session->request->streambuf.size() - bytes_transferred;
if((2 + length) > num_additional_bytes) {
session->connection->set_timeout(config.timeout_content);
asio::async_read(*session->connection->socket, session->request->streambuf, asio::transfer_exactly(2 + length - num_additional_bytes), [this, session, chunks_streambuf, length](const error_code &ec, size_t /*bytes_transferred*/) {
session->connection->cancel_timeout();
auto lock = session->connection->handler_runner->continue_lock();
if(!lock)
return;
if(!ec) {
if(session->request->streambuf.size() == session->request->streambuf.max_size()) {
auto response = std::shared_ptr<Response>(new Response(session, this->config.timeout_content));
response->write(StatusCode::client_error_payload_too_large);
response->send();
if(this->on_error)
this->on_error(session->request, make_error_code::make_error_code(errc::message_size));
return;
}
this->read_chunked_transfer_encoded_chunk(session, chunks_streambuf, length);
}
else if(this->on_error)
this->on_error(session->request, ec);
});
}
else
this->read_chunked_transfer_encoded_chunk(session, chunks_streambuf, length);
}
else if(this->on_error)
this->on_error(session->request, ec);
});
}
void read_chunked_transfer_encoded_chunk(const std::shared_ptr<Session> &session, const std::shared_ptr<asio::streambuf> &chunks_streambuf, unsigned long length) {
std::ostream tmp_stream(chunks_streambuf.get());
if(length > 0) {
std::unique_ptr<char[]> buffer(new char[length]);
session->request->content.read(buffer.get(), static_cast<std::streamsize>(length));
tmp_stream.write(buffer.get(), static_cast<std::streamsize>(length));
if(chunks_streambuf->size() == chunks_streambuf->max_size()) {
auto response = std::shared_ptr<Response>(new Response(session, this->config.timeout_content));
response->write(StatusCode::client_error_payload_too_large);
response->send();
if(this->on_error)
this->on_error(session->request, make_error_code::make_error_code(errc::message_size));
return;
}
}
// Remove "\r\n"
session->request->content.get();
session->request->content.get();
if(length > 0)
read_chunked_transfer_encoded(session, chunks_streambuf);
else {
if(chunks_streambuf->size() > 0) {
std::ostream ostream(&session->request->streambuf);
ostream << chunks_streambuf.get();
}
this->find_resource(session);
}
}
void find_resource(const std::shared_ptr<Session> &session) {
// Upgrade connection
if(on_upgrade) {