onkelbeh/fwbuilder
1
0
Fork 0
mirror of https://github.com/fwbuilder/fwbuilder synced 2026-05-10 19:14:57 +02:00
Code Issues Releases Wiki Activity

function InetAddr::isValidV4Netmask() checks that netmask represented

Browse Source 
by the object consists of a sequence of "1" bits, followed by the
sequence of "0" bits and therefore does not have zeroes in the middle.

added check to the Network object dialog to make sure user does not
enter netmask with zeroes in the middle for the IPv4 network
object. Netmasks like that are not supported by fwbuilder.

see #2644
This commit is contained in:
Vadim Kurland
2011-08-14 19:41:14 -07:00
parent 23f488361c
commit e4491ccd51
5 changed files with 82 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
doc/ChangeLog
View File

@@ -1,5 +1,16 @@
2011-08-14 Vadim Kurland <vadim@netcitadel.com>
* InetAddr.cpp (InetAddr::isValidV4Netmask): function
InetAddr::isValidV4Netmask() checks that netmask represented by
the object consists of a sequence of "1" bits, followed by the
sequence of "0" bits and therefore does not have zeroes in the
middle.
* NetworkDialog.cpp (NetworkDialog::validate): added check to make
sure user does not enter netmask with zeroes in the middle for the
IPv4 network object. Netmasks like that are not supported by
fwbuilder.
* RuleSetView.cpp (RuleSetView::addColumnRelatedMenu): fixes #2643
"GUI crashes when user cuts a rule, then right-mouse click in any
rule element of another"

21
src/libfwbuilder/src/fwbuilder/InetAddr.cpp
View File

@@ -155,6 +155,27 @@ void InetAddr::init_from_int(unsigned int len)
}
}
/*
* Netmask with "holes" is accepted by InetAddr, but we do not support
* it at this time. This function returns true if InetAddr object
* corresponds to an integer with a string of consequitive "1" bits
* and then string of consequtive "0" bits. The function only works
* for ipv4 addresses.
*/
bool InetAddr::isValidV4Netmask()
{
assert(isV4());
unsigned int n = ntohl(ipv4.s_addr);
while (n & 0x80000000)
{
n = n<<1;
}
return (n == 0);
}
// uint128 is always in the host order
void InetAddr::init_from_uint128(uint128 la)
{

2
src/libfwbuilder/src/fwbuilder/InetAddr.h
View File

@@ -110,6 +110,8 @@ class InetAddr
return sizeof(ipv6) * 8;
}
bool isValidV4Netmask();
void init_from_uint128(uint128 int128a);
uint128 to_uint128() const;

18
src/libgui/NetworkDialog.cpp
View File

@@ -178,6 +178,7 @@ void NetworkDialog::validate(bool *result)
}
InetAddr nm( m_dialog->netmask->text().toStdString() );
if (nm.isAny())
{
// permit netmask 0.0.0.0 if the address is also 0.0.0.0
@@ -200,6 +201,23 @@ void NetworkDialog::validate(bool *result)
}
}
if (!nm.isValidV4Netmask())
{
*result = false;
if (QApplication::focusWidget() != NULL)
{
blockSignals(true);
// Do not allow netmask with zeroes inside.
QMessageBox::critical(
this, "Firewall Builder",
tr("Netmasks with zeroes in the middle are not supported"),
tr("&Continue"), 0, 0,
0 );
blockSignals(false);
}
return;
}
} catch (FWException &ex)
{

31
src/unit_tests/InetAddrMaskTest/InetAddrMaskTest.cpp
View File

@@ -71,6 +71,35 @@ void InetAddrMaskTest::testStringToInetAddr()
sa1 = new InetAddr("1.0.0");
CPPUNIT_ASSERT_MESSAGE("1.0.0 -> " + sa1->toString(), sa1->toString() == "1.0.0.0");
sa1 = new InetAddr("255.255.255.255");
CPPUNIT_ASSERT_MESSAGE("255.255.255.255 -> " + sa1->toString(), sa1->toString() == "255.255.255.255");
CPPUNIT_ASSERT(sa1->isValidV4Netmask() == true);
sa1 = new InetAddr("255.255.255.128");
CPPUNIT_ASSERT_MESSAGE("255.255.255.128 -> " + sa1->toString(), sa1->toString() == "255.255.255.128");
CPPUNIT_ASSERT(sa1->isValidV4Netmask() == true);
sa1 = new InetAddr("255.255.255.0");
CPPUNIT_ASSERT_MESSAGE("255.255.255.0 -> " + sa1->toString(), sa1->toString() == "255.255.255.0");
CPPUNIT_ASSERT(sa1->isValidV4Netmask() == true);
sa1 = new InetAddr("255.255.0.0");
CPPUNIT_ASSERT_MESSAGE("255.255.0.0 -> " + sa1->toString(), sa1->toString() == "255.255.0.0");
CPPUNIT_ASSERT(sa1->isValidV4Netmask() == true);
sa1 = new InetAddr("255.0.0.0");
CPPUNIT_ASSERT_MESSAGE("255.0.0.0 -> " + sa1->toString(), sa1->toString() == "255.0.0.0");
CPPUNIT_ASSERT(sa1->isValidV4Netmask() == true);
sa1 = new InetAddr("0.0.0.0");
CPPUNIT_ASSERT_MESSAGE("0.0.0.0 -> " + sa1->toString(), sa1->toString() == "0.0.0.0");
CPPUNIT_ASSERT(sa1->isValidV4Netmask() == true);
sa1 = new InetAddr("255.0.255.0");
CPPUNIT_ASSERT_MESSAGE("255.0.255.0 -> " + sa1->toString(), sa1->toString() == "255.0.255.0");
CPPUNIT_ASSERT(sa1->isValidV4Netmask() == false);
}
void InetAddrMaskTest::testStringToInetAddrExceptions()
@@ -132,7 +161,7 @@ void InetAddrMaskTest::testStringToInetAddrMask()
sa = a1->getAddressPtr()->toString();
CPPUNIT_ASSERT(sa=="0.0.0.0");
// 0.0.0.0/0.0.0.0 has maximum dimension (represents all possible addresses)
CPPUNIT_ASSERT(a1->dimension() == (1<<31)-1);
CPPUNIT_ASSERT(a1->dimension() == (((unsigned int)1)<<31)-1);
InetAddrMask *a2 = new InetAddrMask(InetAddr("1.1.1.1"), InetAddr("255.255.255.0"));
sa = a2->getAddressPtr()->toString();