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

normalize bool conversion, introduced common helper function `_as_bool`

pull/2133/head
sebres 2018-04-26 16:48:23 +02:00
parent 60b36c4213
commit 1b4ba602ba
3 changed files with 11 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
fail2ban/client/configreader.py
View File

@ -29,7 +29,7 @@ import os
from ConfigParser import NoOptionError, NoSectionError from ConfigParser import NoOptionError, NoSectionError
from .configparserinc import sys, SafeConfigParserWithIncludes, logLevel from .configparserinc import sys, SafeConfigParserWithIncludes, logLevel
from ..helpers import getLogger, _merge_dicts, substituteRecursiveTags from ..helpers import getLogger, _as_bool, _merge_dicts, substituteRecursiveTags
# Gets the instance of the logger. # Gets the instance of the logger.
logSys = getLogger(__name__) logSys = getLogger(__name__)
@ -339,7 +339,7 @@ class DefinitionInitConfigReader(ConfigReader):
def _convert_to_boolean(self, value): def _convert_to_boolean(self, value):
return value.lower() in ("1", "yes", "true", "on") return _as_bool(value)
def getCombOption(self, optname): def getCombOption(self, optname):
"""Get combined definition option (as string) using pre-set and init """Get combined definition option (as string) using pre-set and init

4
fail2ban/helpers.py
View File

@ -244,6 +244,10 @@ else:
return uni_decode(x, enc, 'replace') return uni_decode(x, enc, 'replace')
def _as_bool(val):
return bool(val) if not isinstance(val, basestring) \
else val.lower() in ('1', 'on', 'true', 'yes')
# #
# Following function used for parse options from parameter (e.g. `name[p1=0, p2="..."][p3='...']`). # Following function used for parse options from parameter (e.g. `name[p1=0, p2="..."][p3='...']`).
# #

9
fail2ban/server/server.py
View File

@ -37,7 +37,8 @@ from .filter import FileFilter, JournalFilter
from .transmitter import Transmitter from .transmitter import Transmitter
from .asyncserver import AsyncServer, AsyncServerException from .asyncserver import AsyncServer, AsyncServerException
from .. import version from .. import version
from ..helpers import getLogger, extractOptions, str2LogLevel, getVerbosityFormat, excepthook from ..helpers import getLogger, _as_bool, extractOptions, str2LogLevel, \
getVerbosityFormat, excepthook
# Gets the instance of the logger. # Gets the instance of the logger.
logSys = getLogger(__name__) logSys = getLogger(__name__)
@ -313,7 +314,7 @@ class Server:
# Filter # Filter
def setIgnoreSelf(self, name, value): def setIgnoreSelf(self, name, value):
self.__jails[name].filter.ignoreSelf = value self.__jails[name].filter.ignoreSelf = _as_bool(value)
def getIgnoreSelf(self, name): def getIgnoreSelf(self, name):
return self.__jails[name].filter.ignoreSelf return self.__jails[name].filter.ignoreSelf
@ -628,11 +629,11 @@ class Server:
# If handler don't already add date to the message: # If handler don't already add date to the message:
addtime = logOptions.get('datetime') addtime = logOptions.get('datetime')
if addtime is not None: if addtime is not None:
addtime = addtime in ('1', 'on', 'true', 'yes') addtime = _as_bool(addtime)
else: else:
addtime = systarget not in ("SYSLOG", "SYSOUT") addtime = systarget not in ("SYSLOG", "SYSOUT")
if padding is not None: if padding is not None:
padding = padding in ('1', 'on', 'true', 'yes') padding = _as_bool(padding)
else: else:
padding = True padding = True
# If log-format is redefined in options: # If log-format is redefined in options: