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

Merge test-3.13: python 3.13 support, see gh-3487

pull/1242/merge
sebres 2023-12-12 14:40:46 +01:00
parent 36c890f15b 7e88c9be8d
commit 8d6bfd89bf
2 changed files with 52 additions and 50 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
.github/workflows/main.yml vendored
View File

@ -22,7 +22,7 @@ jobs:
runs-on: ubuntu-20.04 runs-on: ubuntu-20.04
strategy: strategy:
matrix: matrix:
python-version: [3.6, 3.7, 3.8, 3.9, '3.10', '3.11', '3.12', pypy3.10] python-version: [3.7, 3.8, 3.9, '3.10', '3.11', '3.12', '3.13.0-alpha.2', pypy3.10]
fail-fast: false fail-fast: false
# Steps represent a sequence of tasks that will be executed as part of the job # Steps represent a sequence of tasks that will be executed as part of the job
steps: steps:

100
fail2ban/tests/utils.py
View File

@ -296,7 +296,7 @@ def initTests(opts):
# precache all invalid ip's (TEST-NET-1, ..., TEST-NET-3 according to RFC 5737): # precache all invalid ip's (TEST-NET-1, ..., TEST-NET-3 according to RFC 5737):
c = DNSUtils.CACHE_ipToName c = DNSUtils.CACHE_ipToName
c.clear = lambda: logSys.warn('clear CACHE_ipToName is disabled in test suite') c.clear = lambda: logSys.warning('clear CACHE_ipToName is disabled in test suite')
# increase max count and max time (too many entries, long time testing): # increase max count and max time (too many entries, long time testing):
c.setOptions(maxCount=10000, maxTime=5*60) c.setOptions(maxCount=10000, maxTime=5*60)
for i in range(256): for i in range(256):
@ -314,7 +314,7 @@ def initTests(opts):
c.set('8.8.4.4', 'dns.google') c.set('8.8.4.4', 'dns.google')
# precache all dns to ip's used in test cases: # precache all dns to ip's used in test cases:
c = DNSUtils.CACHE_nameToIp c = DNSUtils.CACHE_nameToIp
c.clear = lambda: logSys.warn('clear CACHE_nameToIp is disabled in test suite') c.clear = lambda: logSys.warning('clear CACHE_nameToIp is disabled in test suite')
for i in ( for i in (
('999.999.999.999', set()), ('999.999.999.999', set()),
('abcdef.abcdef', set()), ('abcdef.abcdef', set()),
@ -397,75 +397,77 @@ def gatherTests(regexps=None, opts=None):
tests = FilteredTestSuite() tests = FilteredTestSuite()
loadTests = unittest.defaultTestLoader.loadTestsFromTestCase;
# Server # Server
tests.addTest(unittest.makeSuite(servertestcase.Transmitter)) tests.addTest(loadTests(servertestcase.Transmitter))
tests.addTest(unittest.makeSuite(servertestcase.JailTests)) tests.addTest(loadTests(servertestcase.JailTests))
tests.addTest(unittest.makeSuite(servertestcase.RegexTests)) tests.addTest(loadTests(servertestcase.RegexTests))
tests.addTest(unittest.makeSuite(servertestcase.LoggingTests)) tests.addTest(loadTests(servertestcase.LoggingTests))
tests.addTest(unittest.makeSuite(servertestcase.ServerConfigReaderTests)) tests.addTest(loadTests(servertestcase.ServerConfigReaderTests))
tests.addTest(unittest.makeSuite(actiontestcase.CommandActionTest)) tests.addTest(loadTests(actiontestcase.CommandActionTest))
tests.addTest(unittest.makeSuite(actionstestcase.ExecuteActions)) tests.addTest(loadTests(actionstestcase.ExecuteActions))
# Ticket, BanTicket, FailTicket # Ticket, BanTicket, FailTicket
tests.addTest(unittest.makeSuite(tickettestcase.TicketTests)) tests.addTest(loadTests(tickettestcase.TicketTests))
# FailManager # FailManager
tests.addTest(unittest.makeSuite(failmanagertestcase.AddFailure)) tests.addTest(loadTests(failmanagertestcase.AddFailure))
tests.addTest(unittest.makeSuite(failmanagertestcase.FailmanagerComplex)) tests.addTest(loadTests(failmanagertestcase.FailmanagerComplex))
# BanManager # BanManager
tests.addTest(unittest.makeSuite(banmanagertestcase.AddFailure)) tests.addTest(loadTests(banmanagertestcase.AddFailure))
try: try:
import dns import dns
tests.addTest(unittest.makeSuite(banmanagertestcase.StatusExtendedCymruInfo)) tests.addTest(loadTests(banmanagertestcase.StatusExtendedCymruInfo))
except ImportError: # pragma: no cover except ImportError: # pragma: no cover
pass pass
# ClientBeautifier # ClientBeautifier
tests.addTest(unittest.makeSuite(clientbeautifiertestcase.BeautifierTest)) tests.addTest(loadTests(clientbeautifiertestcase.BeautifierTest))
# ClientReaders # ClientReaders
tests.addTest(unittest.makeSuite(clientreadertestcase.ConfigReaderTest)) tests.addTest(loadTests(clientreadertestcase.ConfigReaderTest))
tests.addTest(unittest.makeSuite(clientreadertestcase.JailReaderTest)) tests.addTest(loadTests(clientreadertestcase.JailReaderTest))
tests.addTest(unittest.makeSuite(clientreadertestcase.FilterReaderTest)) tests.addTest(loadTests(clientreadertestcase.FilterReaderTest))
tests.addTest(unittest.makeSuite(clientreadertestcase.JailsReaderTest)) tests.addTest(loadTests(clientreadertestcase.JailsReaderTest))
tests.addTest(unittest.makeSuite(clientreadertestcase.JailsReaderTestCache)) tests.addTest(loadTests(clientreadertestcase.JailsReaderTestCache))
# CSocket and AsyncServer # CSocket and AsyncServer
tests.addTest(unittest.makeSuite(sockettestcase.Socket)) tests.addTest(loadTests(sockettestcase.Socket))
tests.addTest(unittest.makeSuite(sockettestcase.ClientMisc)) tests.addTest(loadTests(sockettestcase.ClientMisc))
# Misc helpers # Misc helpers
tests.addTest(unittest.makeSuite(misctestcase.HelpersTest)) tests.addTest(loadTests(misctestcase.HelpersTest))
tests.addTest(unittest.makeSuite(misctestcase.SetupTest)) tests.addTest(loadTests(misctestcase.SetupTest))
tests.addTest(unittest.makeSuite(misctestcase.TestsUtilsTest)) tests.addTest(loadTests(misctestcase.TestsUtilsTest))
tests.addTest(unittest.makeSuite(misctestcase.MyTimeTest)) tests.addTest(loadTests(misctestcase.MyTimeTest))
# Database # Database
tests.addTest(unittest.makeSuite(databasetestcase.DatabaseTest)) tests.addTest(loadTests(databasetestcase.DatabaseTest))
# Observer # Observer
tests.addTest(unittest.makeSuite(observertestcase.ObserverTest)) tests.addTest(loadTests(observertestcase.ObserverTest))
tests.addTest(unittest.makeSuite(observertestcase.BanTimeIncr)) tests.addTest(loadTests(observertestcase.BanTimeIncr))
tests.addTest(unittest.makeSuite(observertestcase.BanTimeIncrDB)) tests.addTest(loadTests(observertestcase.BanTimeIncrDB))
# Filter # Filter
tests.addTest(unittest.makeSuite(filtertestcase.IgnoreIP)) tests.addTest(loadTests(filtertestcase.IgnoreIP))
tests.addTest(unittest.makeSuite(filtertestcase.BasicFilter)) tests.addTest(loadTests(filtertestcase.BasicFilter))
tests.addTest(unittest.makeSuite(filtertestcase.LogFile)) tests.addTest(loadTests(filtertestcase.LogFile))
tests.addTest(unittest.makeSuite(filtertestcase.LogFileMonitor)) tests.addTest(loadTests(filtertestcase.LogFileMonitor))
tests.addTest(unittest.makeSuite(filtertestcase.LogFileFilterPoll)) tests.addTest(loadTests(filtertestcase.LogFileFilterPoll))
# each test case class self will check no network, and skip it (we see it in log) # each test case class self will check no network, and skip it (we see it in log)
tests.addTest(unittest.makeSuite(filtertestcase.IgnoreIPDNS)) tests.addTest(loadTests(filtertestcase.IgnoreIPDNS))
tests.addTest(unittest.makeSuite(filtertestcase.GetFailures)) tests.addTest(loadTests(filtertestcase.GetFailures))
tests.addTest(unittest.makeSuite(filtertestcase.DNSUtilsTests)) tests.addTest(loadTests(filtertestcase.DNSUtilsTests))
tests.addTest(unittest.makeSuite(filtertestcase.DNSUtilsNetworkTests)) tests.addTest(loadTests(filtertestcase.DNSUtilsNetworkTests))
tests.addTest(unittest.makeSuite(filtertestcase.JailTests)) tests.addTest(loadTests(filtertestcase.JailTests))
# DateDetector # DateDetector
tests.addTest(unittest.makeSuite(datedetectortestcase.DateDetectorTest)) tests.addTest(loadTests(datedetectortestcase.DateDetectorTest))
tests.addTest(unittest.makeSuite(datedetectortestcase.CustomDateFormatsTest)) tests.addTest(loadTests(datedetectortestcase.CustomDateFormatsTest))
# Filter Regex tests with sample logs # Filter Regex tests with sample logs
tests.addTest(unittest.makeSuite(samplestestcase.FilterSamplesRegex)) tests.addTest(loadTests(samplestestcase.FilterSamplesRegex))
# bin/fail2ban-client, bin/fail2ban-server # bin/fail2ban-client, bin/fail2ban-server
tests.addTest(unittest.makeSuite(fail2banclienttestcase.Fail2banClientTest)) tests.addTest(loadTests(fail2banclienttestcase.Fail2banClientTest))
tests.addTest(unittest.makeSuite(fail2banclienttestcase.Fail2banServerTest)) tests.addTest(loadTests(fail2banclienttestcase.Fail2banServerTest))
# bin/fail2ban-regex # bin/fail2ban-regex
tests.addTest(unittest.makeSuite(fail2banregextestcase.Fail2banRegexTest)) tests.addTest(loadTests(fail2banregextestcase.Fail2banRegexTest))
# #
# Python action testcases # Python action testcases
@ -495,17 +497,17 @@ def gatherTests(regexps=None, opts=None):
logSys.warning("I: Skipping pyinotify backend testing. Got exception '%s'" % e) logSys.warning("I: Skipping pyinotify backend testing. Got exception '%s'" % e)
for Filter_ in filters: for Filter_ in filters:
tests.addTest(unittest.makeSuite( tests.addTest(loadTests(
filtertestcase.get_monitor_failures_testcase(Filter_))) filtertestcase.get_monitor_failures_testcase(Filter_)))
try: # pragma: systemd no cover try: # pragma: systemd no cover
from ..server.filtersystemd import FilterSystemd from ..server.filtersystemd import FilterSystemd
tests.addTest(unittest.makeSuite(filtertestcase.get_monitor_failures_journal_testcase(FilterSystemd))) tests.addTest(loadTests(filtertestcase.get_monitor_failures_journal_testcase(FilterSystemd)))
except ImportError as e: # pragma: no cover except ImportError as e: # pragma: no cover
logSys.warning("I: Skipping systemd backend testing. Got exception '%s'" % e) logSys.warning("I: Skipping systemd backend testing. Got exception '%s'" % e)
# Server test for logging elements which break logging used to support # Server test for logging elements which break logging used to support
# testcases analysis # testcases analysis
tests.addTest(unittest.makeSuite(servertestcase.TransmitterLogging)) tests.addTest(loadTests(servertestcase.TransmitterLogging))
return tests return tests