github
/
fail2ban
mirror of https://github.com/fail2ban/fail2ban
1
0
Fork 0
Code Issues Releases Wiki Activity

more test cases for IP/DNS (and use dummies if no-network set by testing)

pull/2689/head
sebres 2020-04-06 12:39:36 +02:00
parent fc175fa78a
commit d21a24de8e
2 changed files with 22 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
fail2ban/tests/filtertestcase.py
View File

@ -1899,7 +1899,9 @@ class DNSUtilsNetworkTests(unittest.TestCase):
ip4 = IPAddr('192.0.2.1') ip4 = IPAddr('192.0.2.1')
ip6 = IPAddr('2001:DB8::') ip6 = IPAddr('2001:DB8::')
self.assertTrue(ip4.isIPv4) self.assertTrue(ip4.isIPv4)
self.assertTrue(ip4.isSingle)
self.assertTrue(ip6.isIPv6) self.assertTrue(ip6.isIPv6)
self.assertTrue(ip6.isSingle)
self.assertTrue(asip('192.0.2.1').isIPv4) self.assertTrue(asip('192.0.2.1').isIPv4)
self.assertTrue(id(asip(ip4)) == id(ip4)) self.assertTrue(id(asip(ip4)) == id(ip4))
@ -1908,6 +1910,7 @@ class DNSUtilsNetworkTests(unittest.TestCase):
r = IPAddr('xxx', IPAddr.CIDR_RAW) r = IPAddr('xxx', IPAddr.CIDR_RAW)
self.assertFalse(r.isIPv4) self.assertFalse(r.isIPv4)
self.assertFalse(r.isIPv6) self.assertFalse(r.isIPv6)
self.assertFalse(r.isSingle)
self.assertTrue(r.isValid) self.assertTrue(r.isValid)
self.assertEqual(r, 'xxx') self.assertEqual(r, 'xxx')
self.assertEqual('xxx', str(r)) self.assertEqual('xxx', str(r))
@ -1916,6 +1919,7 @@ class DNSUtilsNetworkTests(unittest.TestCase):
r = IPAddr('1:2', IPAddr.CIDR_RAW) r = IPAddr('1:2', IPAddr.CIDR_RAW)
self.assertFalse(r.isIPv4) self.assertFalse(r.isIPv4)
self.assertFalse(r.isIPv6) self.assertFalse(r.isIPv6)
self.assertFalse(r.isSingle)
self.assertTrue(r.isValid) self.assertTrue(r.isValid)
self.assertEqual(r, '1:2') self.assertEqual(r, '1:2')
self.assertEqual('1:2', str(r)) self.assertEqual('1:2', str(r))
@ -1938,7 +1942,7 @@ class DNSUtilsNetworkTests(unittest.TestCase):
def testUseDns(self): def testUseDns(self):
res = DNSUtils.textToIp('www.example.com', 'no') res = DNSUtils.textToIp('www.example.com', 'no')
self.assertSortedEqual(res, []) self.assertSortedEqual(res, [])
unittest.F2B.SkipIfNoNetwork() #unittest.F2B.SkipIfNoNetwork()
res = DNSUtils.textToIp('www.example.com', 'warn') res = DNSUtils.textToIp('www.example.com', 'warn')
# sort ipaddr, IPv4 is always smaller as IPv6 # sort ipaddr, IPv4 is always smaller as IPv6
self.assertSortedEqual(res, ['93.184.216.34', '2606:2800:220:1:248:1893:25c8:1946']) self.assertSortedEqual(res, ['93.184.216.34', '2606:2800:220:1:248:1893:25c8:1946'])
@ -1947,7 +1951,7 @@ class DNSUtilsNetworkTests(unittest.TestCase):
self.assertSortedEqual(res, ['93.184.216.34', '2606:2800:220:1:248:1893:25c8:1946']) self.assertSortedEqual(res, ['93.184.216.34', '2606:2800:220:1:248:1893:25c8:1946'])
def testTextToIp(self): def testTextToIp(self):
unittest.F2B.SkipIfNoNetwork() #unittest.F2B.SkipIfNoNetwork()
# Test hostnames # Test hostnames
hostnames = [ hostnames = [
'www.example.com', 'www.example.com',
@ -1971,7 +1975,7 @@ class DNSUtilsNetworkTests(unittest.TestCase):
self.assertTrue(isinstance(ip, IPAddr)) self.assertTrue(isinstance(ip, IPAddr))
def testIpToName(self): def testIpToName(self):
unittest.F2B.SkipIfNoNetwork() #unittest.F2B.SkipIfNoNetwork()
res = DNSUtils.ipToName('8.8.4.4') res = DNSUtils.ipToName('8.8.4.4')
self.assertTrue(res.endswith(('.google', '.google.com'))) self.assertTrue(res.endswith(('.google', '.google.com')))
# same as above, but with IPAddr: # same as above, but with IPAddr:
@ -1993,8 +1997,10 @@ class DNSUtilsNetworkTests(unittest.TestCase):
self.assertEqual(res.addr, 167772160L) self.assertEqual(res.addr, 167772160L)
res = IPAddr('10.0.0.1', cidr=32L) res = IPAddr('10.0.0.1', cidr=32L)
self.assertEqual(res.addr, 167772161L) self.assertEqual(res.addr, 167772161L)
self.assertTrue(res.isSingle)
res = IPAddr('10.0.0.1', cidr=31L) res = IPAddr('10.0.0.1', cidr=31L)
self.assertEqual(res.addr, 167772160L) self.assertEqual(res.addr, 167772160L)
self.assertFalse(res.isSingle)
self.assertEqual(IPAddr('10.0.0.0').hexdump, '0a000000') self.assertEqual(IPAddr('10.0.0.0').hexdump, '0a000000')
self.assertEqual(IPAddr('1::2').hexdump, '00010000000000000000000000000002') self.assertEqual(IPAddr('1::2').hexdump, '00010000000000000000000000000002')
@ -2019,6 +2025,8 @@ class DNSUtilsNetworkTests(unittest.TestCase):
def testIPAddr_InInet(self): def testIPAddr_InInet(self):
ip4net = IPAddr('93.184.0.1/24') ip4net = IPAddr('93.184.0.1/24')
ip6net = IPAddr('2606:2800:220:1:248:1893:25c8:0/120') ip6net = IPAddr('2606:2800:220:1:248:1893:25c8:0/120')
self.assertFalse(ip4net.isSingle)
self.assertFalse(ip6net.isSingle)
# ip4: # ip4:
self.assertTrue(IPAddr('93.184.0.1').isInNet(ip4net)) self.assertTrue(IPAddr('93.184.0.1').isInNet(ip4net))
self.assertTrue(IPAddr('93.184.0.255').isInNet(ip4net)) self.assertTrue(IPAddr('93.184.0.255').isInNet(ip4net))
@ -2114,7 +2122,7 @@ class DNSUtilsNetworkTests(unittest.TestCase):
) )
def testIPAddr_CompareDNS(self): def testIPAddr_CompareDNS(self):
unittest.F2B.SkipIfNoNetwork() #unittest.F2B.SkipIfNoNetwork()
ips = IPAddr('example.com') ips = IPAddr('example.com')
self.assertTrue(IPAddr("93.184.216.34").isInNet(ips)) self.assertTrue(IPAddr("93.184.216.34").isInNet(ips))
self.assertTrue(IPAddr("2606:2800:220:1:248:1893:25c8:1946").isInNet(ips)) self.assertTrue(IPAddr("2606:2800:220:1:248:1893:25c8:1946").isInNet(ips))

