Mirrors/i2pd
2
0
Fork 0
mirror of https://github.com/PurpleI2P/i2pd.git synced 2025-06-04 21:36:23 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions 7

Fix FORWARD session host handling in SAM; refactor SAMSocket::ProcessStreamForward

Browse source 
- Fixed validation of HOST and PORT parameters for FORWARD sessions:
  - Improved IP address parsing with fallback to 127.0.0.1 if invalid
- Added checks for required parameters (ID, HOST, PORT)
- General cleanup and refactoring for improved readability and stability

Signed-off-by: nobs2p <nobs2p@i2pmail.org>
This commit is contained in:
nobs2p 2025-05-18 00:24:25 +03:00
parent 246bc43dea
commit d440b5bf09
No known key found for this signature in database
GPG key ID: 3A0FE2C32786E294
1 changed files with 66 additions and 24 deletions
Download patch file Download diff file Expand all files Collapse all files

90
libi2pd_client/SAM.cpp
View file

@ -637,53 +637,95 @@ namespace client
SendMessageReply (SAM_STREAM_STATUS_INVALID_ID, strlen(SAM_STREAM_STATUS_INVALID_ID), true); SendMessageReply (SAM_STREAM_STATUS_INVALID_ID, strlen(SAM_STREAM_STATUS_INVALID_ID), true);
} }
void SAMSocket::ProcessStreamForward (char * buf, size_t len) void SAMSocket::ProcessStreamForward(char* buf, size_t len)
{ {
LogPrint (eLogDebug, "SAM: Stream forward: ", buf); LogPrint(eLogDebug, "SAM: Stream forward: ", buf);
std::map<std::string, std::string> params; std::map<std::string, std::string> params;
ExtractParams (buf, params); ExtractParams(buf, params);
std::string& id = params[SAM_PARAM_ID];
auto session = m_Owner.FindSession (id); const auto itId = params.find(SAM_PARAM_ID);
if (itId == params.end())
{
SendSessionI2PError("Missing ID");
return;
}
const std::string& id = itId->second;
auto session = m_Owner.FindSession(id);
if (!session) if (!session)
{ {
SendMessageReply (SAM_STREAM_STATUS_INVALID_ID, strlen(SAM_STREAM_STATUS_INVALID_ID), true); SendMessageReply(SAM_STREAM_STATUS_INVALID_ID, strlen(SAM_STREAM_STATUS_INVALID_ID), true);
return; return;
} }
if (session->GetLocalDestination ()->IsAcceptingStreams ()) if (session->GetLocalDestination()->IsAcceptingStreams())
{ {
SendSessionI2PError ("Already accepting"); SendSessionI2PError("Already accepting");
return; return;
} }
auto it = params.find (SAM_PARAM_PORT);
if (it == params.end ()) const auto itPort = params.find(SAM_PARAM_PORT);
if (itPort == params.end())
{ {
SendSessionI2PError ("PORT is missing"); SendSessionI2PError("PORT is missing");
return; return;
} }
auto port = std::stoi (it->second);
const std::string& portStr = itPort->second;
if (!std::all_of(portStr.begin(), portStr.end(), ::isdigit))
{
SendSessionI2PError("Port must be numeric");
return;
}
int port = std::stoi(portStr);
if (port <= 0 || port >= 0xFFFF) if (port <= 0 || port >= 0xFFFF)
{ {
SendSessionI2PError ("Invalid PORT"); SendSessionI2PError("Invalid port");
return; return;
} }
boost::system::error_code ec;
auto ep = m_Socket.remote_endpoint (ec); boost::asio::ip::tcp::endpoint ep;
if (ec) const auto itHost = params.find(SAM_PARAM_HOST);
if (itHost != params.end())
{ {
SendSessionI2PError ("Socket error"); boost::system::error_code ec;
return; auto addr = boost::asio::ip::make_address(itHost->second, ec);
if (ec)
{
SendSessionI2PError("Invalid IP Address in HOST");
return;
}
ep = boost::asio::ip::tcp::endpoint(addr, port);
} }
ep.port (port); else
{
boost::system::error_code ec;
ep = m_Socket.remote_endpoint(ec);
if (ec)
{
SendSessionI2PError("Socket error: cannot get remote endpoint");
return;
}
ep.port(port);
}
m_SocketType = eSAMSocketTypeForward; m_SocketType = eSAMSocketTypeForward;
m_ID = id; m_ID = id;
m_IsAccepting = true; m_IsAccepting = true;
std::string& silent = params[SAM_PARAM_SILENT];
if (silent == SAM_VALUE_TRUE) m_IsSilent = true; auto itSilent = params.find(SAM_PARAM_SILENT);
session->GetLocalDestination ()->AcceptStreams (std::bind (&SAMSocket::HandleI2PForward, if (itSilent != params.end() && itSilent->second == SAM_VALUE_TRUE)
shared_from_this (), std::placeholders::_1, ep)); m_IsSilent = true;
SendMessageReply (SAM_STREAM_STATUS_OK, strlen(SAM_STREAM_STATUS_OK), false);
session->GetLocalDestination()->AcceptStreams(
std::bind(&SAMSocket::HandleI2PForward, shared_from_this(), std::placeholders::_1, ep));
SendMessageReply(SAM_STREAM_STATUS_OK, strlen(SAM_STREAM_STATUS_OK), false);
} }
size_t SAMSocket::ProcessDatagramSend (char * buf, size_t len, const char * data) size_t SAMSocket::ProcessDatagramSend (char * buf, size_t len, const char * data)
{ {
LogPrint (eLogDebug, "SAM: Datagram send: ", buf, " ", len); LogPrint (eLogDebug, "SAM: Datagram send: ", buf, " ", len);