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

`splitwords` (used by ignoreip etc) considers now any kind of space as valid separator (also tabs) besides comma; 

closes gh-3562
pull/3564/head
sebres 2023-08-22 14:06:04 +02:00
parent bcaf1e714e
commit bbca81f34c
2 changed files with 2 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
fail2ban/helpers.py
View File

@ -284,7 +284,7 @@ def splitwords(s):
""" """
if not s: if not s:
return [] return []
return list(filter(bool, [v.strip() for v in re.split('[ ,\n]+', s)])) return list(filter(bool, [v.strip() for v in re.split('[\s,]+', s)]))
def _merge_dicts(x, y): def _merge_dicts(x, y):
"""Helper to merge dicts. """Helper to merge dicts.

3
fail2ban/tests/misctestcase.py
View File

@ -66,8 +66,7 @@ class HelpersTest(unittest.TestCase):
self.assertEqual(splitwords(' 1, 2 , '), ['1', '2']) self.assertEqual(splitwords(' 1, 2 , '), ['1', '2'])
self.assertEqual(splitwords(' 1\n 2'), ['1', '2']) self.assertEqual(splitwords(' 1\n 2'), ['1', '2'])
self.assertEqual(splitwords(' 1\n 2, 3'), ['1', '2', '3']) self.assertEqual(splitwords(' 1\n 2, 3'), ['1', '2', '3'])
# string as unicode: self.assertEqual(splitwords('\t1\t 2,\r\n 3\n'), ['1', '2', '3']); # other spaces
self.assertEqual(splitwords(' 1\n 2, 3'), ['1', '2', '3'])
def _sh_call(cmd): def _sh_call(cmd):