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

Merge pull request #7181

Browse Source 
e35bbb1e8 ban lists may now include subnets (moneromooo-monero)
This commit is contained in:
Alexander Blair 2020-12-26 13:59:51 -08:00
commit 0873f3193a
No known key found for this signature in database
GPG Key ID: C64552D877C32479
2 changed files with 20 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
src/daemon/command_parser_executor.cpp
View File

@ -620,13 +620,19 @@ bool t_command_parser_executor::ban(const std::vector<std::string>& args)
std::ifstream ifs(ban_list_path.string());
for (std::string line; std::getline(ifs, line); )
{
const expect<epee::net_utils::network_address> parsed_addr = net::get_network_address(line, 0);
if (!parsed_addr)
auto subnet = net::get_ipv4_subnet_address(line);
if (subnet)
{
std::cout << "Invalid IP address: " << line << " - " << parsed_addr.error() << std::endl;
ret &= m_executor.ban(subnet->str(), seconds);
continue;
}
ret &= m_executor.ban(parsed_addr->host_str(), seconds);
const expect<epee::net_utils::network_address> parsed_addr = net::get_network_address(line, 0);
if (parsed_addr)
{
ret &= m_executor.ban(parsed_addr->host_str(), seconds);
continue;
}
std::cout << "Invalid IP address or IPv4 subnet: " << line << std::endl;
}
return ret;
}

14
src/p2p/net_node.inl
View File

@ -489,13 +489,19 @@ namespace nodetool
std::istringstream iss(banned_ips);
for (std::string line; std::getline(iss, line); )
{
const expect<epee::net_utils::network_address> parsed_addr = net::get_network_address(line, 0);
if (!parsed_addr)
auto subnet = net::get_ipv4_subnet_address(line);
if (subnet)
{
MERROR("Invalid IP address: " << line << " - " << parsed_addr.error());
block_subnet(*subnet, std::numeric_limits<time_t>::max());
continue;
}
block_host(*parsed_addr, std::numeric_limits<time_t>::max());
const expect<epee::net_utils::network_address> parsed_addr = net::get_network_address(line, 0);
if (parsed_addr)
{
block_host(*parsed_addr, std::numeric_limits<time_t>::max());
continue;
}
MERROR("Invalid IP address or IPv4 subnet: " << line);
}
}