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

Merge branch 'py-3.6-compat' into 0.10-full

pull/1460/head
sebres 2017-02-15 19:18:35 +01:00
parent a4ec017d1c cf53a834f7
commit fa20b0aff2
4 changed files with 7 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
fail2ban/server/datedetector.py
View File

@ -284,7 +284,7 @@ class DateDetector(object):
if preMatch is not None: if preMatch is not None:
# get cached or create a copy with modified name/pattern, using preMatch replacement for {DATE}: # get cached or create a copy with modified name/pattern, using preMatch replacement for {DATE}:
template = _getAnchoredTemplate(template, template = _getAnchoredTemplate(template,
wrap=lambda s: RE_DATE_PREMATCH.sub(s, preMatch)) wrap=lambda s: RE_DATE_PREMATCH.sub(lambda m: s, preMatch))
# append date detector template (ignore duplicate if some was added before default): # append date detector template (ignore duplicate if some was added before default):
self._appendTemplate(template, ignoreDup=ignoreDup) self._appendTemplate(template, ignoreDup=ignoreDup)

8
fail2ban/tests/action_d/test_smtp.py
View File

@ -30,7 +30,7 @@ else:
from ..dummyjail import DummyJail from ..dummyjail import DummyJail
from ..utils import CONFIG_DIR, asyncserver, Utils from ..utils import CONFIG_DIR, asyncserver, Utils, uni_decode
class TestSMTPServer(smtpd.SMTPServer): class TestSMTPServer(smtpd.SMTPServer):
@ -38,13 +38,13 @@ class TestSMTPServer(smtpd.SMTPServer):
smtpd.SMTPServer.__init__(self, *args) smtpd.SMTPServer.__init__(self, *args)
self.ready = False self.ready = False
def process_message(self, peer, mailfrom, rcpttos, data): def process_message(self, peer, mailfrom, rcpttos, data, **kwargs):
self.peer = peer self.peer = peer
self.mailfrom = mailfrom self.mailfrom = mailfrom
self.rcpttos = rcpttos self.rcpttos = rcpttos
self.org_data = data self.org_data = data
# replace new line (with tab or space) for possible mime translations (word wrap): # replace new line (with tab or space) for possible mime translations (word wrap),
self.data = re.sub(r"\n[\t ]", " ", data) self.data = re.sub(r"\n[\t ]", " ", uni_decode(data))
self.ready = True self.ready = True

2
fail2ban/tests/servertestcase.py
View File

@ -1656,7 +1656,7 @@ class ServerConfigReaderTests(LogCaptureTestCase):
r' echo mail \1 ) | cat', realCmd) r' echo mail \1 ) | cat', realCmd)
# replace abuse retrieving (possible no-network): # replace abuse retrieving (possible no-network):
realCmd = re.sub(r'[^\n]+\bADDRESSES=\$\(dig\s[^\n]+', realCmd = re.sub(r'[^\n]+\bADDRESSES=\$\(dig\s[^\n]+',
'ADDRESSES="abuse-1@abuse-test-server, abuse-2@abuse-test-server"', realCmd) lambda m: 'ADDRESSES="abuse-1@abuse-test-server, abuse-2@abuse-test-server"', realCmd)
# execute action: # execute action:
return _actions.CommandAction.executeCmd(realCmd, timeout=timeout) return _actions.CommandAction.executeCmd(realCmd, timeout=timeout)

2
fail2ban/tests/utils.py
View File

@ -37,7 +37,7 @@ import unittest
from cStringIO import StringIO from cStringIO import StringIO
from functools import wraps from functools import wraps
from ..helpers import getLogger, str2LogLevel, getVerbosityFormat from ..helpers import getLogger, str2LogLevel, getVerbosityFormat, uni_decode
from ..server.ipdns import DNSUtils from ..server.ipdns import DNSUtils
from ..server.mytime import MyTime from ..server.mytime import MyTime
from ..server.utils import Utils from ..server.utils import Utils