diff options
author | selsta <selsta@sent.at> | 2020-10-19 21:02:59 +0200 |
---|---|---|
committer | selsta <selsta@sent.at> | 2020-10-20 19:39:44 +0200 |
commit | aad2f87a53eb8a1c0a20c96067d0c8066f5cab55 (patch) | |
tree | e1661b4f26def56050f27405dbe0d5d685b5d77d /src/p2p/net_node.inl | |
parent | Merge pull request #6891 (diff) | |
download | monero-aad2f87a53eb8a1c0a20c96067d0c8066f5cab55.tar.xz |
net_node: add --ban-list option
Diffstat (limited to '')
-rw-r--r-- | src/p2p/net_node.inl | 31 |
1 files changed, 31 insertions, 0 deletions
diff --git a/src/p2p/net_node.inl b/src/p2p/net_node.inl index aa16e93d5..3d96ead9f 100644 --- a/src/p2p/net_node.inl +++ b/src/p2p/net_node.inl @@ -106,6 +106,7 @@ namespace nodetool command_line::add_arg(desc, arg_p2p_seed_node); command_line::add_arg(desc, arg_tx_proxy); command_line::add_arg(desc, arg_anonymous_inbound); + command_line::add_arg(desc, arg_ban_list); command_line::add_arg(desc, arg_p2p_hide_my_port); command_line::add_arg(desc, arg_no_sync); command_line::add_arg(desc, arg_no_igd); @@ -441,6 +442,36 @@ namespace nodetool return false; } + if (!command_line::is_arg_defaulted(vm, arg_ban_list)) + { + const std::string ban_list = command_line::get_arg(vm, arg_ban_list); + + const boost::filesystem::path ban_list_path(ban_list); + boost::system::error_code ec; + if (!boost::filesystem::exists(ban_list_path, ec)) + { + throw std::runtime_error("Can't find ban list file " + ban_list + " - " + ec.message()); + } + + std::string banned_ips; + if (!epee::file_io_utils::load_file_to_string(ban_list_path.string(), banned_ips)) + { + throw std::runtime_error("Failed to read ban list file " + ban_list); + } + + 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) + { + MERROR("Invalid IP address: " << line << " - " << parsed_addr.error()); + continue; + } + block_host(*parsed_addr, std::numeric_limits<time_t>::max()); + } + } + if(command_line::has_arg(vm, arg_p2p_hide_my_port)) m_hide_my_port = true; |