tyler.durden
/
icinga2
mirror of https://github.com/Icinga/icinga2.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Improve validation for CIDR masks 

fixes #10375
This commit is contained in:
Gunnar Beutner 2015-10-19 10:40:48 +02:00
parent f51a76e13d
commit 5aa91551a5
1 changed files with 7 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
lib/base/utility.cpp
View File

@ -181,17 +181,21 @@ static void ParseIpMask(const String& ip, char mask[16], int *bits)
if (!ParseIp(uip, mask, &proto))
BOOST_THROW_EXCEPTION(std::invalid_argument("Invalid IP address specified."));
if (proto == AF_INET)
if (proto == AF_INET) {
if (*bits > 32 || *bits < 0)
BOOST_THROW_EXCEPTION(std::invalid_argument("Mask must be between 0 and 32 for IPv4 CIDR masks."));
*bits += 96;
}
if (slashp == String::NPos)
*bits = 128;
if (*bits > 128 || *bits < 0)
BOOST_THROW_EXCEPTION(std::invalid_argument("Mask must be between 0 and 128."));
BOOST_THROW_EXCEPTION(std::invalid_argument("Mask must be between 0 and 128 for IPv6 CIDR masks."));
for (int i = 0; i < 16; i++) {
int lbits = *bits - i * 8;
int lbits = std::max(0, *bits - i * 8);
if (lbits >= 8)
continue;