From 011ccbc6759ef0bff6fc8f773baa7839bbd8f2e8 Mon Sep 17 00:00:00 2001
From: Steven Hiscocks <steven@hiscocks.me.uk>
Date: Tue, 24 Sep 2013 22:25:17 +0100
Subject: [PATCH] TST+BF: Fix bug in Filter.{get,set}DatePattern and improve
 tests

---
 fail2ban/server/filter.py        | 6 +++---
 fail2ban/tests/servertestcase.py | 6 ++++++
 2 files changed, 9 insertions(+), 3 deletions(-)

diff --git a/fail2ban/server/filter.py b/fail2ban/server/filter.py
index 7d1bcbaf..47e87a83 100644
--- a/fail2ban/server/filter.py
+++ b/fail2ban/server/filter.py
@@ -205,7 +205,7 @@ class Filter(JailThread):
 		elif pattern.upper() == "EPOCH":
 			template = DateEpoch()
 			template.setName("Epoch")
-		elif patter.upper() == "TAI64N":
+		elif pattern.upper() == "TAI64N":
 			template = DateTai64n()
 			template.setName("TAI64N")
 		else:
@@ -233,10 +233,10 @@ class Filter(JailThread):
 		elif len(templates) == 1:
 			if hasattr(templates[0], "getPattern"):
 				pattern =  templates[0].getPattern()
+				if templates[0].getRegex()[0] == "^":
+					pattern = "^" + pattern
 			else:
 				pattern = None
-			if templates[0].getRegex()[0] == "^":
-				pattern = "^" + pattern
 			return pattern, templates[0].getName()
 
 	##
diff --git a/fail2ban/tests/servertestcase.py b/fail2ban/tests/servertestcase.py
index 2e8c23c9..dfd59ee8 100644
--- a/fail2ban/tests/servertestcase.py
+++ b/fail2ban/tests/servertestcase.py
@@ -239,6 +239,12 @@ class Transmitter(TransmitterBase):
 		self.setGetTest("datepattern", "%%%Y%m%d%H%M%S",
 			("%%%Y%m%d%H%M%S", "%YearMonthDay24hourMinuteSecond"),
 			jail=self.jailName)
+		self.setGetTest(
+			"datepattern", "Epoch", (None, "Epoch"), jail=self.jailName)
+		self.setGetTest(
+			"datepattern", "TAI64N", (None, "TAI64N"), jail=self.jailName)
+		self.setGetTest(
+			"datepattern", "ISO8601", (None, "ISO8601"), jail=self.jailName)
 		self.setGetTestNOK("datepattern", "%Cat%a%%%g", jail=self.jailName)
 
 	def testJailUseDNS(self):