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

differentiate <ip> and <fid> (<F-ID>): if IP-address deviates from ID then `<ip>` is not `<fid>` anymore; 

introduces certain backwards incompatibility against actions that have used tag `<ip>` to get failure-ID, if IP-related tags (like `<ADDR>` or `<HOST>`) used additionally to `<F-ID>` and they are different, see gh-3217
pull/3229/head
sebres 2022-02-11 19:10:26 +01:00
parent 246d0e1100
commit 96121830da
14 changed files with 95 additions and 79 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
fail2ban/client/fail2banregex.py
View File

@ -520,10 +520,14 @@ class Fail2banRegex(object):
def _prepaireOutput(self): def _prepaireOutput(self):
"""Prepares output- and fetch-function corresponding given '--out' option (format)""" """Prepares output- and fetch-function corresponding given '--out' option (format)"""
ofmt = self._opts.out ofmt = self._opts.out
if ofmt in ('id', 'ip'): if ofmt in ('id', 'fid'):
def _out(ret): def _out(ret):
for r in ret: for r in ret:
output(r[1]) output(r[1])
elif ofmt == 'ip':
def _out(ret):
for r in ret:
output(r[3].get('ip', r[1]))
elif ofmt == 'msg': elif ofmt == 'msg':
def _out(ret): def _out(ret):
for r in ret: for r in ret:

10
fail2ban/server/actions.py
View File

@ -497,7 +497,7 @@ class Actions(JailThread, Mapping):
bTicket = BanTicket.wrap(ticket) bTicket = BanTicket.wrap(ticket)
btime = ticket.getBanTime(self.banManager.getBanTime()) btime = ticket.getBanTime(self.banManager.getBanTime())
ip = bTicket.getIP() ip = bTicket.getID()
aInfo = self._getActionInfo(bTicket) aInfo = self._getActionInfo(bTicket)
reason = {} reason = {}
if self.banManager.addBanTicket(bTicket, reason=reason): if self.banManager.addBanTicket(bTicket, reason=reason):
@ -575,10 +575,10 @@ class Actions(JailThread, Mapping):
Ticket to reban Ticket to reban
""" """
actions = actions or self._actions actions = actions or self._actions
ip = ticket.getIP() ip = ticket.getID()
aInfo = self._getActionInfo(ticket) aInfo = self._getActionInfo(ticket)
if log: if log:
logSys.notice("[%s] Reban %s%s", self._jail.name, aInfo["ip"], (', action %r' % actions.keys()[0] if len(actions) == 1 else '')) logSys.notice("[%s] Reban %s%s", self._jail.name, ip, (', action %r' % actions.keys()[0] if len(actions) == 1 else ''))
for name, action in actions.iteritems(): for name, action in actions.iteritems():
try: try:
logSys.debug("[%s] action %r: reban %s", self._jail.name, name, ip) logSys.debug("[%s] action %r: reban %s", self._jail.name, name, ip)
@ -703,10 +703,10 @@ class Actions(JailThread, Mapping):
unbactions = self._actions unbactions = self._actions
else: else:
unbactions = actions unbactions = actions
ip = ticket.getIP() ip = ticket.getID()
aInfo = self._getActionInfo(ticket) aInfo = self._getActionInfo(ticket)
if log: if log:
logSys.notice("[%s] Unban %s", self._jail.name, aInfo["ip"]) logSys.notice("[%s] Unban %s", self._jail.name, ip)
for name, action in unbactions.iteritems(): for name, action in unbactions.iteritems():
try: try:
logSys.debug("[%s] action %r: unban %s", self._jail.name, name, ip) logSys.debug("[%s] action %r: unban %s", self._jail.name, name, ip)

2
fail2ban/server/database.py
View File

@ -599,7 +599,7 @@ class Fail2BanDb(object):
ticket : BanTicket ticket : BanTicket
Ticket of the ban to be added. Ticket of the ban to be added.
""" """
ip = str(ticket.getIP()) ip = str(ticket.getID())
try: try:
del self._bansMergedCache[(ip, jail)] del self._bansMergedCache[(ip, jail)]
except KeyError: except KeyError:

67
fail2ban/server/filter.py
View File

