core: Add support for IPv6 subnets in Network::isValidCidr
This change effectively adds support for IPv6 subnets in white-/blacklists
of NetworkInterfacePredicate
Change-Id: I1962100329d398b4659c4d1a4a0975fa354af026
Refs: #4546
diff --git a/tests/core/network-interface-predicate.t.cpp b/tests/core/network-interface-predicate.t.cpp
index 9ae6c44..7e6a1bf 100644
--- a/tests/core/network-interface-predicate.t.cpp
+++ b/tests/core/network-interface-predicate.t.cpp
@@ -1,6 +1,6 @@
/* -*- Mode:C++; c-file-style:"gnu"; indent-tabs-mode:nil; -*- */
/*
- * Copyright (c) 2014-2017, Regents of the University of California,
+ * Copyright (c) 2014-2018, Regents of the University of California,
* Arizona Board of Regents,
* Colorado State University,
* University Pierre & Marie Curie, Sorbonne University,
@@ -51,6 +51,9 @@
netifs.back()->addNetworkAddress(NetworkAddress(AddressFamily::V4,
address_v4::from_string("129.82.100.1"), address_v4::from_string("129.82.255.255"),
16, AddressScope::GLOBAL, 0));
+ netifs.back()->addNetworkAddress(NetworkAddress(AddressFamily::V4,
+ address_v6::from_string("2001:db8:1::1"), address_v6::from_string("2001:db8:1::ffff:ffff:ffff:ffff"),
+ 64, AddressScope::GLOBAL, 0));
netifs.back()->setFlags(IFF_UP);
netifs.push_back(NetworkMonitorStub::makeNetworkInterface());
@@ -60,6 +63,9 @@
netifs.back()->addNetworkAddress(NetworkAddress(AddressFamily::V4,
address_v4::from_string("192.168.2.1"), address_v4::from_string("192.168.2.255"),
24, AddressScope::GLOBAL, 0));
+ netifs.back()->addNetworkAddress(NetworkAddress(AddressFamily::V4,
+ address_v6::from_string("2001:db8:2::1"), address_v6::from_string("2001:db8:2::ffff:ffff:ffff:ffff"),
+ 64, AddressScope::GLOBAL, 0));
netifs.back()->setFlags(IFF_UP);
netifs.push_back(NetworkMonitorStub::makeNetworkInterface());
@@ -284,7 +290,7 @@
ConfigFile::Error);
}
-BOOST_AUTO_TEST_CASE(SubnetWhitelist)
+BOOST_AUTO_TEST_CASE(Subnet4Whitelist)
{
parseConfig("whitelist\n"
"{\n"
@@ -297,7 +303,7 @@
BOOST_CHECK_EQUAL(predicate(*netifs[3]), true);
}
-BOOST_AUTO_TEST_CASE(SubnetBlacklist)
+BOOST_AUTO_TEST_CASE(Subnet4Blacklist)
{
parseConfig("blacklist\n"
"{\n"
@@ -310,6 +316,32 @@
BOOST_CHECK_EQUAL(predicate(*netifs[3]), false);
}
+BOOST_AUTO_TEST_CASE(Subnet6Whitelist)
+{
+ parseConfig("whitelist\n"
+ "{\n"
+ " subnet 2001:db8:2::1/120\n"
+ "}");
+
+ BOOST_CHECK_EQUAL(predicate(*netifs[0]), false);
+ BOOST_CHECK_EQUAL(predicate(*netifs[1]), true);
+ BOOST_CHECK_EQUAL(predicate(*netifs[2]), false);
+ BOOST_CHECK_EQUAL(predicate(*netifs[3]), false);
+}
+
+BOOST_AUTO_TEST_CASE(Subnet6Blacklist)
+{
+ parseConfig("blacklist\n"
+ "{\n"
+ " subnet 2001:db8:2::1/120\n"
+ "}");
+
+ BOOST_CHECK_EQUAL(predicate(*netifs[0]), true);
+ BOOST_CHECK_EQUAL(predicate(*netifs[1]), false);
+ BOOST_CHECK_EQUAL(predicate(*netifs[2]), true);
+ BOOST_CHECK_EQUAL(predicate(*netifs[3]), true);
+}
+
BOOST_AUTO_TEST_CASE(SubnetMalformed)
{
BOOST_CHECK_THROW(
diff --git a/tests/core/network.t.cpp b/tests/core/network.t.cpp
index 76555a8..62eabde 100644
--- a/tests/core/network.t.cpp
+++ b/tests/core/network.t.cpp
@@ -1,6 +1,6 @@
/* -*- Mode:C++; c-file-style:"gnu"; indent-tabs-mode:nil; -*- */
-/**
- * Copyright (c) 2014-2016, Regents of the University of California,
+/*
+ * Copyright (c) 2014-2018, Regents of the University of California,
* Arizona Board of Regents,
* Colorado State University,
* University Pierre & Marie Curie, Sorbonne University,
@@ -69,6 +69,9 @@
Network n = boost::lexical_cast<Network>("192.0.2.0/24");
BOOST_CHECK_EQUAL(boost::lexical_cast<std::string>(n), "192.0.2.0 <-> 192.0.2.255");
+ BOOST_CHECK_THROW(boost::lexical_cast<Network>("192.0.2.0/255"), boost::bad_lexical_cast);
+ BOOST_CHECK_THROW(boost::lexical_cast<Network>("256.0.2.0/24"), boost::bad_lexical_cast);
+
BOOST_CHECK_EQUAL(n.doesContain(address::from_string("192.0.2.1")), true);
BOOST_CHECK_EQUAL(n.doesContain(address::from_string("192.0.2.254")), true);
BOOST_CHECK_EQUAL(n.doesContain(address::from_string("192.0.1.255")), false);
@@ -106,6 +109,10 @@
BOOST_CHECK_EQUAL(boost::lexical_cast<std::string>(n),
"2001:db8:3f9:1:: <-> 2001:db8:3f9:1:ffff:ffff:ffff:ffff");
+ BOOST_CHECK_THROW(boost::lexical_cast<Network>("2001:db8:3f9:1::/129"), boost::bad_lexical_cast);
+ BOOST_CHECK_THROW(boost::lexical_cast<Network>("200x:db8:3f9:1::/64"), boost::bad_lexical_cast);
+ BOOST_CHECK_THROW(boost::lexical_cast<Network>("2001:db8:3f9::1::/64"), boost::bad_lexical_cast);
+
BOOST_CHECK_EQUAL(n.doesContain(address::from_string("192.0.2.1")), false);
BOOST_CHECK_EQUAL(n.doesContain(address::from_string("2001:db8:3f9:1:3025:ccc5:eeeb:86d3")),
true);
@@ -167,6 +174,9 @@
BOOST_CHECK_EQUAL(Network::isValidCidr("foo/"), false);
BOOST_CHECK_EQUAL(Network::isValidCidr("foo"), false);
BOOST_CHECK_EQUAL(Network::isValidCidr("256.0.256.0/24"), false);
+
+ BOOST_CHECK_EQUAL(Network::isValidCidr("::1"), false);
+ BOOST_CHECK_EQUAL(Network::isValidCidr("::1/128"), true);
}
BOOST_AUTO_TEST_SUITE_END() // TestNetwork