dandri/i2pd
1
0
Fork 0
mirror of https://github.com/PurpleI2P/i2pd.git synced 2026-05-18 00:25:36 +00:00
Code Issues Packages Projects Releases Wiki Activity

ban by IP list

Browse Source
This commit is contained in:
orignal
2026-02-06 12:58:16 -05:00
parent 279d59bfce
commit 9080fcfa4d
5 changed files with 187 additions and 109 deletions
Download Patch File Download Diff File Expand all files Collapse all files
libi2pd/NTCP2.cpp
+16 -7
View File
@@ -1047,9 +1047,9 @@ namespace transport
auto addr = m_RemoteEndpoint.address ().is_v4 () ? ri1->GetNTCP2V4Address () :
(i2p::util::net::IsYggdrasilAddress (m_RemoteEndpoint.address ()) ? ri1->GetYggdrasilAddress () : ri1->GetNTCP2V6Address ());
if (!addr || memcmp (m_Establisher->m_RemoteStaticKey, addr->s, 32))
if (!addr)
{
LogPrint (eLogError, "NTCP2: Wrong static key in SessionConfirmed");
LogPrint (eLogError, "NTCP2: Address not found in SessionConfirmed");
Terminate ();
return;
}
@@ -1069,6 +1069,14 @@ namespace transport
SendTerminationAndTerminate (eNTCP2Banned);
return;
}
if (memcmp (m_Establisher->m_RemoteStaticKey, addr->s, 32))
{
LogPrint (eLogError, "NTCP2: Wrong static key in SessionConfirmed");
if (addr->IsPublishedNTCP2 ())
i2p::transport::transports.AddBan (m_RemoteEndpoint.address ());
Terminate ();
return;
}
// TODO: process options block
// ready to communicate
@@ -1936,7 +1944,7 @@ namespace transport
if (!ec)
{
LogPrint (eLogDebug, "NTCP2: Connected from ", ep);
if (!i2p::transport::transports.IsInReservedRange(ep.address ()))
if (!i2p::transport::transports.IsInReservedRange(ep.address ()) && !i2p::transport::transports.IsBanned(ep.address ()))
{
if (m_PendingIncomingSessions.emplace (ep.address (), conn).second)
{
@@ -1948,7 +1956,7 @@ namespace transport
LogPrint (eLogInfo, "NTCP2: Incoming session from ", ep.address (), " is already pending");
}
else
LogPrint (eLogError, "NTCP2: Incoming connection from invalid IP ", ep.address ());
LogPrint (eLogError, "NTCP2: Incoming connection from invalid or banned IP ", ep.address ());
}
else
LogPrint (eLogError, "NTCP2: Connected from error ", ec.message ());
@@ -1983,8 +1991,9 @@ namespace transport
if (!ec)
{
LogPrint (eLogDebug, "NTCP2: Connected from ", ep);
if (!i2p::transport::transports.IsInReservedRange(ep.address ()) ||
i2p::util::net::IsYggdrasilAddress (ep.address ()))
if ((!i2p::transport::transports.IsInReservedRange(ep.address ()) ||
i2p::util::net::IsYggdrasilAddress (ep.address ())) &&
!i2p::transport::transports.IsBanned(ep.address ()))
{
if (m_PendingIncomingSessions.emplace (ep.address (), conn).second)
{
@@ -1996,7 +2005,7 @@ namespace transport
LogPrint (eLogInfo, "NTCP2: Incoming session from ", ep.address (), " is already pending");
}
else
LogPrint (eLogError, "NTCP2: Incoming connection from invalid IP ", ep.address ());
LogPrint (eLogError, "NTCP2: Incoming connection from invalid or banned IP ", ep.address ());
}
else
LogPrint (eLogError, "NTCP2: Connected from error ", ec.message ());