@ -553,7 +553,7 @@ class Filter(JailThread):
ticket = None ticket = None
if isinstance(ip, FailTicket): if isinstance(ip, FailTicket):
ticket = ip ticket = ip
ip = ticket.getIP() ip = ticket.getID()
elif not isinstance(ip, IPAddr): elif not isinstance(ip, IPAddr):
ip = IPAddr(ip) ip = IPAddr(ip)
return self._inIgnoreIPList(ip, ticket, log_ignore) return self._inIgnoreIPList(ip, ticket, log_ignore)
@ -702,10 +702,7 @@ class Filter(JailThread):
"""Processes the line for failures and populates failManager """Processes the line for failures and populates failManager
""" """
try: try:
for element in self.processLine(line, date): for (_, ip, unixTime, fail) in self.processLine(line, date):
ip = element[1]
unixTime = element[2]
fail = element[3]
logSys.debug("Processing line with time:%s and ip:%s", logSys.debug("Processing line with time:%s and ip:%s",
unixTime, ip) unixTime, ip)
# ensure the time is not in the future, e. g. by some estimated (assumed) time: # ensure the time is not in the future, e. g. by some estimated (assumed) time:
@ -841,11 +838,9 @@ class Filter(JailThread):
failList = list() failList = list()
ll = logSys.getEffectiveLevel() ll = logSys.getEffectiveLevel()
returnRawHost = self.returnRawHost defcidr = IPAddr.CIDR_UNSPEC
cidr = IPAddr.CIDR_UNSPEC if self.__useDns == "raw" or self.returnRawHost:
if self.__useDns == "raw": defcidr = IPAddr.CIDR_RAW
returnRawHost = True
cidr = IPAddr.CIDR_RAW
if self.__lineBufferSize > 1: if self.__lineBufferSize > 1:
self.__lineBuffer.append(tupleLine) self.__lineBuffer.append(tupleLine)
@ -908,7 +903,8 @@ class Filter(JailThread):
if not self.checkAllRegex or self.__lineBufferSize > 1: if not self.checkAllRegex or self.__lineBufferSize > 1:
self.__lineBuffer, buf = failRegex.getUnmatchedTupleLines(), None self.__lineBuffer, buf = failRegex.getUnmatchedTupleLines(), None
# merge data if multi-line failure: # merge data if multi-line failure:
raw = returnRawHost cidr = defcidr
raw = (defcidr == IPAddr.CIDR_RAW)
if preGroups: if preGroups:
currFail, fail = fail, preGroups.copy() currFail, fail = fail, preGroups.copy()
fail.update(currFail) fail.update(currFail)
@ -927,49 +923,50 @@ class Filter(JailThread):
# failure-id: # failure-id:
fid = fail.get('fid') fid = fail.get('fid')
# ip-address or host: # ip-address or host:
host = fail.get('ip4') ip = fail.get('ip4')
if host is not None: if ip is not None:
cidr = int(fail.get('cidr') or IPAddr.FAM_IPv4) cidr = int(fail.get('cidr') or IPAddr.FAM_IPv4)
raw = True raw = True
else: else:
host = fail.get('ip6') ip = fail.get('ip6')
if host is not None: if ip is not None:
cidr = int(fail.get('cidr') or IPAddr.FAM_IPv6) cidr = int(fail.get('cidr') or IPAddr.FAM_IPv6)
raw = True raw = True
if host is None: else:
host = fail.get('dns') ip = fail.get('dns')
if host is None: if ip is None:
# first try to check we have mlfid case (cache connection id): # first try to check we have mlfid case (cache connection id):
if fid is None and mlfid is None: if fid is None and mlfid is None:
# if no failure-id also (obscure case, wrong regex), throw error inside getFailID: # if no failure-id also (obscure case, wrong regex), throw error inside getFailID:
fid = failRegex.getFailID() fid = failRegex.getFailID()
host = fid ip = fid
cidr = IPAddr.CIDR_RAW raw = True
raw = True
# if mlfid case (not failure): # if mlfid case (not failure):
if host is None: if ip is None:
if ll <= 7: logSys.log(7, "No failure-id by mlfid %r in regex %s: %s", if ll <= 7: logSys.log(7, "No failure-id by mlfid %r in regex %s: %s",
mlfid, failRegexIndex, fail.get('mlfforget', "waiting for identifier")) mlfid, failRegexIndex, fail.get('mlfforget', "waiting for identifier"))
fail['mlfpending'] = 1; # mark failure is pending fail['mlfpending'] = 1; # mark failure is pending
if not self.checkAllRegex and self.ignorePending: return failList if not self.checkAllRegex and self.ignorePending: return failList
ips = [None] fids = [None]
# if raw - add single ip or failure-id, # if raw - add single ip or failure-id,
# otherwise expand host to multiple ips using dns (or ignore it if not valid): # otherwise expand host to multiple ips using dns (or ignore it if not valid):
elif raw: elif raw:
ip = IPAddr(host, cidr) # check ip/host equal failure-id, if not - failure with complex id:
# check host equal failure-id, if not - failure with complex id: if fid is None or fid == ip:
if fid is not None and fid != host: fid = IPAddr(ip, cidr)
ip = IPAddr(fid, IPAddr.CIDR_RAW) else:
ips = [ip] fail['ip'] = IPAddr(ip, cidr)
fid = IPAddr(fid, defcidr)
fids = [fid]
# otherwise, try to use dns conversion: # otherwise, try to use dns conversion:
else: else:
ips = DNSUtils.textToIp(host, self.__useDns) fids = DNSUtils.textToIp(ip, self.__useDns)
# if checkAllRegex we must make a copy (to be sure next RE doesn't change merged/cached failure): # if checkAllRegex we must make a copy (to be sure next RE doesn't change merged/cached failure):
if self.checkAllRegex and mlfid is not None: if self.checkAllRegex and mlfid is not None:
fail = fail.copy() fail = fail.copy()
# append failure with match to the list: # append failure with match to the list:
for ip in ips: for fid in fids:
failList.append([failRegexIndex, ip, date, fail]) failList.append([failRegexIndex, fid, date, fail])
if not self.checkAllRegex: if not self.checkAllRegex:
break break
except RegexException as e: # pragma: no cover - unsure if reachable except RegexException as e: # pragma: no cover - unsure if reachable

