Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

p2p: avoid spam blocking ipv4 addresses in a blocked subnet [release-v0.18] #8787

Merged
merged 2 commits into from
Mar 25, 2023
Merged

p2p: avoid spam blocking ipv4 addresses in a blocked subnet [release-v0.18] #8787

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
f0e326b
p2p: avoid spam blocking ipv4 addresses in a blocked subnet
moneromooo-monero Mar 1, 2023
c4cfaa4
p2p: do not log to global when re-blocking a subnet
moneromooo-monero Mar 9, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
24 changes: 22 additions & 2 deletions src/p2p/net_node.inl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -247,7 +247,23 @@ namespace nodetool
if (it == m_blocked_hosts.end())
{
m_blocked_hosts[host_str] = limit;
added = true;

// if the host was already blocked due to being in a blocked subnet, let it be silent
bool matches_blocked_subnet = false;
if (addr.get_type_id() == epee::net_utils::address_type::ipv4)
{
auto ipv4_address = addr.template as<epee::net_utils::ipv4_network_address>();
for (auto jt = m_blocked_subnets.begin(); jt != m_blocked_subnets.end(); ++jt)
{
if (jt->first.matches(ipv4_address))
{
matches_blocked_subnet = true;
break;
}
}
}
if (!matches_blocked_subnet)
added = true;
}
else if (it->second < limit || !add_only)
it->second = limit;
Expand Down Expand Up @@ -317,6 +333,7 @@ namespace nodetool
limit = std::numeric_limits<time_t>::max();
else
limit = now + seconds;
const bool added = m_blocked_subnets.find(subnet) == m_blocked_subnets.end();
m_blocked_subnets[subnet] = limit;

// drop any connection to that subnet. This should only have to look into
Expand Down Expand Up @@ -349,7 +366,10 @@ namespace nodetool
conns.clear();
}

MCLOG_CYAN(el::Level::Info, "global", "Subnet " << subnet.host_str() << " blocked.");
if (added)
MCLOG_CYAN(el::Level::Info, "global", "Subnet " << subnet.host_str() << " blocked.");
else
MINFO("Subnet " << subnet.host_str() << " blocked.");
return true;
}
//-----------------------------------------------------------------------------------
Expand Down