From 2224b3db4a5e9bf045131f02bd92cec8945e1e7d Mon Sep 17 00:00:00 2001 From: Evan Linde Date: Thu, 7 Apr 2022 20:51:20 -0500 Subject: [PATCH] extend date regex to include xrdp's %Y%m%d-%H:%M:%S format --- fail2ban/server/datedetector.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/fail2ban/server/datedetector.py b/fail2ban/server/datedetector.py index b90e1b26..53d055bc 100644 --- a/fail2ban/server/datedetector.py +++ b/fail2ban/server/datedetector.py @@ -165,8 +165,8 @@ class DateDetectorCache(object): r"%b %d, %ExY %I:%M:%S %p", # ASSP: Apr-27-13 02:33:06 r"^%b-%d-%Exy %k:%M:%S", - # 20050123T215959, 20050123 215959, 20050123 85959 - r"%ExY%Exm%Exd(?:T| ?)%ExH%ExM%ExS(?:[.,]%f)?(?:\s*%z)?", + # 20050123T215959, 20050123 215959, 20050123 85959, 20050123-21:59:59 + r"%ExY%Exm%Exd(?:-|T| ?)%ExH:?%ExM:?%ExS(?:[.,]%f)?(?:\s*%z)?", # prefixed with optional named time zone (monit): # PDT Apr 16 21:05:29 r"(?:%Z )?(?:%a )?%b %d %k:%M:%S(?:\.%f)?(?: %ExY)?",