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

fix #1 for Cyrils adjustments

debian-releases/etch
Yaroslav Halchenko 2005-10-14 15:51:04 +00:00
parent 91df9c7526
commit f3da148d0f
2 changed files with 15 additions and 26 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
fail2ban.py
View File

@ -112,17 +112,16 @@ def restoreFwRules():
""" Flush the ban list """ Flush the ban list
""" """
logSys.warn("Restoring firewall rules...") logSys.warn("Restoring firewall rules...")
for element in logFwList: try:
try: for element in logFwList:
# Execute end command of each section
element[2].flushBanList(conf["debug"]) element[2].flushBanList(conf["debug"])
except ExternalError: element[2].restore(conf["debug"])
# nothing bad really - we can survive :-) # Execute global end command
pass executeCmd(conf["cmdend"], conf["debug"])
# Execute end command of each section except ExternalError:
for element in logFwList: # nothing bad really - we can survive :-)
element[2].restore(conf["debug"]) pass
# Execute global end command
executeCmd(conf["cmdend"], conf["debug"])
def killApp(): def killApp():
""" Flush the ban list, remove the PID lock file and exit """ Flush the ban list, remove the PID lock file and exit
@ -393,7 +392,8 @@ def main():
lObj = LogReader(l["logfile"], l["timeregex"], l["timepattern"], lObj = LogReader(l["logfile"], l["timeregex"], l["timepattern"],
l["failregex"], l["maxfailures"], l["findtime"]) l["failregex"], l["maxfailures"], l["findtime"])
# Creates a firewall object # Creates a firewall object
fObj = Firewall(l["fwban"], l["fwunban"], l["fwcheck"], l["bantime"]) fObj = Firewall(l["fwstart"], l["fwend"],
l["fwban"], l["fwunban"], l["fwcheck"], l["bantime"])
# Links them into a list. I'm not really happy # Links them into a list. I'm not really happy
# with this :/ # with this :/
logFwList.append([t, lObj, fObj, dict()]) logFwList.append([t, lObj, fObj, dict()])

19
firewall/firewall.py
View File

@ -37,27 +37,16 @@ class Firewall:
the IP. the IP.
""" """
def __init__(self, banRule, unBanRule, checkRule, banTime): def __init__(self, startRule, endRule,
banRule, unBanRule, checkRule, banTime):
self.banRule = banRule self.banRule = banRule
self.unBanRule = unBanRule self.unBanRule = unBanRule
self.checkRule = checkRule self.checkRule = checkRule
self.startRule = "" self.startRule = startRule
self.endRule = "" self.endRule = endRule
self.banTime = banTime self.banTime = banTime
self.banList = dict() self.banList = dict()
def setStartRule(self, cmd):
self.startRule = cmd
def getStartRule(self):
return self.startRule
def setEndRule(self, cmd):
self.endRule = cmd
def getEndRule(self):
return self.endRule
def initialize(self, debug): def initialize(self, debug):
logSys.debug("Initialize firewall rules") logSys.debug("Initialize firewall rules")
executeCmd(self.startRule, debug) executeCmd(self.startRule, debug)