2
fail2ban/server/ipdns.py
View File

@ -257,6 +257,8 @@ class IPAddr(object):
FAM_IPv6 = CIDR_RAW - socket.AF_INET6 FAM_IPv6 = CIDR_RAW - socket.AF_INET6
def __new__(cls, ipstr, cidr=CIDR_UNSPEC): def __new__(cls, ipstr, cidr=CIDR_UNSPEC):
if cidr == IPAddr.CIDR_UNSPEC and isinstance(ipstr, (tuple, list)):
cidr = IPAddr.CIDR_RAW
if cidr == IPAddr.CIDR_RAW: # don't cache raw if cidr == IPAddr.CIDR_RAW: # don't cache raw
ip = super(IPAddr, cls).__new__(cls) ip = super(IPAddr, cls).__new__(cls)
ip.__init(ipstr, cidr) ip.__init(ipstr, cidr)

8
fail2ban/server/observer.py
View File

@ -372,7 +372,7 @@ class ObserverThread(JailThread):
# check jail active : # check jail active :
if not jail.isAlive() or not jail.getBanTimeExtra("increment"): if not jail.isAlive() or not jail.getBanTimeExtra("increment"):
return return
ip = ticket.getIP() ip = ticket.getID()
unixTime = ticket.getTime() unixTime = ticket.getTime()
logSys.debug("[%s] Observer: failure found %s", jail.name, ip) logSys.debug("[%s] Observer: failure found %s", jail.name, ip)
# increase retry count for known (bad) ip, corresponding banCount of it (one try will count than 2, 3, 5, 9 ...) : # increase retry count for known (bad) ip, corresponding banCount of it (one try will count than 2, 3, 5, 9 ...) :
@ -435,7 +435,7 @@ class ObserverThread(JailThread):
if not jail.isAlive() or not jail.database: if not jail.isAlive() or not jail.database:
return banTime return banTime
be = jail.getBanTimeExtra() be = jail.getBanTimeExtra()
ip = ticket.getIP() ip = ticket.getID()
orgBanTime = banTime orgBanTime = banTime
# check ip was already banned (increment time of ban): # check ip was already banned (increment time of ban):
try: try:
@ -474,7 +474,7 @@ class ObserverThread(JailThread):
return return
try: try:
oldbtime = btime oldbtime = btime
ip = ticket.getIP() ip = ticket.getID()
logSys.debug("[%s] Observer: ban found %s, %s", jail.name, ip, btime) logSys.debug("[%s] Observer: ban found %s, %s", jail.name, ip, btime)
# if not permanent and ban time was not set - check time should be increased: # if not permanent and ban time was not set - check time should be increased:
if btime != -1 and ticket.getBanTime() is None: if btime != -1 and ticket.getBanTime() is None:
@ -514,7 +514,7 @@ class ObserverThread(JailThread):
""" """
try: try:
btime = ticket.getBanTime() btime = ticket.getBanTime()
ip = ticket.getIP() ip = ticket.getID()
logSys.debug("[%s] Observer: prolong %s, %s", jail.name, ip, btime) logSys.debug("[%s] Observer: prolong %s, %s", jail.name, ip, btime)
# prolong ticket via actions that expected this: # prolong ticket via actions that expected this:
jail.actions._prolongBan(ticket) jail.actions._prolongBan(ticket)

