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

Merge pull request #3902

Browse source 
f8dd433 epee: fix detection of 172.16.0.0/172.31.255.255 local IP range (moneromooo-monero)
5db9e3c unit_tests: add tests for local IP range detection (moneromooo-monero)
This commit is contained in:
luigi1111 2018-06-20 14:22:44 -05:00
commit c678413a89
No known key found for this signature in database
GPG key ID: F4ACA0183641E010
2 changed files with 33 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
contrib/epee/include/net/local_ip.h
View file

@ -48,7 +48,7 @@ namespace epee
if( (ip | 0xffffff00) == 0xffffffac) if( (ip | 0xffffff00) == 0xffffffac)
{ {
uint32_t second_num = (ip << 8) & 0xff000000; uint32_t second_num = (ip >> 8) & 0xff;
if(second_num >= 16 && second_num <= 31 ) if(second_num >= 16 && second_num <= 31 )
return true; return true;
} }

32
tests/unit_tests/epee_utils.cpp
View file

@ -45,6 +45,7 @@
#include "boost/archive/portable_binary_oarchive.hpp" #include "boost/archive/portable_binary_oarchive.hpp"
#include "hex.h" #include "hex.h"
#include "net/net_utils_base.h" #include "net/net_utils_base.h"
#include "net/local_ip.h"
#include "p2p/net_peerlist_boost_serialization.h" #include "p2p/net_peerlist_boost_serialization.h"
#include "span.h" #include "span.h"
#include "string_tools.h" #include "string_tools.h"
@ -648,3 +649,34 @@ TEST(NetUtils, NetworkAddress)
EXPECT_THROW(address1.as<epee::net_utils::ipv4_network_address>(), std::bad_cast); EXPECT_THROW(address1.as<epee::net_utils::ipv4_network_address>(), std::bad_cast);
EXPECT_NO_THROW(address1.as<custom_address>()); EXPECT_NO_THROW(address1.as<custom_address>());
} }
static bool is_local(const char *s)
{
uint32_t ip;
CHECK_AND_ASSERT_THROW_MES(epee::string_tools::get_ip_int32_from_string(ip, s), std::string("Invalid IP address: ") + s);
return epee::net_utils::is_ip_local(ip);
}
TEST(NetUtils, PrivateRanges)
{
ASSERT_EQ(is_local("10.0.0.0"), true);
ASSERT_EQ(is_local("10.255.0.0"), true);
ASSERT_EQ(is_local("127.0.0.0"), false); // loopback is not considered local
ASSERT_EQ(is_local("192.167.255.255"), false);
ASSERT_EQ(is_local("192.168.0.0"), true);
ASSERT_EQ(is_local("192.168.255.255"), true);
ASSERT_EQ(is_local("192.169.0.0"), false);
ASSERT_EQ(is_local("172.0.0.0"), false);
ASSERT_EQ(is_local("172.15.255.255"), false);
ASSERT_EQ(is_local("172.16.0.0"), true);
ASSERT_EQ(is_local("172.16.255.255"), true);
ASSERT_EQ(is_local("172.31.255.255"), true);
ASSERT_EQ(is_local("172.32.0.0"), false);
ASSERT_EQ(is_local("0.0.0.0"), false);
ASSERT_EQ(is_local("255.255.255.254"), false);
ASSERT_EQ(is_local("11.255.255.255"), false);
ASSERT_EQ(is_local("0.0.0.10"), false);
ASSERT_EQ(is_local("0.0.168.192"), false);
ASSERT_EQ(is_local("0.0.30.172"), false);
ASSERT_EQ(is_local("0.0.30.127"), false);
}