MirrorHub/construct
0
0
Fork 0
mirror of https://github.com/matrix-construct/construct synced 2024-12-28 16:34:13 +01:00
Code Issues Releases Wiki Activity

ircd: Interrupt client request parsing with 408 Request Time-out after timeout.

Browse source
This commit is contained in:
Jason Volk 2017-03-13 18:39:54 -07:00
parent 55be9a9f6d
commit 4a65843064
1 changed files with 58 additions and 20 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

78
ircd/client.cc
View file

@ -30,6 +30,16 @@
namespace ircd { namespace ircd {
const auto async_timeout
{
15s
};
const auto request_timeout
{
30s
};
ctx::pool request ctx::pool request
{ {
"request", 1_MiB "request", 1_MiB
@ -65,24 +75,6 @@ noexcept
disconnect_all(); disconnect_all();
} }
ircd::http::response::write_closure
ircd::write_closure(client &client)
{
return [&client](const const_buffers &iov)
{
write(*client.sock, iov);
};
}
ircd::parse::read_closure
ircd::read_closure(client &client)
{
return [&client](char *&start, char *const &stop)
{
read(client, start, stop);
};
}
ircd::string_view ircd::string_view
ircd::readline(client &client, ircd::readline(client &client,
char *&start, char *&start,
@ -162,6 +154,43 @@ ircd::remote_addr(const client &client)
return { hostaddr(ep), port(ep) }; return { hostaddr(ep), port(ep) };
} }
ircd::http::response::write_closure
ircd::write_closure(client &client)
{
return [&client](const const_buffers &iov)
{
write(*client.sock, iov);
};
}
ircd::parse::read_closure
ircd::read_closure(client &client)
{
static const auto handle_error([]
(const boost::system::system_error &e)
{
using namespace boost::system::errc;
switch(e.code().value())
{
case operation_canceled: throw http::error(http::REQUEST_TIMEOUT);
default: throw boost::system::system_error(e);
}
});
return [&client](char *&start, char *const &stop)
{
try
{
read(client, start, stop);
}
catch(const boost::system::system_error &e)
{
handle_error(e);
}
};
}
ircd::client::client() ircd::client::client()
:client{std::shared_ptr<socket>{}} :client{std::shared_ptr<socket>{}}
{ {
@ -222,7 +251,7 @@ try
parse::capstan pc{pb, read_closure(*this)}; do parse::capstan pc{pb, read_closure(*this)}; do
{ {
if(!handle_request(*this, pc)) if(!handle_request(*this, pc))
break; return false;
pb.remove(); pb.remove();
} }
@ -244,11 +273,19 @@ ircd::handle_request(client &client,
parse::capstan &pc) parse::capstan &pc)
try try
{ {
client.sock->set_timeout(request_timeout, [&client]
(const error_code &ec)
{
if(!ec)
client.sock->cancel();
});
http::request http::request
{ {
pc, nullptr, write_closure(client), [&client, &pc] pc, nullptr, write_closure(client), [&client, &pc]
(const auto &head) (const auto &head)
{ {
client.sock->timer.cancel();
handle_request(client, pc, head); handle_request(client, pc, head);
} }
}; };
@ -266,6 +303,7 @@ catch(const http::error &e)
{ {
case http::BAD_REQUEST: return false; case http::BAD_REQUEST: return false;
case http::INTERNAL_SERVER_ERROR: return false; case http::INTERNAL_SERVER_ERROR: return false;
case http::REQUEST_TIMEOUT: return false;
default: return true; default: return true;
} }
} }
@ -296,7 +334,7 @@ ircd::add_client(std::shared_ptr<socket> s)
string(remote_addr(*client)).c_str(), string(remote_addr(*client)).c_str(),
string(local_addr(*client)).c_str()); string(local_addr(*client)).c_str());
async_recv_next(client, 30s); async_recv_next(client, async_timeout);
return client; return client;
} }