17
fail2ban/server/ticket.py
View File

@ -33,7 +33,7 @@ logSys = getLogger(__name__)
class Ticket(object): class Ticket(object):
__slots__ = ('_ip', '_flags', '_banCount', '_banTime', '_time', '_data', '_retry', '_lastReset') __slots__ = ('_id', '_flags', '_banCount', '_banTime', '_time', '_data', '_retry', '_lastReset')
MAX_TIME = 0X7FFFFFFFFFFF ;# 4461763-th year MAX_TIME = 0X7FFFFFFFFFFF ;# 4461763-th year
@ -48,7 +48,7 @@ class Ticket(object):
@param matches (log) lines caused the ticket @param matches (log) lines caused the ticket
""" """
self.setIP(ip) self.setID(ip)
self._flags = 0; self._flags = 0;
self._banCount = 0; self._banCount = 0;
self._banTime = None; self._banTime = None;
@ -65,7 +65,7 @@ class Ticket(object):
def __str__(self): def __str__(self):
return "%s: ip=%s time=%s bantime=%s bancount=%s #attempts=%d matches=%r" % \ return "%s: ip=%s time=%s bantime=%s bancount=%s #attempts=%d matches=%r" % \
(self.__class__.__name__.split('.')[-1], self._ip, self._time, (self.__class__.__name__.split('.')[-1], self._id, self._time,
self._banTime, self._banCount, self._banTime, self._banCount,
self._data['failures'], self._data.get('matches', [])) self._data['failures'], self._data.get('matches', []))
@ -74,7 +74,7 @@ class Ticket(object):
def __eq__(self, other): def __eq__(self, other):
try: try:
return self._ip == other._ip and \ return self._id == other._id and \
round(self._time, 2) == round(other._time, 2) and \ round(self._time, 2) == round(other._time, 2) and \
self._data == other._data self._data == other._data
except AttributeError: except AttributeError:
@ -86,18 +86,17 @@ class Ticket(object):
if v is not None: if v is not None:
setattr(self, n, v) setattr(self, n, v)
def setID(self, value):
def setIP(self, value):
# guarantee using IPAddr instead of unicode, str for the IP # guarantee using IPAddr instead of unicode, str for the IP
if isinstance(value, basestring): if isinstance(value, basestring):
value = IPAddr(value) value = IPAddr(value)
self._ip = value self._id = value
def getID(self): def getID(self):
return self._data.get('fid', self._ip) return self._id
def getIP(self): def getIP(self):
return self._ip return self._data.get('ip', self._id)
def setTime(self, value): def setTime(self, value):
self._time = value self._time = value

10
fail2ban/tests/banmanagertestcase.py
View File

@ -100,23 +100,23 @@ class AddFailure(unittest.TestCase):
self.assertFalse(self.__banManager._inBanList(ticket)) self.assertFalse(self.__banManager._inBanList(ticket))
def testBanTimeIncr(self): def testBanTimeIncr(self):
ticket = BanTicket(self.__ticket.getIP(), self.__ticket.getTime()) ticket = BanTicket(self.__ticket.getID(), self.__ticket.getTime())
## increase twice and at end permanent, check time/count increase: ## increase twice and at end permanent, check time/count increase:
c = 0 c = 0
for i in (1000, 2000, -1): for i in (1000, 2000, -1):
self.__banManager.addBanTicket(self.__ticket); c += 1 self.__banManager.addBanTicket(self.__ticket); c += 1
ticket.setBanTime(i) ticket.setBanTime(i)
self.assertFalse(self.__banManager.addBanTicket(ticket)); # no incr of c (already banned) self.assertFalse(self.__banManager.addBanTicket(ticket)); # no incr of c (already banned)
self.assertEqual(str(self.__banManager.getTicketByID(ticket.getIP())), self.assertEqual(str(self.__banManager.getTicketByID(ticket.getID())),
"BanTicket: ip=%s time=%s bantime=%s bancount=%s #attempts=0 matches=[]" % (ticket.getIP(), ticket.getTime(), i, c)) "BanTicket: ip=%s time=%s bantime=%s bancount=%s #attempts=0 matches=[]" % (ticket.getID(), ticket.getTime(), i, c))
## after permanent, it should remain permanent ban time (-1): ## after permanent, it should remain permanent ban time (-1):
self.__banManager.addBanTicket(self.__ticket); c += 1 self.__banManager.addBanTicket(self.__ticket); c += 1
ticket.setBanTime(-1) ticket.setBanTime(-1)
self.assertFalse(self.__banManager.addBanTicket(ticket)); # no incr of c (already banned) self.assertFalse(self.__banManager.addBanTicket(ticket)); # no incr of c (already banned)
ticket.setBanTime(1000) ticket.setBanTime(1000)
self.assertFalse(self.__banManager.addBanTicket(ticket)); # no incr of c (already banned) self.assertFalse(self.__banManager.addBanTicket(ticket)); # no incr of c (already banned)
self.assertEqual(str(self.__banManager.getTicketByID(ticket.getIP())), self.assertEqual(str(self.__banManager.getTicketByID(ticket.getID())),
"BanTicket: ip=%s time=%s bantime=%s bancount=%s #attempts=0 matches=[]" % (ticket.getIP(), ticket.getTime(), -1, c)) "BanTicket: ip=%s time=%s bantime=%s bancount=%s #attempts=0 matches=[]" % (ticket.getID(), ticket.getTime(), -1, c))
def testUnban(self): def testUnban(self):
btime = self.__banManager.getBanTime() btime = self.__banManager.getBanTime()

20
fail2ban/tests/databasetestcase.py
View File

@ -192,7 +192,7 @@ class DatabaseTest(LogCaptureTestCase):
ticket.setAttempt(3) ticket.setAttempt(3)
self.assertEqual(bans[0], ticket) self.assertEqual(bans[0], ticket)
# second ban found also: # second ban found also:
self.assertEqual(bans[1].getIP(), "1.2.3.8") self.assertEqual(bans[1].getID(), "1.2.3.8")
# updated ? # updated ?
self.assertEqual(self.db.updateDb(Fail2BanDb.__version__), Fail2BanDb.__version__) self.assertEqual(self.db.updateDb(Fail2BanDb.__version__), Fail2BanDb.__version__)
# check current bans (should find 2 tickets after upgrade): # check current bans (should find 2 tickets after upgrade):
@ -312,7 +312,7 @@ class DatabaseTest(LogCaptureTestCase):
for i, ticket in enumerate(tickets): for i, ticket in enumerate(tickets):
DefLogSys.debug('readtickets[%d]: %r', i, readtickets[i].getData()) DefLogSys.debug('readtickets[%d]: %r', i, readtickets[i].getData())
DefLogSys.debug(' == tickets[%d]: %r', i, ticket.getData()) DefLogSys.debug(' == tickets[%d]: %r', i, ticket.getData())
self.assertEqual(readtickets[i].getIP(), ticket.getIP()) self.assertEqual(readtickets[i].getID(), ticket.getID())
self.assertEqual(len(readtickets[i].getMatches()), len(ticket.getMatches())) self.assertEqual(len(readtickets[i].getMatches()), len(ticket.getMatches()))
self.pruneLog('[test-phase 2] simulate errors') self.pruneLog('[test-phase 2] simulate errors')
@ -354,10 +354,10 @@ class DatabaseTest(LogCaptureTestCase):
def testDelBan(self): def testDelBan(self):
tickets = self._testAdd3Bans() tickets = self._testAdd3Bans()
# delete single IP: # delete single IP:
self.db.delBan(self.jail, tickets[0].getIP()) self.db.delBan(self.jail, tickets[0].getID())
self.assertEqual(len(self.db.getBans(jail=self.jail)), 2) self.assertEqual(len(self.db.getBans(jail=self.jail)), 2)
# delete two IPs: # delete two IPs:
self.db.delBan(self.jail, tickets[1].getIP(), tickets[2].getIP()) self.db.delBan(self.jail, tickets[1].getID(), tickets[2].getID())
self.assertEqual(len(self.db.getBans(jail=self.jail)), 0) self.assertEqual(len(self.db.getBans(jail=self.jail)), 0)
def testFlushBans(self): def testFlushBans(self):
@ -398,7 +398,7 @@ class DatabaseTest(LogCaptureTestCase):
# should retrieve 2 matches only, but count of all attempts: # should retrieve 2 matches only, but count of all attempts:
self.db.maxMatches = maxMatches; self.db.maxMatches = maxMatches;
ticket = self.db.getBansMerged("127.0.0.1") ticket = self.db.getBansMerged("127.0.0.1")
self.assertEqual(ticket.getIP(), "127.0.0.1") self.assertEqual(ticket.getID(), "127.0.0.1")
self.assertEqual(ticket.getAttempt(), len(failures)) self.assertEqual(ticket.getAttempt(), len(failures))
self.assertEqual(len(ticket.getMatches()), maxMatches) self.assertEqual(len(ticket.getMatches()), maxMatches)
self.assertEqual(ticket.getMatches(), matches2find[-maxMatches:]) self.assertEqual(ticket.getMatches(), matches2find[-maxMatches:])
@ -456,13 +456,13 @@ class DatabaseTest(LogCaptureTestCase):
# All for IP 127.0.0.1 # All for IP 127.0.0.1
ticket = self.db.getBansMerged("127.0.0.1") ticket = self.db.getBansMerged("127.0.0.1")
self.assertEqual(ticket.getIP(), "127.0.0.1") self.assertEqual(ticket.getID(), "127.0.0.1")
self.assertEqual(ticket.getAttempt(), 70) self.assertEqual(ticket.getAttempt(), 70)
self.assertEqual(ticket.getMatches(), ["abc\n", "123\n", "ABC\n"]) self.assertEqual(ticket.getMatches(), ["abc\n", "123\n", "ABC\n"])
# All for IP 127.0.0.1 for single jail # All for IP 127.0.0.1 for single jail
ticket = self.db.getBansMerged("127.0.0.1", jail=self.jail) ticket = self.db.getBansMerged("127.0.0.1", jail=self.jail)
self.assertEqual(ticket.getIP(), "127.0.0.1") self.assertEqual(ticket.getID(), "127.0.0.1")
self.assertEqual(ticket.getAttempt(), 30) self.assertEqual(ticket.getAttempt(), 30)
self.assertEqual(ticket.getMatches(), ["abc\n", "123\n"]) self.assertEqual(ticket.getMatches(), ["abc\n", "123\n"])
@ -490,8 +490,8 @@ class DatabaseTest(LogCaptureTestCase):
tickets = self.db.getBansMerged() tickets = self.db.getBansMerged()
self.assertEqual(len(tickets), 2) self.assertEqual(len(tickets), 2)
self.assertSortedEqual( self.assertSortedEqual(
list(set(ticket.getIP() for ticket in tickets)), list(set(ticket.getID() for ticket in tickets)),
[ticket.getIP() for ticket in tickets]) [ticket.getID() for ticket in tickets])
tickets = self.db.getBansMerged(jail=jail2) tickets = self.db.getBansMerged(jail=jail2)
self.assertEqual(len(tickets), 1) self.assertEqual(len(tickets), 1)
@ -510,7 +510,7 @@ class DatabaseTest(LogCaptureTestCase):
tickets = self.db.getCurrentBans(jail=self.jail) tickets = self.db.getCurrentBans(jail=self.jail)
self.assertEqual(len(tickets), 2) self.assertEqual(len(tickets), 2)
ticket = self.db.getCurrentBans(jail=None, ip="127.0.0.1"); ticket = self.db.getCurrentBans(jail=None, ip="127.0.0.1");
self.assertEqual(ticket.getIP(), "127.0.0.1") self.assertEqual(ticket.getID(), "127.0.0.1")
# positive case (1 ticket not yet expired): # positive case (1 ticket not yet expired):
tickets = self.db.getCurrentBans(jail=self.jail, forbantime=15, tickets = self.db.getCurrentBans(jail=self.jail, forbantime=15,

12
fail2ban/tests/fail2banregextestcase.py
View File

@ -372,6 +372,18 @@ class Fail2banRegexTest(LogCaptureTestCase):
r'^\s*<F-TUPLE_ID_1>\S+</F-TUPLE_ID_1> <F-ID><ADDR>:<F-PORT/></F-ID> <F-TUPLE_ID_2>\S+</F-TUPLE_ID_2>')) r'^\s*<F-TUPLE_ID_1>\S+</F-TUPLE_ID_1> <F-ID><ADDR>:<F-PORT/></F-ID> <F-TUPLE_ID_2>\S+</F-TUPLE_ID_2>'))
self.assertLogged(str(('[192.0.2.4]:12345', 'left', 'right'))) self.assertLogged(str(('[192.0.2.4]:12345', 'left', 'right')))
self.pruneLog() self.pruneLog()
# ip is not id anymore (if IP-address deviates from ID):
self.assertTrue(_test_exec('-o', 'ip',
'1591983743.667 left [192.0.2.4]:12345 right',
r'^\s*<F-TUPLE_ID_1>\S+</F-TUPLE_ID_1> <F-ID><ADDR>:<F-PORT/></F-ID> <F-TUPLE_ID_2>\S+</F-TUPLE_ID_2>'))
self.assertNotLogged(str(('[192.0.2.4]:12345', 'left', 'right')))
self.assertLogged('192.0.2.4')
self.pruneLog()
self.assertTrue(_test_exec('-o', 'ID:<fid> | IP:<ip>',
'1591983743.667 left [192.0.2.4]:12345 right',
r'^\s*<F-TUPLE_ID_1>\S+</F-TUPLE_ID_1> <F-ID><ADDR>:<F-PORT/></F-ID> <F-TUPLE_ID_2>\S+</F-TUPLE_ID_2>'))
self.assertLogged('ID:'+str(('[192.0.2.4]:12345', 'left', 'right'))+' | IP:192.0.2.4')
self.pruneLog()
# row with id : # row with id :
self.assertTrue(_test_exec('-o', 'row', STR_00, RE_00_ID)) self.assertTrue(_test_exec('-o', 'row', STR_00, RE_00_ID))
self.assertLogged("['kevin'", "'ip4': '192.0.2.0'", "'fid': 'kevin'", all=True) self.assertLogged("['kevin'", "'ip4': '192.0.2.0'", "'fid': 'kevin'", all=True)

