|
|
|
@ -36,6 +36,7 @@
|
|
|
|
|
#include "cryptonote_protocol/cryptonote_protocol_handler.inl"
|
|
|
|
|
|
|
|
|
|
#define MAKE_IPV4_ADDRESS(a,b,c,d) epee::net_utils::ipv4_network_address{MAKE_IP(a,b,c,d),0}
|
|
|
|
|
#define MAKE_IPV4_ADDRESS_PORT(a,b,c,d,e) epee::net_utils::ipv4_network_address{MAKE_IP(a,b,c,d),e}
|
|
|
|
|
#define MAKE_IPV4_SUBNET(a,b,c,d,e) epee::net_utils::ipv4_network_subnet{MAKE_IP(a,b,c,d),e}
|
|
|
|
|
|
|
|
|
|
namespace cryptonote {
|
|
|
|
@ -94,10 +95,10 @@ typedef nodetool::node_server<cryptonote::t_cryptonote_protocol_handler<test_cor
|
|
|
|
|
|
|
|
|
|
static bool is_blocked(Server &server, const epee::net_utils::network_address &address, time_t *t = NULL)
|
|
|
|
|
{
|
|
|
|
|
std::map<epee::net_utils::network_address, time_t> hosts = server.get_blocked_hosts();
|
|
|
|
|
std::map<std::string, time_t> hosts = server.get_blocked_hosts();
|
|
|
|
|
for (auto rec: hosts)
|
|
|
|
|
{
|
|
|
|
|
if (rec.first == address)
|
|
|
|
|
if (rec.first == address.host_str())
|
|
|
|
|
{
|
|
|
|
|
if (t)
|
|
|
|
|
*t = rec.second;
|
|
|
|
@ -240,5 +241,22 @@ TEST(ban, subnet)
|
|
|
|
|
ASSERT_TRUE(server.get_blocked_subnets().size() == 0);
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
TEST(ban, ignores_port)
|
|
|
|
|
{
|
|
|
|
|
time_t seconds;
|
|
|
|
|
test_core pr_core;
|
|
|
|
|
cryptonote::t_cryptonote_protocol_handler<test_core> cprotocol(pr_core, NULL);
|
|
|
|
|
Server server(cprotocol);
|
|
|
|
|
cprotocol.set_p2p_endpoint(&server);
|
|
|
|
|
|
|
|
|
|
ASSERT_FALSE(is_blocked(server,MAKE_IPV4_ADDRESS_PORT(1,2,3,4,5)));
|
|
|
|
|
ASSERT_TRUE(server.block_host(MAKE_IPV4_ADDRESS_PORT(1,2,3,4,5), std::numeric_limits<time_t>::max() - 1));
|
|
|
|
|
ASSERT_TRUE(is_blocked(server,MAKE_IPV4_ADDRESS_PORT(1,2,3,4,5)));
|
|
|
|
|
ASSERT_TRUE(is_blocked(server,MAKE_IPV4_ADDRESS_PORT(1,2,3,4,6)));
|
|
|
|
|
ASSERT_TRUE(server.unblock_host(MAKE_IPV4_ADDRESS_PORT(1,2,3,4,5)));
|
|
|
|
|
ASSERT_FALSE(is_blocked(server,MAKE_IPV4_ADDRESS_PORT(1,2,3,4,5)));
|
|
|
|
|
ASSERT_FALSE(is_blocked(server,MAKE_IPV4_ADDRESS_PORT(1,2,3,4,6)));
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
namespace nodetool { template class node_server<cryptonote::t_cryptonote_protocol_handler<test_core>>; }
|
|
|
|
|
namespace cryptonote { template class t_cryptonote_protocol_handler<test_core>; }
|
|
|
|
|