diff options
| author | sebres <serg.brester@sebres.de> | 2022-03-03 15:15:43 +0100 |
|---|---|---|
| committer | sebres <serg.brester@sebres.de> | 2022-03-03 15:15:43 +0100 |
| commit | 8c4d02403b4768fb1a76372a7a462fc903c2711e (patch) | |
| tree | 586a81441c6b19564d809727be74d9af67ce0a93 /fail2ban | |
| parent | 8ac49b58582cfe82626307b5a8b0574a63499d95 (diff) | |
| parent | e2d50f38a6ef2511fee6b49f42b98f6d867625b2 (diff) | |
| download | fail2ban-8c4d02403b4768fb1a76372a7a462fc903c2711e.tar.gz | |
Merge branch '0.10' into 0.11
Diffstat (limited to 'fail2ban')
| -rw-r--r-- | fail2ban/client/fail2banregex.py | 2 | ||||
| -rw-r--r-- | fail2ban/server/filter.py | 2 | ||||
| -rw-r--r-- | fail2ban/tests/fail2banregextestcase.py | 21 |
3 files changed, 24 insertions, 1 deletions
diff --git a/fail2ban/client/fail2banregex.py b/fail2ban/client/fail2banregex.py index 90e178f9..8c03b2dd 100644 --- a/fail2ban/client/fail2banregex.py +++ b/fail2ban/client/fail2banregex.py @@ -334,7 +334,7 @@ class Fail2banRegex(object): fltFile = None fltOpt = {} if regextype == 'fail': - if re.search(r'^/{0,3}[\w/_\-.]+(?:\[.*\])?$', value): + if re.search(r'^(?ms)/{0,3}[\w/_\-.]+(?:\[.*\])?$', value): try: fltName, fltOpt = extractOptions(value) if "." in fltName[~5:]: diff --git a/fail2ban/server/filter.py b/fail2ban/server/filter.py index 6a3dc710..3657ea48 100644 --- a/fail2ban/server/filter.py +++ b/fail2ban/server/filter.py @@ -797,6 +797,8 @@ class Filter(JailThread): # be sure we've correct current state ('nofail' and 'mlfgained' only from last failure) if mlfidGroups.pop('nofail', None): nfflgs |= 4 if mlfidGroups.pop('mlfgained', None): nfflgs |= 4 + # gained resets all pending failures (retaining users to check it later) + if nfflgs & 8: mlfidGroups.pop('mlfpending', None) # if we had no pending failures then clear the matches (they are already provided): if (nfflgs & 4) == 0 and not mlfidGroups.get('mlfpending', 0): mlfidGroups.pop("matches", None) diff --git a/fail2ban/tests/fail2banregextestcase.py b/fail2ban/tests/fail2banregextestcase.py index 8c92459a..884f313a 100644 --- a/fail2ban/tests/fail2banregextestcase.py +++ b/fail2ban/tests/fail2banregextestcase.py @@ -457,6 +457,27 @@ class Fail2banRegexTest(LogCaptureTestCase): '192.0.2.1, git, '+lines[-1], all=True) + def testOutputNoPendingFailuresAfterGained(self): + unittest.F2B.SkipIfCfgMissing(stock=True) + # connect finished without authorization must generate a failure, because + # connect started will produce pending failure which gets reset by gained + # connect authorized. + self.assertTrue(_test_exec('-o', 'failure from == <ip> ==', + '-c', CONFIG_DIR, '-d', '{NONE}', + 'svc[1] connect started 192.0.2.3\n' + 'svc[1] connect finished 192.0.2.3\n' + 'svc[2] connect started 192.0.2.4\n' + 'svc[2] connect authorized 192.0.2.4\n' + 'svc[2] connect finished 192.0.2.4\n', + 'common[prefregex="^svc\[<F-MLFID>\d+</F-MLFID>\] connect <F-CONTENT>.+</F-CONTENT>$"' + ', failregex="' + '^started\n' + '^<F-NOFAIL><F-MLFFORGET>finished</F-MLFFORGET></F-NOFAIL> <ADDR>\n' + '^<F-MLFGAINED>authorized</F-MLFGAINED> <ADDR>' + '", maxlines=1]' + )) + self.assertLogged('failure from == 192.0.2.3 ==') + self.assertNotLogged('failure from == 192.0.2.4 ==') def testWrongFilterFile(self): # use test log as filter file to cover eror cases... |