diff --git a/fail2ban/client/beautifier.py b/fail2ban/client/beautifier.py index 21c49b94..4b61baa3 100644 --- a/fail2ban/client/beautifier.py +++ b/fail2ban/client/beautifier.py @@ -212,8 +212,8 @@ class Beautifier: else: msg = "These IP addresses/networks are ignored:\n" for ip in response[:-1]: - msg += "|- " + ip + "\n" - msg += "`- " + response[-1] + msg += "|- " + str(ip) + "\n" + msg += "`- " + str(response[-1]) elif inC[2] in ("failregex", "addfailregex", "delfailregex", "ignoreregex", "addignoreregex", "delignoreregex"): if len(response) == 0: diff --git a/fail2ban/tests/clientbeautifiertestcase.py b/fail2ban/tests/clientbeautifiertestcase.py index 5fcb2404..b7fff2bd 100644 --- a/fail2ban/tests/clientbeautifiertestcase.py +++ b/fail2ban/tests/clientbeautifiertestcase.py @@ -25,7 +25,7 @@ import unittest from ..client.beautifier import Beautifier from ..version import version -from ..server.ipdns import IPAddr +from ..server.ipdns import IPAddr, FileIPAddrSet from ..exceptions import UnknownJailException, DuplicateJailException class BeautifierTest(unittest.TestCase): @@ -297,6 +297,13 @@ class BeautifierTest(unittest.TestCase): output += "`- 10.0.2.1" self.assertEqual(self.b.beautify(response), output) + def testIgnoreIPFile(self): + self.b.setInputCmd(["set", "sshd", "addignoreip"]) + response = [FileIPAddrSet("/test/file-ipaddr-set")] + output = ("These IP addresses/networks are ignored:\n" + "`- file://test/file-ipaddr-set") + self.assertEqual(self.b.beautify(response), output) + def testFailRegex(self): self.b.setInputCmd(["get", "sshd", "failregex"]) output = "No regular expression is defined"