mirror of
https://github.com/bitcoin/bitcoin.git
synced 2025-07-13 00:47:05 +02:00
i2p: limit the size of incoming messages
Put a limit on the amount of data `Sock::RecvUntilTerminator()` can read if no terminator is received. In the case of I2P this avoids a runaway (or malicious) I2P proxy sending us tons of data without a terminator before a timeout is triggered.
This commit is contained in:
@ -153,7 +153,7 @@ bool Session::Accept(Connection& conn)
|
|||||||
}
|
}
|
||||||
|
|
||||||
const std::string& peer_dest =
|
const std::string& peer_dest =
|
||||||
conn.sock.RecvUntilTerminator('\n', MAX_WAIT_FOR_IO, *m_interrupt);
|
conn.sock.RecvUntilTerminator('\n', MAX_WAIT_FOR_IO, *m_interrupt, MAX_MSG_SIZE);
|
||||||
|
|
||||||
conn.peer = CService(DestB64ToAddr(peer_dest), Params().GetDefaultPort());
|
conn.peer = CService(DestB64ToAddr(peer_dest), Params().GetDefaultPort());
|
||||||
|
|
||||||
@ -252,7 +252,7 @@ Session::Reply Session::SendRequestAndGetReply(const Sock& sock,
|
|||||||
// signaled.
|
// signaled.
|
||||||
static constexpr auto recv_timeout = 3min;
|
static constexpr auto recv_timeout = 3min;
|
||||||
|
|
||||||
reply.full = sock.RecvUntilTerminator('\n', recv_timeout, *m_interrupt);
|
reply.full = sock.RecvUntilTerminator('\n', recv_timeout, *m_interrupt, MAX_MSG_SIZE);
|
||||||
|
|
||||||
for (const auto& kv : spanparsing::Split(reply.full, ' ')) {
|
for (const auto& kv : spanparsing::Split(reply.full, ' ')) {
|
||||||
const auto& pos = std::find(kv.begin(), kv.end(), '=');
|
const auto& pos = std::find(kv.begin(), kv.end(), '=');
|
||||||
|
@ -40,6 +40,14 @@ struct Connection {
|
|||||||
|
|
||||||
namespace sam {
|
namespace sam {
|
||||||
|
|
||||||
|
/**
|
||||||
|
* The maximum size of an incoming message from the I2P SAM proxy (in bytes).
|
||||||
|
* Used to avoid a runaway proxy from sending us an "unlimited" amount of data without a terminator.
|
||||||
|
* The longest known message is ~1400 bytes, so this is high enough not to be triggered during
|
||||||
|
* normal operation, yet low enough to avoid a malicious proxy from filling our memory.
|
||||||
|
*/
|
||||||
|
static constexpr size_t MAX_MSG_SIZE{65536};
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* I2P SAM session.
|
* I2P SAM session.
|
||||||
*/
|
*/
|
||||||
|
@ -175,7 +175,8 @@ void Sock::SendComplete(const std::string& data,
|
|||||||
|
|
||||||
std::string Sock::RecvUntilTerminator(uint8_t terminator,
|
std::string Sock::RecvUntilTerminator(uint8_t terminator,
|
||||||
std::chrono::milliseconds timeout,
|
std::chrono::milliseconds timeout,
|
||||||
CThreadInterrupt& interrupt) const
|
CThreadInterrupt& interrupt,
|
||||||
|
size_t max_data) const
|
||||||
{
|
{
|
||||||
const auto deadline = GetTime<std::chrono::milliseconds>() + timeout;
|
const auto deadline = GetTime<std::chrono::milliseconds>() + timeout;
|
||||||
std::string data;
|
std::string data;
|
||||||
@ -190,9 +191,14 @@ std::string Sock::RecvUntilTerminator(uint8_t terminator,
|
|||||||
// at a time is about 50 times slower.
|
// at a time is about 50 times slower.
|
||||||
|
|
||||||
for (;;) {
|
for (;;) {
|
||||||
|
if (data.size() >= max_data) {
|
||||||
|
throw std::runtime_error(
|
||||||
|
strprintf("Received too many bytes without a terminator (%u)", data.size()));
|
||||||
|
}
|
||||||
|
|
||||||
char buf[512];
|
char buf[512];
|
||||||
|
|
||||||
const ssize_t peek_ret{Recv(buf, sizeof(buf), MSG_PEEK)};
|
const ssize_t peek_ret{Recv(buf, std::min(sizeof(buf), max_data - data.size()), MSG_PEEK)};
|
||||||
|
|
||||||
switch (peek_ret) {
|
switch (peek_ret) {
|
||||||
case -1: {
|
case -1: {
|
||||||
|
@ -135,13 +135,16 @@ public:
|
|||||||
* @param[in] terminator Character up to which to read from the socket.
|
* @param[in] terminator Character up to which to read from the socket.
|
||||||
* @param[in] timeout Timeout for the entire operation.
|
* @param[in] timeout Timeout for the entire operation.
|
||||||
* @param[in] interrupt If this is signaled then the operation is canceled.
|
* @param[in] interrupt If this is signaled then the operation is canceled.
|
||||||
|
* @param[in] max_data The maximum amount of data (in bytes) to receive. If this many bytes
|
||||||
|
* are received and there is still no terminator, then this method will throw an exception.
|
||||||
* @return The data that has been read, without the terminating character.
|
* @return The data that has been read, without the terminating character.
|
||||||
* @throws std::runtime_error if the operation cannot be completed. In this case some bytes may
|
* @throws std::runtime_error if the operation cannot be completed. In this case some bytes may
|
||||||
* have been consumed from the socket.
|
* have been consumed from the socket.
|
||||||
*/
|
*/
|
||||||
virtual std::string RecvUntilTerminator(uint8_t terminator,
|
virtual std::string RecvUntilTerminator(uint8_t terminator,
|
||||||
std::chrono::milliseconds timeout,
|
std::chrono::milliseconds timeout,
|
||||||
CThreadInterrupt& interrupt) const;
|
CThreadInterrupt& interrupt,
|
||||||
|
size_t max_data) const;
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* Check if still connected.
|
* Check if still connected.
|
||||||
|
Reference in New Issue
Block a user