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

datedetector, strptime: token `%Z` must recognize zone abbreviation `Z` (GMT/UTC) also, similar to `%z`; 

more test cases added.
pull/2897/head
sebres 2020-11-24 19:28:46 +01:00
parent a03109d096
commit 0f27a8add8
2 changed files with 5 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
fail2ban/server/strptime.py
View File

@ -234,16 +234,12 @@ def reGroupDictStrptime(found_dict, msec=False, default_tz=None):
week_of_year = int(val) week_of_year = int(val)
# U starts week on Sunday, W - on Monday # U starts week on Sunday, W - on Monday
week_of_year_start = 6 if key == 'U' else 0 week_of_year_start = 6 if key == 'U' else 0
elif key == 'z': elif key in ('z', 'Z'):
z = val z = val
if z in ("Z", "UTC", "GMT"): if z in ("Z", "UTC", "GMT"):
tzoffset = 0 tzoffset = 0
else: elif key == 'z':
tzoffset = zone2offset(z, 0); # currently offset-based only tzoffset = zone2offset(z, 0); # currently offset-based only
elif key == 'Z':
z = val
if z in ("UTC", "GMT"):
tzoffset = 0
# Fail2Ban will assume it's this year # Fail2Ban will assume it's this year
assume_year = False assume_year = False

3
fail2ban/tests/datedetectortestcase.py
View File

@ -516,6 +516,9 @@ class CustomDateFormatsTest(unittest.TestCase):
(1072746123.0 - 3600, "{^LN-BEG}%ExY-%Exm-%Exd %ExH:%ExM:%ExS(?: %Z)?", "[2003-12-30 01:02:03] server ..."), (1072746123.0 - 3600, "{^LN-BEG}%ExY-%Exm-%Exd %ExH:%ExM:%ExS(?: %Z)?", "[2003-12-30 01:02:03] server ..."),
(1072746123.0, "{^LN-BEG}%ExY-%Exm-%Exd %ExH:%ExM:%ExS(?: %z)?", "[2003-12-30 01:02:03 UTC] server ..."), (1072746123.0, "{^LN-BEG}%ExY-%Exm-%Exd %ExH:%ExM:%ExS(?: %z)?", "[2003-12-30 01:02:03 UTC] server ..."),
(1072746123.0, "{^LN-BEG}%ExY-%Exm-%Exd %ExH:%ExM:%ExS(?: %Z)?", "[2003-12-30 01:02:03 UTC] server ..."), (1072746123.0, "{^LN-BEG}%ExY-%Exm-%Exd %ExH:%ExM:%ExS(?: %Z)?", "[2003-12-30 01:02:03 UTC] server ..."),
(1072746123.0, "{^LN-BEG}%ExY-%Exm-%Exd %ExH:%ExM:%ExS(?: %z)?", "[2003-12-30 01:02:03 Z] server ..."),
(1072746123.0, "{^LN-BEG}%ExY-%Exm-%Exd %ExH:%ExM:%ExS(?: %z)?", "[2003-12-30 01:02:03 +0000] server ..."),
(1072746123.0, "{^LN-BEG}%ExY-%Exm-%Exd %ExH:%ExM:%ExS(?: %Z)?", "[2003-12-30 01:02:03 Z] server ..."),
): ):
logSys.debug('== test: %r', (matched, dp, line)) logSys.debug('== test: %r', (matched, dp, line))
if dp is None: if dp is None: