You can not select more than 25 topics
Topics must start with a letter or number, can include dashes ('-') and can be up to 35 characters long.
55 lines
2.0 KiB
55 lines
2.0 KiB
5 years ago
|
From 343ec1cdd296530f331637c725bd2bb0549e01e6 Mon Sep 17 00:00:00 2001
|
||
|
|
From: sebres <serg.brester@sebres.de>
|
||
|
|
Date: Wed, 18 Mar 2020 20:37:25 +0100
|
||
|
|
Subject: [PATCH] test-causes: avoid host-depending issue (mistakenly ignoring
|
||
|
|
IP 127.0.0.2 as own address) - replace loop-back addr with test sub-net addr
|
||
|
|
(and disable ignoreself)
|
||
|
|
|
||
|
|
---
|
||
|
|
fail2ban/tests/observertestcase.py | 7 ++++---
|
||
|
|
1 file changed, 4 insertions(+), 3 deletions(-)
|
||
|
|
|
||
|
|
diff --git a/fail2ban/tests/observertestcase.py b/fail2ban/tests/observertestcase.py
|
||
|
|
index 8e9444548..e379ccd18 100644
|
||
|
|
--- a/fail2ban/tests/observertestcase.py
|
||
|
|
+++ b/fail2ban/tests/observertestcase.py
|
||
|
|
@@ -36,7 +36,6 @@
|
||
|
|
from ..server.observer import Observers, ObserverThread
|
||
|
|
from ..server.utils import Utils
|
||
|
|
from .utils import LogCaptureTestCase
|
||
|
|
-from ..server.filter import Filter
|
||
|
|
from .dummyjail import DummyJail
|
||
|
|
|
||
|
|
from .databasetestcase import getFail2BanDb, Fail2BanDb
|
||
|
|
@@ -224,7 +223,7 @@ def testBanTimeIncr(self):
|
||
|
|
jail.actions.setBanTime(10)
|
||
|
|
jail.setBanTimeExtra('increment', 'true')
|
||
|
|
jail.setBanTimeExtra('multipliers', '1 2 4 8 16 32 64 128 256 512 1024 2048')
|
||
|
|
- ip = "127.0.0.2"
|
||
|
|
+ ip = "192.0.2.1"
|
||
|
|
# used as start and fromtime (like now but time independence, cause test case can run slow):
|
||
|
|
stime = int(MyTime.time())
|
||
|
|
ticket = FailTicket(ip, stime, [])
|
||
|
|
@@ -385,10 +384,12 @@ def testBanTimeIncr(self):
|
||
|
|
|
||
|
|
# two separate jails :
|
||
|
|
jail1 = DummyJail(backend='polling')
|
||
|
|
+ jail1.filter.ignoreSelf = False
|
||
|
|
jail1.setBanTimeExtra('increment', 'true')
|
||
|
|
jail1.database = self.db
|
||
|
|
self.db.addJail(jail1)
|
||
|
|
jail2 = DummyJail(name='DummyJail-2', backend='polling')
|
||
|
|
+ jail2.filter.ignoreSelf = False
|
||
|
|
jail2.database = self.db
|
||
|
|
self.db.addJail(jail2)
|
||
|
|
ticket1 = FailTicket(ip, stime, [])
|
||
|
|
@@ -477,7 +478,7 @@ def testObserver(self):
|
||
|
|
self.assertEqual(tickets, [])
|
||
|
|
|
||
|
|
# add failure:
|
||
|
|
- ip = "127.0.0.2"
|
||
|
|
+ ip = "192.0.2.1"
|
||
|
|
ticket = FailTicket(ip, stime-120, [])
|
||
|
|
failManager = FailManager()
|
||
|
|
failManager.setMaxRetry(3)
|