12
fail2ban/tests/utils.py
View File

@ -39,7 +39,7 @@ from cStringIO import StringIO
from functools import wraps from functools import wraps
from ..helpers import getLogger, str2LogLevel, getVerbosityFormat, uni_decode from ..helpers import getLogger, str2LogLevel, getVerbosityFormat, uni_decode
from ..server.ipdns import DNSUtils from ..server.ipdns import IPAddr, DNSUtils
from ..server.mytime import MyTime from ..server.mytime import MyTime
from ..server.utils import Utils from ..server.utils import Utils
# for action_d.test_smtp : # for action_d.test_smtp :
@ -331,13 +331,21 @@ def initTests(opts):
c.set('2001:db8::ffff', 'test-other') c.set('2001:db8::ffff', 'test-other')
c.set('87.142.124.10', 'test-host') c.set('87.142.124.10', 'test-host')
if unittest.F2B.no_network: # pragma: no cover if unittest.F2B.no_network: # pragma: no cover
# precache all wrong dns to ip's used in test cases: # precache all ip to dns used in test cases:
c.set('192.0.2.888', None)
c.set('8.8.4.4', 'dns.google')
c.set('8.8.4.4', 'dns.google')
# precache all dns to ip's used in test cases:
c = DNSUtils.CACHE_nameToIp c = DNSUtils.CACHE_nameToIp
for i in ( for i in (
('999.999.999.999', set()), ('999.999.999.999', set()),
('abcdef.abcdef', set()), ('abcdef.abcdef', set()),
('192.168.0.', set()), ('192.168.0.', set()),
('failed.dns.ch', set()), ('failed.dns.ch', set()),
('doh1.2.3.4.buga.xxxxx.yyy.invalid', set()),
('1.2.3.4.buga.xxxxx.yyy.invalid', set()),
('example.com', set([IPAddr('2606:2800:220:1:248:1893:25c8:1946'), IPAddr('93.184.216.34')])),
('www.example.com', set([IPAddr('2606:2800:220:1:248:1893:25c8:1946'), IPAddr('93.184.216.34')])),
): ):
c.set(*i) c.set(*i)
# if fast - precache all host names as localhost addresses (speed-up getSelfIPs/ignoreself): # if fast - precache all host names as localhost addresses (speed-up getSelfIPs/ignoreself):