Archives/i2pd
2
0
Fork 0
mirror of https://github.com/PurpleI2P/i2pd.git synced 2024-11-11 19:10:55 +00:00
Code Issues Projects Releases Wiki Activity

check status code and verify RelayResponse signature

Browse Source
This commit is contained in:
orignal 2022-04-28 20:41:06 -04:00
parent 5221f3ddc9
commit dc82105226
1 changed files with 22 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

25
libi2pd/SSU2.cpp
View File

@ -1125,12 +1125,28 @@ namespace transport
else else
{ {
// we are Alice, message from Bob // we are Alice, message from Bob
// update Charlie's endpoint and connect if (!buf[1]) // status code accepted?
if (ExtractEndpoint (buf + 12, buf[11], it->second.first->m_RemoteEndpoint))
{ {
it->second.first->m_State = eSSU2SessionStateUnknown; // verify signature
it->second.first->Connect (); uint8_t csz = buf[11];
SignedData s;
s.Insert ((const uint8_t *)"RelayAgreementOK", 16); // prologue
s.Insert (GetRemoteIdentity ()->GetIdentHash (), 32); // bhash
s.Insert (buf + 2, 10 + csz); // nonce, timestamp, ver, csz and Charlie's endpoint
if (s.Verify (it->second.first->GetRemoteIdentity (), buf + 12 + csz))
{
// update Charlie's endpoint and connect
if (ExtractEndpoint (buf + 12, csz, it->second.first->m_RemoteEndpoint))
{
it->second.first->m_State = eSSU2SessionStateUnknown;
it->second.first->Connect ();
}
}
else
LogPrint (eLogWarning, "SSU2: RelayResponse signature verification failed");
} }
else
LogPrint (eLogWarning, "SSU2: RelayResponse status code=", (int)buf[1]);
} }
m_RelaySessions.erase (it); m_RelaySessions.erase (it);
} }
@ -1696,6 +1712,7 @@ namespace transport
void SSU2Server::ProcessNextPacket (uint8_t * buf, size_t len, const boost::asio::ip::udp::endpoint& senderEndpoint) void SSU2Server::ProcessNextPacket (uint8_t * buf, size_t len, const boost::asio::ip::udp::endpoint& senderEndpoint)
{ {
if (len < 24) return;
uint64_t connID; uint64_t connID;
memcpy (&connID, buf, 8); memcpy (&connID, buf, 8);
connID ^= CreateHeaderMask (i2p::context.GetSSU2IntroKey (), buf + (len - 24)); connID ^= CreateHeaderMask (i2p::context.GetSSU2IntroKey (), buf + (len - 24));