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

fixes

pull/401/head
hazg 2013-10-21 15:32:34 +04:00
parent 6cfce7345a
commit 3114fed8d1
1 changed files with 4 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
server/filter.py
View File

@ -215,15 +215,15 @@ class Filter(JailThread):
## ##
# Set external command, for ignoredips # Set external command, for ignoredips
# hazg@mail.ru
# #
def setIgnoreCommand(self, command): def setIgnoreCommand(self, command):
self.__ignoreCommand = command self.__ignoreCommand = command
## ##
# Get external command, for ignoredips # Get external command, for ignoredips
# hazg@mail.ru
# #
def getIgnoreCommand(self): def getIgnoreCommand(self):
return self.__ignoreCommand return self.__ignoreCommand
@ -264,11 +264,11 @@ class Filter(JailThread):
self.__ignoreIpList.remove(ip) self.__ignoreIpList.remove(ip)
def getIgnoreIP(self): def getIgnoreIP(self):
#logSys.info(self.jail.opts)
if self.__ignoreCommand is not False: if self.__ignoreCommand is not False:
return self.__ignoreIpList + os.popen(self.__ignoreCommand).read().split(" ") return self.__ignoreIpList + os.popen(self.__ignoreCommand).read().split(" ")
else: else:
return self.__ignoreIpList return self.__ignoreIpList
## ##
# Check if IP address/DNS is in the ignore list. # Check if IP address/DNS is in the ignore list.
# #
@ -276,6 +276,7 @@ class Filter(JailThread):
# mask in the ignore list. # mask in the ignore list.
# @param ip IP address # @param ip IP address
# @return True if IP address is in ignore list # @return True if IP address is in ignore list
def inIgnoreIPList(self, ip): def inIgnoreIPList(self, ip):
for i in self.__ignoreIpList: for i in self.__ignoreIpList:
# An empty string is always false # An empty string is always false