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

ENH: <HOST> must end with alphanumeric \w (not a dot or a dash etc) 

Otherwise <HOST> regexp might swallow period in the sentence right after the address.
I have decided to enforce alphanumeric instead of switching to non-greedy +? ... because
I think it is closer to what we actually want here
pull/283/head
Yaroslav Halchenko 2013-07-16 14:39:42 -04:00
parent 8add63c733
commit 0a02cfe9e8
2 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
server/failregex.py
View File

@ -41,7 +41,7 @@ class Regex:
self._matchCache = None self._matchCache = None
# Perform shortcuts expansions. # Perform shortcuts expansions.
# Replace "<HOST>" with default regular expression for host. # Replace "<HOST>" with default regular expression for host.
regex = regex.replace("<HOST>", "(?:::f{4,6}:)?(?P<host>[\w\-.^_]+)") regex = regex.replace("<HOST>", "(?:::f{4,6}:)?(?P<host>[\w\-.^_]*\w)")
if regex.lstrip() == '': if regex.lstrip() == '':
raise RegexException("Cannot add empty regex") raise RegexException("Cannot add empty regex")
try: try:

8
testcases/servertestcase.py
View File

@ -334,9 +334,9 @@ class Transmitter(TransmitterBase):
"failed attempt from <HOST> again", "failed attempt from <HOST> again",
], ],
[ [
"user john at (?:::f{4,6}:)?(?P<host>[\w\-.^_]+)", "user john at (?:::f{4,6}:)?(?P<host>[\w\-.^_]*\\w)",
"Admin user login from (?:::f{4,6}:)?(?P<host>[\w\-.^_]+)", "Admin user login from (?:::f{4,6}:)?(?P<host>[\w\-.^_]*\\w)",
"failed attempt from (?:::f{4,6}:)?(?P<host>[\w\-.^_]+) again", "failed attempt from (?:::f{4,6}:)?(?P<host>[\w\-.^_]*\\w) again",
], ],
self.jailName self.jailName
) )
@ -359,7 +359,7 @@ class Transmitter(TransmitterBase):
], ],
[ [
"user john", "user john",
"Admin user login from (?:::f{4,6}:)?(?P<host>[\w\-.^_]+)", "Admin user login from (?:::f{4,6}:)?(?P<host>[\w\-.^_]*\\w)",
"Dont match me!", "Dont match me!",
], ],
self.jailName self.jailName