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

amend to #2351: providing the attempt via fail2bans protocol (Pickle, client command, etc) must follow ignore facilities (shall be ignored if matches ignoreip, ignoreself, ignorecommand etc)

pull/2852/merge
sebres 2025-08-26 18:03:46 +02:00
parent c9e1a1b087
commit 52399e6ef1
2 changed files with 11 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
fail2ban/server/filter.py
View File

@ -475,6 +475,10 @@ class Filter(JailThread):
# Generate the failure attempt for the IP: # Generate the failure attempt for the IP:
unixTime = MyTime.time() unixTime = MyTime.time()
ticket = FailTicket(ip, unixTime, matches=matches) ticket = FailTicket(ip, unixTime, matches=matches)
# check it shall be ignored:
if self._inIgnoreIPList(ip, ticket):
return 0
# add attempt (found failure):
logSys.info( logSys.info(
"[%s] Attempt %s - %s", self.jailName, ip, datetime.datetime.fromtimestamp(unixTime).strftime("%Y-%m-%d %H:%M:%S") "[%s] Attempt %s - %s", self.jailName, ip, datetime.datetime.fromtimestamp(unixTime).strftime("%Y-%m-%d %H:%M:%S")
) )
@ -485,7 +489,6 @@ class Filter(JailThread):
# report to observer - failure was found, for possibly increasing of it retry counter (asynchronous) # report to observer - failure was found, for possibly increasing of it retry counter (asynchronous)
if Observers.Main is not None: if Observers.Main is not None:
Observers.Main.add('failureFound', self.jail, ticket) Observers.Main.add('failureFound', self.jail, ticket)
return 1 return 1
## ##

7
fail2ban/tests/servertestcase.py
View File

@ -393,6 +393,13 @@ class Transmitter(TransmitterBase):
# resulted to ban for "192.0.2.2" but not for "192.0.2.1": # resulted to ban for "192.0.2.2" but not for "192.0.2.1":
self.assertLogged("Ban 192.0.2.2", wait=True) self.assertLogged("Ban 192.0.2.2", wait=True)
self.assertNotLogged("Ban 192.0.2.1") self.assertNotLogged("Ban 192.0.2.1")
# check attempt will be ignored by ignore facilities:
ip = "192.0.2.1"
self.transm.proceed(["set", self.jailName, "addignoreip", ip])
self.assertLogged("Add %r to ignore list" % (ip,), wait=True)
self.assertEqual(attempt(ip, ["test failure %d" % i for i in (3,4,5)]), (0, 0))
self.assertLogged("Ignore %s by ip" % (ip,), wait=True)
self.assertNotLogged("Ban 192.0.2.1")
@with_alt_time @with_alt_time
def testJailBanList(self): def testJailBanList(self):