Skip to content

Commit

Permalink
Merge pull request ceph#60881 from NitzanMordhai/wip-nitzan-ipv6-subn…
Browse files Browse the repository at this point in the history 
…et-checks

common/pick_address: Add IPv6 support to is_addr_in_subnet
  • Loading branch information
@ljflores
ljflores authored Jan 9, 2025
2 parents 4d78f52 + d68857c commit 83d7437
Show file tree
Hide file tree
Showing 4 changed files with 179 additions and 13 deletions.
29 changes: 21 additions & 8 deletions src/common/pick_address.cc
View file
Original file line number Diff line number Diff line change
Expand Up @@ -642,28 +642,41 @@ int get_iface_numa_node(
bool is_addr_in_subnet(
CephContext *cct,
const std::string &networks,
const std::string &addr)
const entity_addr_t &addr)
{
const auto nets = get_str_list(networks);
ceph_assert(!nets.empty());

unsigned ipv = CEPH_PICK_ADDRESS_IPV4;
struct sockaddr_in public_addr;
public_addr.sin_family = AF_INET;

if(inet_pton(AF_INET, addr.c_str(), &public_addr.sin_addr) != 1) {
lderr(cct) << "unable to convert chosen address to string: " << addr << dendl;
struct sockaddr_in6 public_addr6;
struct sockaddr_in public_addr4;

if (addr.is_ipv4() &&
inet_pton(AF_INET, addr.ip_only_to_str().c_str(), &public_addr4.sin_addr) == 1) {
public_addr4.sin_family = AF_INET;
} else if (addr.is_ipv6() &&
inet_pton(AF_INET6, addr.ip_only_to_str().c_str(), &public_addr6.sin6_addr) == 1) {
public_addr6.sin6_family = AF_INET6;
ipv = CEPH_PICK_ADDRESS_IPV6;
} else {
std::string_view addr_type = addr.is_ipv4() ? "IPv4" : "IPv6";
lderr(cct) << "IP address " << addr << " is not parseable as " << addr_type << dendl;
return false;
}

for (const auto &net : nets) {
struct ifaddrs ifa;
memset(&ifa, 0, sizeof(ifa));
ifa.ifa_next = nullptr;
ifa.ifa_addr = (struct sockaddr*)&public_addr;
if (addr.is_ipv4()) {
ifa.ifa_addr = (struct sockaddr*)&public_addr4;
} else if (addr.is_ipv6()) {
ifa.ifa_addr = (struct sockaddr*)&public_addr6;
}

if(matches_with_net(cct, ifa, net, ipv)) {
return true;
}
}
lderr(cct) << "address " << addr << " is not in networks '" << networks << "'" << dendl;
return false;
}
2 changes: 1 addition & 1 deletion src/common/pick_address.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -98,6 +98,6 @@ int get_iface_numa_node(
bool is_addr_in_subnet(
CephContext *cct,
const std::string &networks,
const std::string &addr);
const entity_addr_t &addr);

#endif
6 changes: 2 additions & 4 deletions src/osd/OSDMap.cc
View file
Original file line number Diff line number Diff line change
Expand Up @@ -1642,12 +1642,10 @@ void OSDMap::get_out_of_subnet_osd_counts(CephContext *cct,
for (int i = 0; i < max_osd; i++) {
if (exists(i) && is_up(i)) {
if (const auto& addrs = get_addrs(i).v; addrs.size() >= 2) {
auto v1_addr = addrs[0].ip_only_to_str();
if (!is_addr_in_subnet(cct, public_network, v1_addr)) {
if (!is_addr_in_subnet(cct, public_network, addrs[0])) {
unreachable->emplace(i);
}
auto v2_addr = addrs[1].ip_only_to_str();
if (!is_addr_in_subnet(cct, public_network, v2_addr)) {
if (!is_addr_in_subnet(cct, public_network, addrs[1])) {
unreachable->emplace(i);
}
}
Expand Down
155 changes: 155 additions & 0 deletions src/test/test_ipaddr.cc
View file
Original file line number Diff line number Diff line change
Expand Up @@ -995,3 +995,158 @@ TEST(pick_address, ipv4_ipv6_enabled2)
ASSERT_EQ(-1, r);
}
}

// Test for IPv4 address
TEST(is_addr_in_subnet, ipv4)
{
std::string public_network = "10.1.1.0/24";
entity_addr_t addr;
addr.parse("10.1.1.2", nullptr);

boost::intrusive_ptr<CephContext> cct(new CephContext(CEPH_ENTITY_TYPE_OSD), false);
cct->_conf._clear_safe_to_start_threads();
cct->_conf.set_val("ms_bind_ipv4", "true");
cct->_conf.set_val("ms_bind_ipv6", "false");

bool r = is_addr_in_subnet(cct.get(), public_network, addr);
ASSERT_EQ(true, r);
}

// Test for IPv6 address
TEST(is_addr_in_subnet, ipv6)
{
std::string public_network = "2001:db8::/64";
entity_addr_t addr;
addr.parse("2001:db8::1", nullptr);

boost::intrusive_ptr<CephContext> cct(new CephContext(CEPH_ENTITY_TYPE_OSD), false);
cct->_conf._clear_safe_to_start_threads();
cct->_conf.set_val("ms_bind_ipv6", "true");
cct->_conf.set_val("ms_bind_ipv4", "false");

bool r = is_addr_in_subnet(cct.get(), public_network, addr);
ASSERT_EQ(true, r);
}

// Test for invalid address
TEST(is_addr_in_subnet, invalid_address)
{
std::string public_network = "10.1.1.0/24";
entity_addr_t addr;
addr.parse("192.168.1.1", nullptr);

boost::intrusive_ptr<CephContext> cct(new CephContext(CEPH_ENTITY_TYPE_OSD), false);
cct->_conf._clear_safe_to_start_threads();
cct->_conf.set_val("ms_bind_ipv4", "true");
cct->_conf.set_val("ms_bind_ipv6", "false");

bool r = is_addr_in_subnet(cct.get(), public_network, addr);
ASSERT_EQ(false, r);
}

// Test for malformed address
TEST(is_addr_in_subnet, malformed_address)
{
std::string public_network = "10.1.1.0/24";
entity_addr_t addr;
addr.parse("invalid_address", nullptr);

boost::intrusive_ptr<CephContext> cct(new CephContext(CEPH_ENTITY_TYPE_OSD), false);
cct->_conf._clear_safe_to_start_threads();
cct->_conf.set_val("ms_bind_ipv4", "true");
cct->_conf.set_val("ms_bind_ipv6", "false");

// Test with a malformed address
bool r = is_addr_in_subnet(cct.get(), public_network, addr);
ASSERT_EQ(false, r);
}

TEST(is_addr_in_subnet, boundary_ipv4)
{
std::string public_network = "10.1.1.0/24";
entity_addr_t addr_low;
addr_low.parse("10.1.1.0", nullptr);
entity_addr_t addr_high;
addr_high.parse("10.1.1.255", nullptr);
entity_addr_t addr_out;
addr_out.parse("10.1.2.0", nullptr);

boost::intrusive_ptr<CephContext> cct(new CephContext(CEPH_ENTITY_TYPE_OSD), false);
cct->_conf._clear_safe_to_start_threads();
cct->_conf.set_val("ms_bind_ipv4", "true");
cct->_conf.set_val("ms_bind_ipv6", "false");

ASSERT_TRUE(is_addr_in_subnet(cct.get(), public_network, addr_low));
ASSERT_TRUE(is_addr_in_subnet(cct.get(), public_network, addr_high));
ASSERT_FALSE(is_addr_in_subnet(cct.get(), public_network, addr_out));
}

TEST(is_addr_in_subnet, boundary_ipv6)
{
std::string public_network = "2001:db8::/64";
entity_addr_t addr_low;
addr_low.parse("2001:db8::", nullptr);
entity_addr_t addr_high;
addr_high.parse("2001:db8:0:0:ffff:ffff:ffff:ffff", nullptr);
entity_addr_t addr_out;
addr_out.parse("2001:db9::", nullptr);

boost::intrusive_ptr<CephContext> cct(new CephContext(CEPH_ENTITY_TYPE_OSD), false);
cct->_conf._clear_safe_to_start_threads();
cct->_conf.set_val("ms_bind_ipv6", "true");
cct->_conf.set_val("ms_bind_ipv4", "false");

ASSERT_TRUE(is_addr_in_subnet(cct.get(), public_network, addr_low));
ASSERT_TRUE(is_addr_in_subnet(cct.get(), public_network, addr_high));
ASSERT_FALSE(is_addr_in_subnet(cct.get(), public_network, addr_out));
}

TEST(is_addr_in_subnet, overlapping_subnets)
{
std::string public_network_1 = "10.1.1.0/24";
std::string public_network_2 = "10.1.2.0/24";
entity_addr_t addr;
addr.parse("10.1.1.5", nullptr);

boost::intrusive_ptr<CephContext> cct(new CephContext(CEPH_ENTITY_TYPE_OSD), false);
cct->_conf._clear_safe_to_start_threads();
cct->_conf.set_val("ms_bind_ipv4", "true");
cct->_conf.set_val("ms_bind_ipv6", "false");

ASSERT_TRUE(is_addr_in_subnet(cct.get(), public_network_1, addr));
ASSERT_FALSE(is_addr_in_subnet(cct.get(), public_network_2, addr));
}

TEST(is_addr_in_subnet, mismatched_family)
{
std::string public_network_1 = "2001:db8::/64";
entity_addr_t addr_1;
addr_1.parse("10.1.1.5", nullptr);

std::string public_network_2 = "10.1.1.0/24";
entity_addr_t addr_2;
addr_2.parse("2001:db8::1", nullptr);

boost::intrusive_ptr<CephContext> cct(new CephContext(CEPH_ENTITY_TYPE_OSD), false);
cct->_conf._clear_safe_to_start_threads();
cct->_conf.set_val("ms_bind_ipv4", "true");
cct->_conf.set_val("ms_bind_ipv6", "true");

ASSERT_FALSE(is_addr_in_subnet(cct.get(), public_network_1, addr_1));
ASSERT_FALSE(is_addr_in_subnet(cct.get(), public_network_2, addr_2));
}

TEST(is_addr_in_subnet, invalid_subnets)
{
std::string public_network_1 = "10.1.1.0/33";
std::string public_network_2 = "25.0.0.99/10";
entity_addr_t addr;
addr.parse("10.1.1.2", nullptr);

boost::intrusive_ptr<CephContext> cct(new CephContext(CEPH_ENTITY_TYPE_OSD), false);
cct->_conf._clear_safe_to_start_threads();

ASSERT_FALSE(is_addr_in_subnet(cct.get(), public_network_1, addr)); // Invalid prefix
ASSERT_FALSE(is_addr_in_subnet(cct.get(), public_network_2, addr)); // Invalid subnet string
}

0 comments on commit 83d7437

Please sign in to comment.