8
fail2ban/tests/failmanagertestcase.py
View File

@ -150,8 +150,8 @@ class AddFailure(unittest.TestCase):
self.__failManager.setMaxRetry(5) self.__failManager.setMaxRetry(5)
#ticket = FailTicket('193.168.0.128', None) #ticket = FailTicket('193.168.0.128', None)
ticket = self.__failManager.toBan() ticket = self.__failManager.toBan()
self.assertEqual(ticket.getIP(), "193.168.0.128") self.assertEqual(ticket.getID(), "193.168.0.128")
self.assertTrue(isinstance(ticket.getIP(), (str, IPAddr))) self.assertTrue(isinstance(ticket.getID(), (str, IPAddr)))
# finish with rudimentary tests of the ticket # finish with rudimentary tests of the ticket
# verify consistent str # verify consistent str
@ -180,9 +180,9 @@ class AddFailure(unittest.TestCase):
def testWindow(self): def testWindow(self):
self._addDefItems() self._addDefItems()
ticket = self.__failManager.toBan() ticket = self.__failManager.toBan()
self.assertNotEqual(ticket.getIP(), "100.100.10.10") self.assertNotEqual(ticket.getID(), "100.100.10.10")
ticket = self.__failManager.toBan() ticket = self.__failManager.toBan()
self.assertNotEqual(ticket.getIP(), "100.100.10.10") self.assertNotEqual(ticket.getID(), "100.100.10.10")
self.assertRaises(FailManagerEmpty, self.__failManager.toBan) self.assertRaises(FailManagerEmpty, self.__failManager.toBan)
def testBgService(self): def testBgService(self):

6
fail2ban/tests/filtertestcase.py
View File

