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

Cleanup of content max_size checks

Browse source
This commit is contained in:
eidheim 2020-02-04 09:09:12 +01:00
commit d96ed6f02c
2 changed files with 40 additions and 66 deletions
Download patch file Download diff file Expand all files Collapse all files

62
client_http.hpp
View file

@ -730,16 +730,16 @@ namespace SimpleWeb {
return;
}
if(chunk_size + session->response->streambuf.size() > session->response->streambuf.max_size()) {
session->response->content.end = false;
session->callback(ec);
session->response = std::shared_ptr<Response>(new Response(*session->response));
}
auto num_additional_bytes = chunk_size_streambuf->size() - bytes_transferred;
auto bytes_to_move = std::min<std::size_t>(chunk_size, num_additional_bytes);
if(bytes_to_move > 0) {
if(bytes_to_move + session->response->streambuf.size() >= session->response->streambuf.max_size()) {
session->response->content.end = false;
session->callback(ec);
session->response = std::shared_ptr<Response>(new Response(*session->response));
}
auto &source = *chunk_size_streambuf;
auto &target = session->response->streambuf;
target.commit(asio::buffer_copy(target.prepare(bytes_to_move), source.data(), bytes_to_move));
@ -747,7 +747,25 @@ namespace SimpleWeb {
}
if((2 + chunk_size) > num_additional_bytes) {
read_chunk(session, chunk_size_streambuf, 2 + chunk_size - num_additional_bytes);
session->connection->set_timeout();
asio::async_read(*session->connection->socket, session->response->streambuf, asio::transfer_exactly(2 + chunk_size - num_additional_bytes), [this, session, chunk_size_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) {
std::istream istream(&session->response->streambuf);
// Remove "\r\n"
istream.get();
istream.get();
read_chunked_transfer_encoded(session, chunk_size_streambuf);
}
else
session->callback(ec);
});
}
else {
// Remove "\r\n"
@ -762,36 +780,6 @@ namespace SimpleWeb {
});
}
void read_chunk(const std::shared_ptr<Session> &session, const std::shared_ptr<asio::streambuf> &chunk_size_streambuf, std::size_t remaining_length) {
session->connection->set_timeout();
asio::async_read(*session->connection->socket, session->response->streambuf, asio::transfer_exactly(remaining_length), [this, session, chunk_size_streambuf, remaining_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->response->streambuf.size() == session->response->streambuf.max_size() && remaining_length > bytes_transferred) {
session->response->content.end = false;
session->callback(ec);
session->response = std::shared_ptr<Response>(new Response(*session->response));
this->read_chunk(session, chunk_size_streambuf, remaining_length - bytes_transferred);
}
else {
std::istream istream(&session->response->streambuf);
// Remove "\r\n"
istream.get();
istream.get();
read_chunked_transfer_encoded(session, chunk_size_streambuf);
}
}
else
session->callback(ec);
});
}
void read_server_sent_event(const std::shared_ptr<Session> &session, const std::shared_ptr<asio::streambuf> &events_streambuf) {
session->connection->set_timeout();
asio::async_read_until(*session->connection->socket, *events_streambuf, HeaderEndMatch(), [this, session, events_streambuf](const error_code &ec, std::size_t /*bytes_transferred*/) {

44
server_http.hpp
View file

@ -527,13 +527,6 @@ namespace SimpleWeb {
if(!lock)
return;
session->request->header_read_time = std::chrono::system_clock::now();
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);
if(this->on_error)
this->on_error(session->request, make_error_code::make_error_code(errc::message_size));
return;
}
if(!ec) {
// request->streambuf.size() is not necessarily the same as bytes_transferred, from Boost-docs:
@ -561,6 +554,13 @@ namespace SimpleWeb {
this->on_error(session->request, make_error_code::make_error_code(errc::protocol_error));
return;
}
if(content_length > 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);
if(this->on_error)
this->on_error(session->request, make_error_code::make_error_code(errc::message_size));
return;
}
if(content_length > num_additional_bytes) {
session->connection->set_timeout(config.timeout_content);
asio::async_read(*session->connection->socket, session->request->streambuf, asio::transfer_exactly(content_length - num_additional_bytes), [this, session](const error_code &ec, std::size_t /*bytes_transferred*/) {
@ -568,13 +568,6 @@ namespace SimpleWeb {
auto lock = session->connection->handler_runner->continue_lock();
if(!lock)
return;
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);
if(this->on_error)
this->on_error(session->request, make_error_code::make_error_code(errc::message_size));
return;
}
if(!ec)
this->find_resource(session);
@ -628,6 +621,14 @@ namespace SimpleWeb {
return;
}
if(chunk_size + 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);
if(this->on_error)
this->on_error(session->request, make_error_code::make_error_code(errc::message_size));
return;
}
auto num_additional_bytes = chunk_size_streambuf->size() - bytes_transferred;
auto bytes_to_move = std::min<std::size_t>(chunk_size, num_additional_bytes);
@ -637,14 +638,6 @@ namespace SimpleWeb {
auto &target = session->request->streambuf;
target.commit(asio::buffer_copy(target.prepare(bytes_to_move), source.data(), bytes_to_move));
source.consume(bytes_to_move);
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);
if(this->on_error)
this->on_error(session->request, make_error_code::make_error_code(errc::message_size));
return;
}
}
if((2 + chunk_size) > num_additional_bytes) {
@ -654,13 +647,6 @@ namespace SimpleWeb {
auto lock = session->connection->handler_runner->continue_lock();
if(!lock)
return;
if(chunk_size_streambuf->size() == chunk_size_streambuf->max_size()) {
auto response = std::shared_ptr<Response>(new Response(session, this->config.timeout_content));
response->write(StatusCode::client_error_payload_too_large);
if(this->on_error)
this->on_error(session->request, make_error_code::make_error_code(errc::message_size));
return;
}
if(!ec) {
std::istream istream(&session->request->streambuf);