TST+BF: Add tests for python actions, including test for smtp.py

Also fix bug when specifying multiple recipients for smtp.py action

config/action.d/smtp.py

@@ -98,8 +98,8 @@ class SMTPAction(ActionBase):
 			Email address to use for from address in email.
 			Default "fail2ban".
 		dest : str, optional
-			Email addresses of intended recipient(s) in comma delimited
-			format. Default "root".
+			Email addresses of intended recipient(s) in comma space ", "
+			delimited format. Default "root".
 		matches : str, optional
 			Type of matches to be included from ban in email. Can be one
 			of "matches", "ipmatches" or "ipjailmatches". Default None
@@ -159,7 +159,7 @@ class SMTPAction(ActionBase):
 			if self.user and self.password:
 				smtp.login(self.user, self.password)
 			failed_recipients = smtp.sendmail(
-				self.fromaddr, self.toaddr, msg.as_string())
+				self.fromaddr, self.toaddr.split(", "), msg.as_string())
 		except smtplib.SMTPConnectError:
 			self._logSys.error("Error connecting to host '%s'", self.host)
 			raise

fail2ban/server/actions.py

@@ -98,7 +98,8 @@ class Actions(JailThread, Mapping):
 		if pythonModule is None:
 			action = CommandAction(self._jail, name)
 		else:
-			pythonModuleName = os.path.basename(pythonModule.strip(".py"))
+			pythonModuleName = os.path.splitext(
+				os.path.basename(pythonModule))[0]
 			if sys.version_info >= (3, 3):
 				customActionModule = importlib.machinery.SourceFileLoader(
 					pythonModuleName, pythonModule).load_module()

fail2ban/tests/action_d/__init__.py

@@ -0,0 +1,22 @@
+# emacs: -*- mode: python; py-indent-offset: 4; indent-tabs-mode: t -*-
+# vi: set ft=python sts=4 ts=4 sw=4 noet :
+
+# This file is part of Fail2Ban.
+#
+# Fail2Ban is free software; you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation; either version 2 of the License, or
+# (at your option) any later version.
+#
+# Fail2Ban is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with Fail2Ban; if not, write to the Free Software
+# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
+
+__author__ = "Steven Hiscocks"
+__copyright__ = "Copyright (c) 2014 Steven Hiscocks"
+__license__ = "GPL"

fail2ban/tests/action_d/test_smtp.py

