rottenwheel/monero
1
0
Fork 0
mirror of https://codeberg.org/anoncontributorxmr/monero.git synced 2024-11-27 05:13:25 +01:00
Code Issues Actions Packages Projects Releases Wiki Activity

Merge pull request #7141

Browse Source 
9de3787 daemon: the ban command can now load IPs from a file (ban @filename) (moneromooo-monero)
This commit is contained in:
luigi1111 2020-12-19 17:22:01 -06:00
commit e0d8af253e
No known key found for this signature in database
GPG Key ID: F4ACA0183641E010
2 changed files with 42 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

40
src/daemon/command_parser_executor.cpp
View File

@ -28,6 +28,7 @@
#include "common/dns_utils.h"
#include "common/command_line.h"
#include "net/parse.h"
#include "daemon/command_parser_executor.h"
#undef MONERO_DEFAULT_LOG_CATEGORY
@ -657,7 +658,6 @@ bool t_command_parser_executor::ban(const std::vector<std::string>& args)
std::cout << "Invalid syntax: Expects one or two parameters. For more details, use the help command." << std::endl;
return true;
}
std::string ip = args[0];
time_t seconds = P2P_IP_BLOCKTIME;
if (args.size() > 1)
{
@ -676,8 +676,46 @@ bool t_command_parser_executor::ban(const std::vector<std::string>& args)
return true;
}
}
if (boost::starts_with(args[0], "@"))
{
const std::string ban_list = args[0].substr(1);
try
{
const boost::filesystem::path ban_list_path(ban_list);
boost::system::error_code ec;
if (!boost::filesystem::exists(ban_list_path, ec))
{
std::cout << "Can't find ban list file " + ban_list + " - " + ec.message() << std::endl;
return true;
}
bool ret = true;
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)
{
std::cout << "Invalid IP address: " << line << " - " << parsed_addr.error() << std::endl;
continue;
}
ret &= m_executor.ban(parsed_addr->host_str(), seconds);
}
return ret;
}
catch (const std::exception &e)
{
std::cout << "Error loading ban list: " << e.what() << std::endl;
return false;
}
}
else
{
const std::string ip = args[0];
return m_executor.ban(ip, seconds);
}
}
bool t_command_parser_executor::unban(const std::vector<std::string>& args)
{

4
src/daemon/command_server.cpp
View File

@ -234,8 +234,8 @@ t_command_server::t_command_server(
m_command_lookup.set_handler(
"ban"
, std::bind(&t_command_parser_executor::ban, &m_parser, p::_1)
, "ban <IP> [<seconds>]"
, "Ban a given <IP> for a given amount of <seconds>."
, "ban [<IP>|@<filename>] [<seconds>]"
, "Ban a given <IP> or list of IPs from a file for a given amount of <seconds>."
);
m_command_lookup.set_handler(
"unban"