From 0e61b7586a5e8ca4bb769e14066af403d55d5bd0 Mon Sep 17 00:00:00 2001 From: Yaroslav Halchenko Date: Thu, 16 Jul 2015 17:22:36 -0400 Subject: [PATCH] RF: use descriptive loop variable (oldticket) and matching associated variable suffixes (old) --- fail2ban/server/banmanager.py | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/fail2ban/server/banmanager.py b/fail2ban/server/banmanager.py index a958a5c8..0ee028ef 100644 --- a/fail2ban/server/banmanager.py +++ b/fail2ban/server/banmanager.py @@ -263,19 +263,19 @@ class BanManager: try: self.__lock.acquire() # check already banned - for i in self.__banList: - if ticket.getIP() == i.getIP(): + for oldticket in self.__banList: + if ticket.getIP() == oldticket.getIP(): # if already permanent - btorg, torg = i.getBanTime(self.__banTime), i.getTime() - if btorg == -1: + btold, told = oldticket.getBanTime(self.__banTime), oldticket.getTime() + if btold == -1: return False # if given time is less than already banned time 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 # we have longest ban - set new (increment) ban time - i.setTime(tnew) - i.setBanTime(btnew) + oldticket.setTime(tnew) + oldticket.setBanTime(btnew) return False # not yet banned - add new self.__banList.append(ticket)