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

action.d/blocklist_de.conf: fixed tag substitution (in 0.10 it can be variables supplied via shell-arguments), expand `<matches>` with trailing newline; 

tests extended;
closes gh-2028
pull/2034/head
sebres 2018-01-30 12:27:03 +01:00
parent 435f359a06
commit 03b577d7b9
2 changed files with 22 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
config/action.d/blocklist_de.conf
View File

@ -54,7 +54,7 @@ actioncheck =
# Tags: See jail.conf(5) man page # Tags: See jail.conf(5) man page
# Values: CMD # Values: CMD
# #
actionban = curl --fail --data-urlencode 'server=<email>' --data 'apikey=<apikey>' --data 'service=<service>' --data 'ip=<ip>' --data-urlencode 'logs=<matches>' --data 'format=text' --user-agent "<agent>" "https://www.blocklist.de/en/httpreports.html" actionban = lgm=$(printf 'logs=%%s\n...' "<matches>"); curl --fail --data-urlencode "server=<email>" --data "apikey=<apikey>" --data "service=<service>" --data "ip=<ip>" --data-urlencode "$lgm" --data 'format=text' --user-agent "<agent>" "https://www.blocklist.de/en/httpreports.html"
# Option: actionunban # Option: actionunban
# Notes.: command executed when unbanning an IP. Take care that the # Notes.: command executed when unbanning an IP. Take care that the
@ -64,8 +64,6 @@ actionban = curl --fail --data-urlencode 'server=<email>' --data 'apikey=<apikey
# #
actionunban = actionunban =
[Init]
# Option: email # Option: email
# Notes server email address, as per blocklise.de account # Notes server email address, as per blocklise.de account
# Values: STRING Default: None # Values: STRING Default: None

22
fail2ban/tests/fail2banclienttestcase.py
View File

@ -318,7 +318,7 @@ def with_foreground_server_thread(startextra={}):
Utils.wait_for(lambda: phase.get('start', None) is not None, MAX_WAITTIME) Utils.wait_for(lambda: phase.get('start', None) is not None, MAX_WAITTIME)
self.assertTrue(phase.get('start', None)) self.assertTrue(phase.get('start', None))
# wait for server (socket and ready): # wait for server (socket and ready):
self._wait_for_srv(tmp, True, startparams=startparams) self._wait_for_srv(tmp, True, startparams=startparams, phase=phase)
DefLogSys.info('=== within server: begin ===') DefLogSys.info('=== within server: begin ===')
self.pruneLog() self.pruneLog()
# several commands to server in body of decorated function: # several commands to server in body of decorated function:
@ -368,12 +368,12 @@ class Fail2banClientServerBase(LogCaptureTestCase):
else: else:
raise FailExitException() raise FailExitException()
def _wait_for_srv(self, tmp, ready=True, startparams=None): def _wait_for_srv(self, tmp, ready=True, startparams=None, phase={}):
try: try:
sock = pjoin(tmp, "f2b.sock") sock = pjoin(tmp, "f2b.sock")
# wait for server (socket): # wait for server (socket):
ret = Utils.wait_for(lambda: exists(sock), MAX_WAITTIME) ret = Utils.wait_for(lambda: phase.get('end') or exists(sock), MAX_WAITTIME)
if not ret: if not ret or phase.get('end'):
raise Exception( raise Exception(
'Unexpected: Socket file does not exists.\nStart failed: %r' 'Unexpected: Socket file does not exists.\nStart failed: %r'
% (startparams,) % (startparams,)
@ -405,7 +405,9 @@ class Fail2banClientServerBase(LogCaptureTestCase):
# start and wait to end (foreground): # start and wait to end (foreground):
logSys.debug("start of test worker") logSys.debug("start of test worker")
phase['start'] = True phase['start'] = True
try:
self.execCmd(SUCCESS, ("-f",) + startparams, "start") self.execCmd(SUCCESS, ("-f",) + startparams, "start")
finally:
# end : # end :
phase['end'] = True phase['end'] = True
logSys.debug("end of test worker") logSys.debug("end of test worker")
@ -1173,7 +1175,7 @@ class Fail2banServerTest(Fail2banClientServerBase):
@with_foreground_server_thread(startextra={ @with_foreground_server_thread(startextra={
# create log-file (avoid "not found" errors): # create log-file (avoid "not found" errors):
'create_before_start': ('%(tmp)s/blck-failures.log',), 'create_before_start': ('%(tmp)s/blck-failures.log',),
# we need action.d/nginx-block-map.conf: # we need action.d/nginx-block-map.conf and blocklist_de:
'use_stock_cfg': ('action.d',), 'use_stock_cfg': ('action.d',),
# jail-config: # jail-config:
'jails': ( 'jails': (
@ -1182,6 +1184,8 @@ class Fail2banServerTest(Fail2banClientServerBase):
'usedns = no', 'usedns = no',
'logpath = %(tmp)s/blck-failures.log', 'logpath = %(tmp)s/blck-failures.log',
'action = nginx-block-map[blck_lst_reload="", blck_lst_file="%(tmp)s/blck-lst.map"]', 'action = nginx-block-map[blck_lst_reload="", blck_lst_file="%(tmp)s/blck-lst.map"]',
' blocklist_de[actionban=\'curl() { echo "*** curl" "$*";}; <Definition/actionban>\', email="Fail2Ban <fail2ban@localhost>", '
'apikey="TEST-API-KEY", agent="fail2ban-test-agent", service=<name>]',
'filter =', 'filter =',
'datepattern = ^Epoch', 'datepattern = ^Epoch',
'failregex = ^ failure "<F-ID>[^"]+</F-ID>" - <ADDR>', 'failregex = ^ failure "<F-ID>[^"]+</F-ID>" - <ADDR>',
@ -1219,6 +1223,14 @@ class Fail2banServerTest(Fail2banClientServerBase):
self.assertIn('\\125-000-004 1;\n', mp) self.assertIn('\\125-000-004 1;\n', mp)
self.assertIn('\\125-000-005 1;\n', mp) self.assertIn('\\125-000-005 1;\n', mp)
# check blocklist_de substitution:
self.assertLogged(
"stdout: '*** curl --fail --data-urlencode server=Fail2Ban <fail2ban@localhost>"
" --data apikey=TEST-API-KEY --data service=nginx-blck-lst ",
"stdout: '... --data format=text --user-agent fail2ban-test-agent",
all=True, wait=MID_WAITTIME
)
# unban 1, 2 and 5: # unban 1, 2 and 5:
self.execCmd(SUCCESS, startparams, 'unban', '125-000-001', '125-000-002', '125-000-005') self.execCmd(SUCCESS, startparams, 'unban', '125-000-001', '125-000-002', '125-000-005')
_out_file(mpfn) _out_file(mpfn)