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

- Corrected log level 

- Dict iteration improved


git-svn-id: https://fail2ban.svn.sourceforge.net/svnroot/fail2ban/trunk@79 a942ae1a-1317-0410-a47c-b1dcaea8d605
0.6
Cyril Jaquier 2005-03-06 17:46:56 +00:00
parent ad93288bd8
commit f6b9749650
1 changed files with 7 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
firewall/firewall.py
View File

@ -42,21 +42,21 @@ class Firewall:
""" Bans an IP. """ Bans an IP.
""" """
if not self.inBanList(ip): if not self.inBanList(ip):
self.logSys.info("Ban "+ip) self.logSys.warn("Ban "+ip)
self.banList[ip] = time.time() self.banList[ip] = time.time()
self.__executeCmd(self.banIP(ip), debug) self.__executeCmd(self.banIP(ip), debug)
else: else:
self.logSys.info(ip+" already in ban list") self.logSys.error(ip+" already in ban list")
def delBanIP(self, ip, debug): def delBanIP(self, ip, debug):
""" Unban an IP. """ Unban an IP.
""" """
if self.inBanList(ip): if self.inBanList(ip):
self.logSys.info("Unban "+ip) self.logSys.warn("Unban "+ip)
del self.banList[ip] del self.banList[ip]
self.__executeCmd(self.unBanIP(ip), debug) self.__executeCmd(self.unBanIP(ip), debug)
else: else:
self.logSys.info(ip+" not in ban list") self.logSys.error(ip+" not in ban list")
def inBanList(self, ip): def inBanList(self, ip):
""" Checks if IP is in ban list. """ Checks if IP is in ban list.
@ -67,9 +67,7 @@ class Firewall:
""" Check for IP to remove from ban list. """ Check for IP to remove from ban list.
""" """
banListTemp = self.banList.copy() banListTemp = self.banList.copy()
iterBanList = banListTemp.iteritems() for element in banListTemp.iteritems():
for i in range(len(self.banList)):
element = iterBanList.next()
ip = element[0] ip = element[0]
btime = element[1] btime = element[1]
if btime < time.time()-self.banTime: if btime < time.time()-self.banTime:
@ -80,9 +78,7 @@ class Firewall:
Called when fail2ban exits. Called when fail2ban exits.
""" """
banListTemp = self.banList.copy() banListTemp = self.banList.copy()
iterBanList = banListTemp.iteritems() for element in banListTemp.iteritems():
for i in range(len(self.banList)):
element = iterBanList.next()
ip = element[0] ip = element[0]
self.delBanIP(ip, debug) self.delBanIP(ip, debug)
@ -98,7 +94,5 @@ class Firewall:
def viewBanList(self): def viewBanList(self):
""" Prints the ban list on screen. Usefull for debugging. """ Prints the ban list on screen. Usefull for debugging.
""" """
iterBanList = self.banList.iteritems() for element in self.banList.iteritems():
for i in range(len(self.banList)):
element = iterBanList.next()
print element print element