@@ -0,0 +1,128 @@
+# emacs: -*- mode: python; py-indent-offset: 4; indent-tabs-mode: t -*-
+# vi: set ft=python sts=4 ts=4 sw=4 noet :
+
+# This file is part of Fail2Ban.
+#
+# Fail2Ban is free software; you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation; either version 2 of the License, or
+# (at your option) any later version.
+#
+# Fail2Ban is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with Fail2Ban; if not, write to the Free Software
+# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
+
+import os
+import smtpd
+import asyncore
+import threading
+import unittest
+import imp
+
+from ..dummyjail import DummyJail
+
+if os.path.exists('config/fail2ban.conf'):
+	CONFIG_DIR = "config"
+else:
+	CONFIG_DIR='/etc/fail2ban'
+
+class TestSMTPServer(smtpd.SMTPServer):
+
+	def process_message(self, peer, mailfrom, rcpttos, data):
+		self.peer = peer
+		self.mailfrom = mailfrom
+		self.rcpttos = rcpttos
+		self.data = data
+
+class SMTPActionTest(unittest.TestCase):
+
+	def setUp(self):
+		"""Call before every test case."""
+		self.jail = DummyJail()
+		pythonModule = os.path.join(CONFIG_DIR, "action.d", "smtp.py")
+		pythonModuleName = os.path.basename(pythonModule.rstrip(".py"))
+		customActionModule = imp.load_source(pythonModuleName, pythonModule)
+
+		self.smtpd = TestSMTPServer(("localhost", 0), None)
+		port = self.smtpd.socket.getsockname()[1]
+
+		self.action = customActionModule.Action(
+			self.jail, "test", host="127.0.0.1:%i" % port)
+
+		self._loop_thread = threading.Thread(
+			target=asyncore.loop, kwargs={'timeout': 1})
+		self._loop_thread.start()
+
+	def tearDown(self):
+		"""Call after every test case."""
+		self.smtpd.close()
+		self._loop_thread.join()
+
+	def testStart(self):
+		self.action.start()
+		self.assertEqual(self.smtpd.mailfrom, "fail2ban")
+		self.assertEqual(self.smtpd.rcpttos, ["root"])
+		self.assertTrue(
+			"Subject: [Fail2Ban] %s: started" % self.jail.getName()
+			in self.smtpd.data)
+
+	def testStop(self):
+		self.action.stop()
+		self.assertEqual(self.smtpd.mailfrom, "fail2ban")
+		self.assertEqual(self.smtpd.rcpttos, ["root"])
+		self.assertTrue(
+			"Subject: [Fail2Ban] %s: stopped" %
+				self.jail.getName() in self.smtpd.data)
+
+	def testBan(self):
+		aInfo = {
+			'ip': "127.0.0.2",
+			'failures': 3,
+			'matches': "Test fail 1\n",
+			'ipjailmatches': "Test fail 1\nTest Fail2\n",
+			'ipmatches': "Test fail 1\nTest Fail2\nTest Fail3\n",
+			}
+
+		self.action.ban(aInfo)
+		self.assertEqual(self.smtpd.mailfrom, "fail2ban")
+		self.assertEqual(self.smtpd.rcpttos, ["root"])
+		self.assertTrue(
+			"Subject: [Fail2Ban] %s: banned %s" %
+				(self.jail.getName(), aInfo['ip']) in self.smtpd.data)
+
+		self.action.matches = "matches"
+		self.action.ban(aInfo)
+		self.assertTrue(
+			"%i attempts" % aInfo['failures'] in self.smtpd.data)
+		self.assertTrue(aInfo['matches'] in self.smtpd.data)
+
+		self.action.matches = "ipjailmatches"
+		self.action.ban(aInfo)
+		self.assertTrue(
+			"%i attempts" % aInfo['failures'] in self.smtpd.data)
+		self.assertTrue(aInfo['ipjailmatches'] in self.smtpd.data)
+
+		self.action.matches = "ipmatches"
+		self.action.ban(aInfo)
+		self.assertTrue(
+			"%i attempts" % aInfo['failures'] in self.smtpd.data)
+		self.assertTrue(aInfo['ipmatches'] in self.smtpd.data)
+
+	def testOptions(self):
+		self.action.start()
+		self.assertEqual(self.smtpd.mailfrom, "fail2ban")
+		self.assertEqual(self.smtpd.rcpttos, ["root"])
+
+		self.action.fromname = "Test"
+		self.action.fromaddr = "test@example.com"
+		self.action.toaddr = "test@example.com, test2@example.com"
+		self.action.start()
+		self.assertEqual(self.smtpd.mailfrom, "test@example.com")
+		self.assertTrue("From: %s <%s>" %
+			(self.action.fromname, self.action.fromaddr) in self.smtpd.data)
+		self.assertEqual(set(self.smtpd.rcpttos), set(["test@example.com", "test2@example.com"]))

fail2ban/tests/dummyjail.py

@@ -24,12 +24,15 @@ __license__ = "GPL"
 
 from threading import Lock
 
+from ..server.actions import Actions
+
 class DummyJail(object):
 	"""A simple 'jail' to suck in all the tickets generated by Filter's
 	"""
 	def __init__(self):
 		self.lock = Lock()
 		self.queue = []
+		self.actions = Actions(self)
 
 	def __len__(self):
 		try:

fail2ban/tests/utils.py

@@ -202,6 +202,18 @@ def gatherTests(regexps=None, no_network=False):
 	# Filter Regex tests with sample logs
 	tests.addTest(unittest.makeSuite(samplestestcase.FilterSamplesRegex))
 
+	#
+	# Python action testcases
+	#
+	testloader = unittest.TestLoader()
+	from . import action_d
+	for file_ in os.listdir(
+		os.path.abspath(os.path.dirname(action_d.__file__))):
+		if file_.startswith("test_") and file_.endswith(".py") and \
+			file_ != "__init__.py":
+			tests.addTest(testloader.loadTestsFromName(
+				"%s.%s" % (action_d.__name__, os.path.splitext(file_)[0])))
+
 	#
 	# Extensive use-tests of different available filters backends
 	#

setup.py

@@ -105,6 +105,7 @@ setup(
 					'fail2ban.client',
 					'fail2ban.server',
 					'fail2ban.tests',
+					'fail2ban.tests.action_d',
 				],
 	package_data =	{
 						'fail2ban.tests':