Git-Mirrors/monero
1
0
Fork 0
mirror of https://github.com/monero-project/monero.git synced 2024-12-13 08:04:21 -05:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #7333

Browse Source 
b5667c9 p2p: allow CIDR notation in DNS blocklist (moneromooo-monero)
This commit is contained in:
luigi1111 2021-02-16 11:45:38 -05:00
commit aa408d1c72
No known key found for this signature in database
GPG Key ID: F4ACA0183641E010
1 changed files with 15 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
src/p2p/net_node.inl
View File

@ -2027,15 +2027,24 @@ namespace nodetool
boost::split(ips, record, boost::is_any_of(";")); boost::split(ips, record, boost::is_any_of(";"));
for (const auto &ip: ips) for (const auto &ip: ips)
{ {
const expect<epee::net_utils::network_address> parsed_addr = net::get_network_address(ip, 0); if (ip.empty())
if (!parsed_addr) continue;
auto subnet = net::get_ipv4_subnet_address(ip);
if (subnet)
{ {
MWARNING("Invalid IP address from DNS blocklist: " << ip << " - " << parsed_addr.error()); block_subnet(*subnet, DNS_BLOCKLIST_LIFETIME);
++bad; ++good;
continue; continue;
} }
block_host(*parsed_addr, DNS_BLOCKLIST_LIFETIME, true); const expect<epee::net_utils::network_address> parsed_addr = net::get_network_address(ip, 0);
++good; if (parsed_addr)
{
block_host(*parsed_addr, DNS_BLOCKLIST_LIFETIME, true);
++good;
continue;
}
MWARNING("Invalid IP address or subnet from DNS blocklist: " << ip << " - " << parsed_addr.error());
++bad;
} }
} }
if (good > 0) if (good > 0)