Report invalid osd_network as a fatal error instead of an exception #152

Merged
vitalif merged 2 commits from koolkhel/vitastor:osd-network-fatal into master 2026-11-23 00:09:19 +03:00
4 changed files with 42 additions and 13 deletions

View File

@@ -364,11 +364,22 @@ void osd_messenger_t::parse_config(const json11::Json & config, bool init)
if (this->osd_networks[i] == net)
this->osd_networks.erase(this->osd_networks.begin()+i, this->osd_networks.begin()+i+1);
this->osd_network_masks.clear();
for (auto & netstr: this->osd_networks)
this->osd_network_masks.push_back(cidr_parse(netstr));
this->osd_cluster_network_masks.clear();
addr_mask_t mask;
vitalif marked this conversation as resolved Outdated

просьба без try тогда, а сделать чтобы функции возвращали ошибку.

просьба без try тогда, а сделать чтобы функции возвращали ошибку.
for (auto & netstr: this->osd_networks)
{
if (cidr_parse(netstr, &mask))
this->osd_network_masks.push_back(mask);
else
fatal_error(EINVAL, "Invalid IP address mask: "+netstr);
}
for (auto & netstr: this->osd_cluster_networks)
this->osd_cluster_network_masks.push_back(cidr_parse(netstr));
{
if (cidr_parse(netstr, &mask))
this->osd_cluster_network_masks.push_back(mask);
else
fatal_error(EINVAL, "Invalid IP address mask: "+netstr);
}
this->all_osd_networks.clear();
this->all_osd_networks.insert(this->all_osd_networks.end(), this->osd_networks.begin(), this->osd_networks.end());
this->all_osd_networks.insert(this->all_osd_networks.end(), this->osd_cluster_networks.begin(), this->osd_cluster_networks.end());

View File

@@ -242,8 +242,27 @@ static void test_keepalive_after_stall()
delete tfd;
}
// An invalid network mask must be reported as a fatal error, not thrown out of parse_config()
static void test_invalid_osd_network()
{
printf("test_invalid_osd_network\n");
for (auto key: { "osd_network", "osd_cluster_network" })
{
osd_messenger_t *msgr = new osd_messenger_t();
int errcode = 0;
std::string error;
msgr->on_fatal_error_hook = [&](int code, const std::string & err) { errcode = code; error = err; };
msgr->parse_config(json11::Json::object { { key, "10.0.0.0/33" } }, true);
printf(" %s: %s\n", key, error.c_str());
assert(errcode == EINVAL);
assert(error.find("Invalid IP address mask") != std::string::npos);
delete msgr;
}
}
int main(int narg, char *args[])
{
test_invalid_osd_network();
test_keepalive_catch_up();
test_keepalive_after_stall();
ring_loop_t *ringloop;

View File

@@ -101,7 +101,7 @@ bool cidr_sockaddr_match(const sockaddr_storage &addr, const addr_mask_t &mask)
: cidr6_match(((sockaddr_in6*)&addr)->sin6_addr, mask.ipv6, mask.bits));
}
addr_mask_t cidr_parse(std::string mask)
bool cidr_parse(std::string mask, addr_mask_t *result)
{
unsigned bits = 255;
int p = mask.find('/');
@@ -109,7 +109,7 @@ addr_mask_t cidr_parse(std::string mask)
{
char null_byte = 0;
if (sscanf(mask.c_str()+p+1, "%u%c", &bits, &null_byte) != 1 || bits > 128)
throw std::runtime_error("Invalid IP address mask: " + mask);
return false;
mask = mask.substr(0, p);
}
in_addr ipv4;
@@ -119,19 +119,18 @@ addr_mask_t cidr_parse(std::string mask)
if (bits == 255)
bits = 32;
if (bits > 32)
throw std::runtime_error("Invalid IP address mask: " + mask);
return (addr_mask_t){ .family = AF_INET, .ipv4 = ipv4, .bits = (uint8_t)(bits ? bits : 32) };
return false;
*result = (addr_mask_t){ .family = AF_INET, .ipv4 = ipv4, .bits = (uint8_t)(bits ? bits : 32) };
return true;
}
else if (inet_pton(AF_INET6, mask.c_str(), &ipv6) == 1)
{
if (bits == 255)
bits = 128;
return (addr_mask_t){ .family = AF_INET6, .ipv6 = ipv6, .bits = (uint8_t)bits };
}
else
{
throw std::runtime_error("Invalid IP address mask: " + mask);
*result = (addr_mask_t){ .family = AF_INET6, .ipv6 = ipv6, .bits = (uint8_t)bits };
return true;
}
return false;
}
std::vector<std::string> getifaddr_list(const std::vector<addr_mask_t> & masks, bool include_v6)

View File

@@ -17,7 +17,7 @@ struct addr_mask_t
bool string_to_addr(std::string str, bool parse_port, int default_port, struct sockaddr_storage *addr);
std::string addr_to_string(const sockaddr_storage &addr);
addr_mask_t cidr_parse(std::string mask);
bool cidr_parse(std::string mask, addr_mask_t *result);
bool cidr_match(const in_addr &address, const in_addr &network, uint8_t bits);
bool cidr6_match(const in6_addr &address, const in6_addr &network, uint8_t bits);
bool cidr_sockaddr_match(const sockaddr_storage &addr, const addr_mask_t &mask);