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

bug fix (in master): option 'dbpurgeage' was never set (default always) by start of fail2ban, because of invalid sorting of options ('dbfile' should be always set before other database options) / python3 compatibility fix

pull/716/head
sebres 2014-10-20 01:01:31 +02:00
parent 1ba48f8627
commit f1d8272693
1 changed files with 5 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
fail2ban/client/fail2banreader.py
View File

@ -52,16 +52,12 @@ class Fail2banReader(ConfigWrapper):
self.__opts = ConfigWrapper.getOptions(self, "Definition", opts)
def convert(self):
order = {"loglevel":0, "logtarget":1, "dbfile":2, "dbpurgeage":3}
stream = list()
for opt in self.__opts:
if opt == "loglevel":
stream.append(["set", "loglevel", self.__opts[opt]])
elif opt == "logtarget":
stream.append(["set", "logtarget", self.__opts[opt]])
elif opt == "dbfile":
stream.append(["set", "dbfile", self.__opts[opt]])
elif opt == "dbpurgeage":
stream.append(["set", "dbpurgeage", self.__opts[opt]])
if opt in order:
stream.append((order[opt], ["set", opt, self.__opts[opt]]))
# Ensure logtarget/level set first so any db errors are captured
return sorted(stream, reverse=True)
# and dbfile set before all other database options
return [opt[1] for opt in sorted(stream)]