@ -141,7 +141,7 @@ def _ticket_tuple(ticket):
""" """
attempts = ticket.getAttempt() attempts = ticket.getAttempt()
date = ticket.getTime() date = ticket.getTime()
ip = ticket.getIP() ip = ticket.getID()
matches = ticket.getMatches() matches = ticket.getMatches()
return (ip, attempts, date, matches) return (ip, attempts, date, matches)
@ -1460,7 +1460,7 @@ def get_monitor_failures_journal_testcase(Filter_): # pragma: systemd no cover
self.assertTrue(ticket) self.assertTrue(ticket)
attempts = ticket.getAttempt() attempts = ticket.getAttempt()
ip = ticket.getIP() ip = ticket.getID()
ticket.getMatches() ticket.getMatches()
self.assertEqual(ip, test_ip) self.assertEqual(ip, test_ip)
@ -1646,7 +1646,7 @@ def get_monitor_failures_journal_testcase(Filter_): # pragma: systemd no cover
self.waitForTicks(1) self.waitForTicks(1)
self.waitFailTotal(6, 10) self.waitFailTotal(6, 10)
self.assertTrue(Utils.wait_for(lambda: len(self.jail) == 2, 10)) self.assertTrue(Utils.wait_for(lambda: len(self.jail) == 2, 10))
self.assertSortedEqual([self.jail.getFailTicket().getIP(), self.jail.getFailTicket().getIP()], self.assertSortedEqual([self.jail.getFailTicket().getID(), self.jail.getFailTicket().getID()],
["192.0.2.1", "192.0.2.2"]) ["192.0.2.1", "192.0.2.2"])
cls = MonitorJournalFailures cls = MonitorJournalFailures

4
fail2ban/tests/observertestcase.py
View File

@ -367,14 +367,14 @@ class BanTimeIncrDB(LogCaptureTestCase):
# this old ticket should be removed now: # this old ticket should be removed now:
restored_tickets = self.db.getCurrentBans(fromtime=stime, correctBanTime=False) restored_tickets = self.db.getCurrentBans(fromtime=stime, correctBanTime=False)
self.assertEqual(len(restored_tickets), 2) self.assertEqual(len(restored_tickets), 2)
self.assertEqual(restored_tickets[0].getIP(), ip) self.assertEqual(restored_tickets[0].getID(), ip)
# purge remove 1st ip # purge remove 1st ip
self.db._purgeAge = -48*60*60 self.db._purgeAge = -48*60*60
self.db.purge() self.db.purge()
restored_tickets = self.db.getCurrentBans(fromtime=stime, correctBanTime=False) restored_tickets = self.db.getCurrentBans(fromtime=stime, correctBanTime=False)
self.assertEqual(len(restored_tickets), 1) self.assertEqual(len(restored_tickets), 1)
self.assertEqual(restored_tickets[0].getIP(), ip+'1') self.assertEqual(restored_tickets[0].getID(), ip+'1')
# this should purge all bans, bips and logs - nothing should be found now # this should purge all bans, bips and logs - nothing should be found now
self.db._purgeAge = -240*60*60 self.db._purgeAge = -240*60*60

2
fail2ban/tests/tickettestcase.py
View File

@ -39,6 +39,7 @@ class TicketTests(unittest.TestCase):
# Ticket # Ticket
t = Ticket('193.168.0.128', tm, matches) t = Ticket('193.168.0.128', tm, matches)
self.assertEqual(t.getID(), '193.168.0.128')
self.assertEqual(t.getIP(), '193.168.0.128') self.assertEqual(t.getIP(), '193.168.0.128')
self.assertEqual(t.getTime(), tm) self.assertEqual(t.getTime(), tm)
self.assertEqual(t.getMatches(), matches2) self.assertEqual(t.getMatches(), matches2)
@ -65,6 +66,7 @@ class TicketTests(unittest.TestCase):
matches = ['first', 'second'] matches = ['first', 'second']
ft = FailTicket('193.168.0.128', tm, matches) ft = FailTicket('193.168.0.128', tm, matches)
ft.setBanTime(60*60) ft.setBanTime(60*60)
self.assertEqual(ft.getID(), '193.168.0.128')
self.assertEqual(ft.getIP(), '193.168.0.128') self.assertEqual(ft.getIP(), '193.168.0.128')
self.assertEqual(ft.getTime(), tm) self.assertEqual(ft.getTime(), tm)
self.assertEqual(ft.getMatches(), matches2) self.assertEqual(ft.getMatches(), matches2)