diff --git a/CHANGELOG b/CHANGELOG index 2c3d5ef5..ff01e993 100644 --- a/CHANGELOG +++ b/CHANGELOG @@ -12,6 +12,7 @@ ver. 0.9.0 (2007/??/??) - alpha - Removed Python 2.4 code. Need more testing - Made interactive mode optional in fail2ban-client - Fixed vulnerability in sshd.conf. Thanks to Daniel B. Cid +- Expand in ignoreregex. Thanks to Yaroslav Halchenko ver. 0.8.0 (2007/05/03) - stable ---------- diff --git a/server/failregex.py b/server/failregex.py index 275380b9..9889ca67 100644 --- a/server/failregex.py +++ b/server/failregex.py @@ -40,9 +40,7 @@ class FailRegex(Regex): # avoid construction of invalid object. # @param value the regular expression - def __init__(self, value): - # Replace "" with default regular expression for host. - regex = value.replace("", "(?:::f{4,6}:)?(?P\S+)") + def __init__(self, regex): # Initializes the parent. Regex.__init__(self, regex) # Check for group "host" diff --git a/server/regex.py b/server/regex.py index d3d6eee4..e7f64e5a 100644 --- a/server/regex.py +++ b/server/regex.py @@ -42,6 +42,9 @@ class Regex: def __init__(self, regex): self._matchCache = None + # Perform shortcuts expansions + # Replace "" with default regular expression for host. + regex = regex.replace("", "(?:::f{4,6}:)?(?P\S+)") if regex.lstrip() == '': raise RegexException("Cannot add empty regex") try: