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

Merge pull request #472 from grooverdan/banip-ignoreconflict 

ENH: banning an IP in the ignoreIPList now issues warning to log, but still does the ban
pull/478/head
Daniel Black 2013-12-05 12:45:13 -08:00
parent 51f2619878 e108de3f6d
commit 4780451883
1 changed files with 3 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
server/filter.py
View File

@ -219,6 +219,9 @@ class Filter(JailThread):
# to enable banip fail2ban-client BAN command # to enable banip fail2ban-client BAN command
def addBannedIP(self, ip): def addBannedIP(self, ip):
if self.inIgnoreIPList(ip):
logSys.warning('Requested to manually ban an ignored IP ' + ip + '. User knows best. Proceeding to ban it.')
unixTime = MyTime.time() unixTime = MyTime.time()
for i in xrange(self.failManager.getMaxRetry()): for i in xrange(self.failManager.getMaxRetry()):
self.failManager.addFailure(FailTicket(ip, unixTime)) self.failManager.addFailure(FailTicket(ip, unixTime))