Mirrors/i2pd
2
0
Fork 0
mirror of https://github.com/PurpleI2P/i2pd.git synced 2025-04-24 09:56:35 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions 6

add 'reservedrange' config option check before IsInReservedRange() check

Browse source
This commit is contained in:
Philipp Hauswirth 2024-01-11 17:54:25 +01:00
parent cd087568b5
commit 144c5f0424
7 changed files with 24 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

9
libi2pd/NTCP2.cpp
View file

@ -22,6 +22,7 @@
#include "NTCP2.h"
#include "HTTP.h"
#include "util.h"
#include "Config.h"
#if defined(__linux__) && !defined(_NETINET_IN_H)
#include <linux/in6.h>
@ -1240,7 +1241,8 @@ namespace transport
NTCP2Server::NTCP2Server ():
RunnableServiceWithWork ("NTCP2"), m_TerminationTimer (GetService ()),
m_ProxyType(eNoProxy), m_Resolver(GetService ())
m_ProxyType(eNoProxy), m_Resolver(GetService ()),
m_CheckReserved (true)
{
}
@ -1254,6 +1256,7 @@ namespace transport
if (!IsRunning ())
{
StartIOService ();
i2p::config::GetOption("reservedrange", m_CheckReserved);
if(UsingProxy())
{
LogPrint(eLogInfo, "NTCP2: Using proxy to connect to peers");
@ -1490,7 +1493,7 @@ namespace transport
if (!ec)
{
LogPrint (eLogDebug, "NTCP2: Connected from ", ep);
if (!i2p::util::net::IsInReservedRange(ep.address ()))
if (!(m_CheckReserved && i2p::util::net::IsInReservedRange(ep.address ())))
{
if (m_PendingIncomingSessions.emplace (ep.address (), conn).second)
{
@ -1537,7 +1540,7 @@ namespace transport
if (!ec)
{
LogPrint (eLogDebug, "NTCP2: Connected from ", ep);
if (!i2p::util::net::IsInReservedRange(ep.address ()) ||
if (!(m_CheckReserved && i2p::util::net::IsInReservedRange(ep.address ())) ||
i2p::util::net::IsYggdrasilAddress (ep.address ()))
{
if (m_PendingIncomingSessions.emplace (ep.address (), conn).second)

2
libi2pd/NTCP2.h
View file

@ -286,6 +286,8 @@ namespace transport
std::unique_ptr<boost::asio::ip::tcp::endpoint> m_ProxyEndpoint;
std::shared_ptr<boost::asio::ip::tcp::endpoint> m_Address4, m_Address6, m_YggdrasilAddress;
bool m_CheckReserved;
public:
// for HTTP/I2PControl

3
libi2pd/Reseed.cpp
View file

@ -523,6 +523,7 @@ namespace data
{
i2p::http::URL proxyUrl;
std::string proxy; i2p::config::GetOption("reseed.proxy", proxy);
bool checkInReserved; i2p::config::GetOption("reservedrange", checkInReserved);
// check for proxy url
if(proxy.size()) {
// parse
@ -689,7 +690,7 @@ namespace data
boost::asio::ip::tcp::endpoint ep = *it;
if (
(
!i2p::util::net::IsInReservedRange(ep.address ()) && (
!( checkInReserved && i2p::util::net::IsInReservedRange(ep.address ())) && (
(ep.address ().is_v4 () && i2p::context.SupportsV4 ()) ||
(ep.address ().is_v6 () && i2p::context.SupportsV6 ())
)

4
libi2pd/RouterInfo.cpp
View file

@ -24,6 +24,7 @@
#include "NetDb.hpp"
#include "RouterContext.h"
#include "RouterInfo.h"
#include "Config.h"
namespace i2p
{
@ -204,6 +205,7 @@ namespace data
m_Caps = 0; m_Congestion = eLowCongestion;
s.read ((char *)&m_Timestamp, sizeof (m_Timestamp));
m_Timestamp = be64toh (m_Timestamp);
bool checkInReserved; i2p::config::GetOption("reservedrange", checkInReserved);
// read addresses
auto addresses = NewAddresses ();
uint8_t numAddresses;
@ -253,7 +255,7 @@ namespace data
address->host = boost::asio::ip::address::from_string (value, ecode);
if (!ecode && !address->host.is_unspecified ())
{
if (!i2p::util::net::IsInReservedRange (address->host) ||
if (!(checkInReserved && i2p::util::net::IsInReservedRange (address->host)) ||
i2p::util::net::IsYggdrasilAddress (address->host))
isHost = true;
else

8
libi2pd/SSU2.cpp
View file

@ -25,7 +25,8 @@ namespace transport
m_TerminationTimer (GetService ()), m_CleanupTimer (GetService ()), m_ResendTimer (GetService ()),
m_IntroducersUpdateTimer (GetService ()), m_IntroducersUpdateTimerV6 (GetService ()),
m_IsPublished (true), m_IsSyncClockFromPeers (true), m_PendingTimeOffset (0),
m_IsThroughProxy (false)
m_IsThroughProxy (false),
m_CheckReserved (true)
{
}
@ -36,6 +37,7 @@ namespace transport
StartIOService ();
i2p::config::GetOption ("ssu2.published", m_IsPublished);
i2p::config::GetOption("nettime.frompeers", m_IsSyncClockFromPeers);
i2p::config::GetOption("reservedrange", m_CheckReserved);
bool found = false;
auto addresses = i2p::context.GetRouterInfo ().GetAddresses ();
if (!addresses) return;
@ -566,7 +568,7 @@ namespace transport
else
it1->second->ProcessRetry (buf, len);
}
else if (!i2p::util::net::IsInReservedRange(senderEndpoint.address ()) && senderEndpoint.port ())
else if (!(m_CheckReserved && i2p::util::net::IsInReservedRange(senderEndpoint.address ())) && senderEndpoint.port ())
{
// assume new incoming session
auto session = std::make_shared<SSU2Session> (*this);
@ -666,7 +668,7 @@ namespace transport
bool isValidEndpoint = !address->host.is_unspecified () && address->port;
if (isValidEndpoint)
{
if (i2p::util::net::IsInReservedRange(address->host)) return false;
if (m_CheckReserved && i2p::util::net::IsInReservedRange(address->host)) return false;
auto s = FindPendingOutgoingSession (boost::asio::ip::udp::endpoint (address->host, address->port));
if (s)
{

4
libi2pd/SSU2.h
View file

@ -103,6 +103,8 @@ namespace transport
i2p::util::MemoryPool<SSU2IncompleteMessage>& GetIncompleteMessagesPool () { return m_IncompleteMessagesPool; };
i2p::util::MemoryPool<SSU2IncompleteMessage::Fragment>& GetFragmentsPool () { return m_FragmentsPool; };
bool GetCheckInReserved() { return m_CheckReserved; };
private:
boost::asio::ip::udp::socket& OpenSocket (const boost::asio::ip::udp::endpoint& localEndpoint);
@ -172,6 +174,8 @@ namespace transport
std::unique_ptr<boost::asio::ip::udp::endpoint> m_ProxyRelayEndpoint;
std::unique_ptr<boost::asio::deadline_timer> m_ProxyConnectRetryTimer;
bool m_CheckReserved;
public:
// for HTTP/I2PControl

4
libi2pd/SSU2Session.cpp
View file

@ -1471,7 +1471,7 @@ namespace transport
ResendHandshakePacket (); // assume we receive
return;
}
if (from != m_RemoteEndpoint && !i2p::util::net::IsInReservedRange (from.address ()))
if (from != m_RemoteEndpoint && !(m_Server.GetCheckInReserved() && i2p::util::net::IsInReservedRange (from.address ())))
{
LogPrint (eLogInfo, "SSU2: Remote endpoint update ", m_RemoteEndpoint, "->", from);
m_RemoteEndpoint = from;
@ -1753,7 +1753,7 @@ namespace transport
if (ExtractEndpoint (buf, len, ep))
{
LogPrint (eLogInfo, "SSU2: Our external address is ", ep);
if (!i2p::util::net::IsInReservedRange (ep.address ()))
if (!(m_Server.GetCheckInReserved() && i2p::util::net::IsInReservedRange (ep.address ())))
{
i2p::context.UpdateAddress (ep.address ());
// check our port