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

resolve sporadic timing errors (unban if ban still not occurred, resp. get list of IPs if not yet banned); 

simplify helper procedure for testJailBanList.
pull/2315/head
sebres 2019-01-06 23:44:42 +01:00
parent 4b934c784d
commit 963e14c685
1 changed files with 6 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
fail2ban/tests/servertestcase.py
View File

@ -103,33 +103,25 @@ class TransmitterBase(LogCaptureTestCase):
# if we expected to get it set without problem, check new value # if we expected to get it set without problem, check new value
self.assertEqual(v(self.transm.proceed(getCmd)), v((0, outValue))) self.assertEqual(v(self.transm.proceed(getCmd)), v((0, outValue)))
def getBanListTest(self, jail, banip=None, unbanip=None, outList=None): def getBanListTest(self, jail, banip=None, unbanip=None, outList=[]):
"""Process set banip/set unbanip commands and compare the list of """Process set banip/set unbanip commands and compare the list of
banned IP addresses with outList.""" banned IP addresses with outList."""
def v(value):
"""Prepare value for comparison."""
if value[1] is None:
tmp = []
else:
tmp = map(str, value[1])
return (value[0], sorted(tmp))
# Ban IP address # Ban IP address
if banip is not None: if banip is not None:
self.assertEqual( self.assertEqual(
self.transm.proceed(["set", jail, "banip", banip]), self.transm.proceed(["set", jail, "banip", banip]),
(0, banip)) (0, banip))
time.sleep(Utils.DEFAULT_SLEEP_TIME) # Give chance to ban self.assertLogged("Ban %s" % banip, wait=True) # Give chance to ban
# Unban IP address # Unban IP address
if unbanip is not None: if unbanip is not None:
self.assertEqual( self.assertEqual(
self.transm.proceed(["set", jail, "unbanip", unbanip]), self.transm.proceed(["set", jail, "unbanip", unbanip]),
(0, unbanip)) (0, unbanip))
time.sleep(Utils.DEFAULT_SLEEP_TIME) # Give chance to unban self.assertLogged("Unban %s" % unbanip, wait=True) # Give chance to unban
# Compare the list of banned IP addresses with outList # Compare the list of banned IP addresses with outList
self.assertEqual( self.assertSortedEqual(
v(self.transm.proceed(["get", jail, "banip"])), self.transm.proceed(["get", jail, "banip"]),
v((0, outList))) (0, outList))
def setGetTestNOK(self, cmd, inValue, jail=None): def setGetTestNOK(self, cmd, inValue, jail=None):
setCmd = ["set", cmd, inValue] setCmd = ["set", cmd, inValue]