adam/znc
1
0
Fork 0
mirror of https://github.com/znc/znc.git synced 2026-07-05 01:11:53 +02:00
Code Issues Packages Projects Releases Wiki Activity

Improve code quality.

Browse Source
This commit is contained in:
Donal Cahill
2015-12-13 12:21:49 +00:00
parent a5540557ac
commit 56c97af14b
2 changed files with 23 additions and 36 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/User.cpp
+17 -22
View File
@@ -854,20 +854,6 @@ bool CUser::IsHostAllowed(const CString& sHostMask) const {
return true;
} else {
// CIDR notation checker, e.g. "192.0.2.0/24" or "2001:db8::/32"
addrinfo *aiHost, *aiRange;
addrinfo aiHints;
in6_addr in6aBitmask;
memset(&in6aBitmask, 0, sizeof(in6aBitmask));
memset(&aiHints, 0, sizeof(addrinfo));
aiHints.ai_family = AF_UNSPEC; // Allow any address family
aiHints.ai_socktype = 0; // Any socket
aiHints.ai_flags = AI_NUMERICHOST;
aiHints.ai_protocol = 0; // Any protocol
aiHints.ai_canonname = NULL;
aiHints.ai_addr = NULL;
aiHints.ai_next = NULL;
// Try to split the string into an IP and routing prefix
VCString vsSplitCIDR;
@@ -876,16 +862,22 @@ bool CUser::IsHostAllowed(const CString& sHostMask) const {
if (iSplitCIDRCount != 2 || iRoutingPrefix < 0) continue;
int iIsHostValid, iIsRangeValid;
iIsHostValid =
// Convert each IP from a numeric string to an addrinfo
addrinfo aiHints;
memset(&aiHints, 0, sizeof(addrinfo));
aiHints.ai_flags = AI_NUMERICHOST;
addrinfo* aiHost;
int iIsHostValid =
getaddrinfo(sHostMask.c_str(), NULL, &aiHints, &aiHost);
if (iIsHostValid != 0) continue;
aiHints.ai_family = aiHost->ai_family; // Host and range must be in
// the same address family
iIsRangeValid = getaddrinfo(vsSplitCIDR.front().c_str(), NULL,
&aiHints, &aiRange);
addrinfo* aiRange;
int iIsRangeValid = getaddrinfo(vsSplitCIDR.front().c_str(), NULL,
&aiHints, &aiRange);
if (iIsRangeValid != 0) {
freeaddrinfo(aiHost);
continue;
@@ -915,6 +907,9 @@ bool CUser::IsHostAllowed(const CString& sHostMask) const {
(inBitmask & saRange->sin_addr.s_addr));
} else if (aiHost->ai_family == AF_INET6) {
// Make IPv6 bitmask
in6_addr in6aBitmask;
memset(&in6aBitmask, 0, sizeof(in6aBitmask));
for (int i = 0, iBitsLeft = iRoutingPrefix; iBitsLeft > 0;
++i, iBitsLeft -= 8) {
if (iBitsLeft >= 8) {
@@ -932,10 +927,10 @@ bool CUser::IsHostAllowed(const CString& sHostMask) const {
(sockaddr_in6*)(aiRange->ai_addr);
for (int i = 0; i < 16; ++i) {
if (!((in6aBitmask.s6_addr[i] &
sa6Host->sin6_addr.s6_addr[i]) ==
(in6aBitmask.s6_addr[i] &
sa6Range->sin6_addr.s6_addr[i]))) {
if ((in6aBitmask.s6_addr[i] &
sa6Host->sin6_addr.s6_addr[i]) !=
(in6aBitmask.s6_addr[i] &
sa6Range->sin6_addr.s6_addr[i])) {
bIsHostInRange = false;
}
}
test/UserTest.cpp
+6 -14
View File
@@ -25,8 +25,6 @@ class UserTest : public ::testing::Test {
};
TEST_F(UserTest, IsHostAllowed) {
CUser* m_pTestUser;
struct hostTest {
CString sTestHost;
CString sIP;
@@ -93,17 +91,11 @@ TEST_F(UserTest, IsHostAllowed) {
{"2001:db8::/32", "2001:db8:8000::", true},
{"2001:db8::/33", "2001:db8:8000::", false},
};
for (int i = 0; i < (int)(sizeof(aHostTests) / sizeof(aHostTests[0]));
++i) {
m_pTestUser = new CUser("user");
hostTest* h = aHostTests + i;
m_pTestUser->AddAllowedHost(h->sTestHost);
CString should = h->bExpectedResult ? "" : " not";
CString error = "Allow-host string \"" + h->sTestHost + "\" should" +
should + " allow host \"" + h->sIP + "\"";
EXPECT_EQ(m_pTestUser->IsHostAllowed(aHostTests[i].sIP),
aHostTests[i].bExpectedResult)
<< error;
delete m_pTestUser;
for (const hostTest& h : aHostTests) {
CUser pTestUser("user");
pTestUser.AddAllowedHost(h.sTestHost);
EXPECT_EQ(h.bExpectedResult, pTestUser.IsHostAllowed(h.sIP))
<< "Allow-host is " << h.sTestHost;
}
}