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

RF: use descriptive loop variable (oldticket) and matching associated variable suffixes (old)

f2b-perfom-prepare-716
Yaroslav Halchenko 2015-07-16 17:22:36 -04:00 committed by sebres
parent 454de867e7
commit 24a1e8e605
1 changed files with 7 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
fail2ban/server/banmanager.py
View File

@ -263,19 +263,19 @@ class BanManager:
try: try:
self.__lock.acquire() self.__lock.acquire()
# check already banned # check already banned
for i in self.__banList: for oldticket in self.__banList:
if ticket.getIP() == i.getIP(): if ticket.getIP() == oldticket.getIP():
# if already permanent # if already permanent
btorg, torg = i.getBanTime(self.__banTime), i.getTime() btold, told = oldticket.getBanTime(self.__banTime), oldticket.getTime()
if btorg == -1: if btold == -1:
return False return False
# if given time is less than already banned time # if given time is less than already banned time
btnew, tnew = ticket.getBanTime(self.__banTime), ticket.getTime() btnew, tnew = ticket.getBanTime(self.__banTime), ticket.getTime()
if btnew != -1 and tnew + btnew <= torg + btorg: if btnew != -1 and tnew + btnew <= told + btold:
return False return False
# we have longest ban - set new (increment) ban time # we have longest ban - set new (increment) ban time
i.setTime(tnew) oldticket.setTime(tnew)
i.setBanTime(btnew) oldticket.setBanTime(btnew)
return False return False
# not yet banned - add new # not yet banned - add new
self.__banList.append(ticket) self.__banList.append(ticket)