PurpleI2P/i2pd
1
0
Fork 0
mirror of https://github.com/PurpleI2P/i2pd.git synced 2025-01-22 16:34:13 +00:00
Code Issues Releases Activity

check nonce in HolePunch relay response block

Browse Source
This commit is contained in:
orignal 2022-06-28 18:51:31 -04:00
parent 624c46f925
commit 5e3115a614
1 changed files with 15 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
libi2pd/SSU2Session.cpp
View File

@ -925,7 +925,7 @@ namespace transport
bool SSU2Session::ProcessHolePunch (uint8_t * buf, size_t len) bool SSU2Session::ProcessHolePunch (uint8_t * buf, size_t len)
{ {
// we are Alice // we are Alice
LogPrint (eLogDebug, "HolePunch"); LogPrint (eLogDebug, "SSU2: HolePunch");
Header header; Header header;
memcpy (header.buf, buf, 16); memcpy (header.buf, buf, 16);
header.ll[0] ^= CreateHeaderMask (i2p::context.GetSSU2IntroKey (), buf + (len - 24)); header.ll[0] ^= CreateHeaderMask (i2p::context.GetSSU2IntroKey (), buf + (len - 24));
@ -1442,9 +1442,18 @@ namespace transport
} }
void SSU2Session::HandleRelayResponse (const uint8_t * buf, size_t len) void SSU2Session::HandleRelayResponse (const uint8_t * buf, size_t len)
{ {
if (m_State == eSSU2SessionStateIntroduced) return; // HolePunch from Charlie, TODO: verify address and signature uint32_t nonce = bufbe32toh (buf + 2);
auto it = m_RelaySessions.find (bufbe32toh (buf + 2)); // nonce if (m_State == eSSU2SessionStateIntroduced)
{
// HolePunch from Charlie
// TODO: verify address and signature
// verify nonce
if (~htobe64 (((uint64_t)nonce << 32) | nonce) != m_DestConnID)
LogPrint (eLogWarning, "SSU2: Relay response nonce mismatch ", nonce, " connID=", m_DestConnID);
return;
}
auto it = m_RelaySessions.find (nonce);
if (it != m_RelaySessions.end ()) if (it != m_RelaySessions.end ())
{ {
if (it->second.first && it->second.first->IsEstablished ()) if (it->second.first && it->second.first->IsEstablished ())
@ -1706,10 +1715,10 @@ namespace transport
SendPeerTest (7, buf + offset, len - offset, m_Address->i); SendPeerTest (7, buf + offset, len - offset, m_Address->i);
else else
LogPrint (eLogWarning, "SSU2: Unknown address for peer test 6"); LogPrint (eLogWarning, "SSU2: Unknown address for peer test 6");
m_Server.RemoveSession (~(((uint64_t)htobe32 (nonce) << 32) | htobe32 (nonce))); m_Server.RemoveSession (~htobe64 (((uint64_t)nonce << 32) | nonce));
break; break;
case 7: // Alice from Charlie 2 case 7: // Alice from Charlie 2
m_Server.RemoveSession (((uint64_t)htobe32 (nonce) << 32) | htobe32 (nonce)); m_Server.RemoveSession (htobe64 (((uint64_t)nonce << 32) | nonce));
break; break;
default: default:
LogPrint (eLogWarning, "SSU2: PeerTest unexpected msg num ", buf[0]); LogPrint (eLogWarning, "SSU2: PeerTest unexpected msg num ", buf[0]);