Merge pull request #830 from sebres/_tent/cache-config-read-fix1

fix: fail2ban-regex with filter file failed

fail2ban/client/configreader.py

@@ -77,7 +77,7 @@ class ConfigReader():
 	  """
 		# already shared ?
 		if not self._cfg:
-			self.touch(name)
+			self._create_unshared(name)
 		# performance feature - read once if using shared config reader:
 		if once and self._cfg.read_cfg_files is not None:
 			return self._cfg.read_cfg_files
@@ -90,7 +90,7 @@ class ConfigReader():
 		self._cfg.read_cfg_files = ret
 		return ret
 
-	def touch(self, name=''):
+	def _create_unshared(self, name=''):
 		""" Allocates and share a config file by it name.
 
 	  Automatically allocates unshared or reuses shared handle by given 'name' and 
@@ -267,7 +267,9 @@ class DefinitionInitConfigReader(ConfigReader):
 
 	# needed for fail2ban-regex that doesn't need fancy directories
 	def readexplicit(self):
-		return SafeConfigParserWithIncludes.read(self, self._file)
+		if not self._cfg:
+			self._create_unshared(self._file)
+		return SafeConfigParserWithIncludes.read(self._cfg, self._file)
 	
 	def getOptions(self, pOpts):
 		self._opts = ConfigReader.getOptions(

fail2ban/tests/actiontestcase.py

@@ -186,8 +186,10 @@ class CommandActionTest(LogCaptureTestCase):
 		# Should take a minute
 		self.assertRaises(
 			RuntimeError, CommandAction.executeCmd, 'sleep 60', timeout=2)
-		self.assertAlmostEqual(time.time() - stime, 2, places=0)
-		self.assertTrue(self._is_logged('sleep 60 -- timed out after 2 seconds'))
+		# give a test still 1 second, because system could be too busy
+		self.assertTrue(time.time() >= stime + 2 and time.time() <= stime + 3)
+		self.assertTrue(self._is_logged('sleep 60 -- timed out after 2 seconds') 
+			or self._is_logged('sleep 60 -- timed out after 3 seconds'))
 		self.assertTrue(self._is_logged('sleep 60 -- killed with SIGTERM'))
 
 	def testCaptureStdOutErr(self):

fail2ban/tests/clientreadertestcase.py

@@ -334,6 +334,22 @@ class FilterReaderTest(unittest.TestCase):
 		filterReader.getOptions(None)
 		self.assertRaises(ValueError, FilterReader.convert, filterReader)
 
+	def testFilterReaderExplicit(self):
+		# read explicit uses absolute path:
+		path_ = os.path.abspath(os.path.join(TEST_FILES_DIR, "filter.d"))
+		filterReader = FilterReader(os.path.join(path_, "testcase01.conf"), "testcase01", {})
+		self.assertEqual(filterReader.readexplicit(), 
+			[os.path.join(path_, "testcase-common.conf"), os.path.join(path_, "testcase01.conf")]
+		)
+		try:
+			filterReader.getOptions(None)
+			# from included common
+			filterReader.get('Definition', '__prefix_line')
+			# from testcase01
+			filterReader.get('Definition', 'failregex')
+			filterReader.get('Definition', 'ignoreregex')
+		except Exception, e: # pragma: no cover - failed if reachable
+			self.fail('unexpected options after readexplicit: %s' % (e))
 
 class JailsReaderTestCache(LogCaptureTestCase):