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

NF: For action execution, log stdout and stderr if debug or cmd error

pull/190/head
Steven Hiscocks 2013-05-01 21:07:13 +01:00
parent d07df66370
commit c0e8ce5854
2 changed files with 22 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
fail2ban/server/action.py
View File

@ -27,7 +27,7 @@ __date__ = "$Date$"
__copyright__ = "Copyright (c) 2004 Cyril Jaquier" __copyright__ = "Copyright (c) 2004 Cyril Jaquier"
__license__ = "GPL" __license__ = "GPL"
import logging, os, subprocess, time, signal import logging, os, subprocess, time, signal, tempfile
import threading import threading
#from subprocess import call #from subprocess import call
@ -353,8 +353,11 @@ class Action:
logSys.debug(realCmd) logSys.debug(realCmd)
_cmd_lock.acquire() _cmd_lock.acquire()
try: # Try wrapped within another try needed for python version < 2.5 try: # Try wrapped within another try needed for python version < 2.5
stdout = tempfile.TemporaryFile(suffix=".stdout", prefix="fai2ban_")
stderr = tempfile.TemporaryFile(suffix=".stderr", prefix="fai2ban_")
try: try:
popen = subprocess.Popen(realCmd, shell=True) popen = subprocess.Popen(
realCmd, stdout=stdout, stderr=stderr, shell=True)
stime = time.time() stime = time.time()
retcode = popen.poll() retcode = popen.poll()
while time.time() - stime <= timeout and retcode is None: while time.time() - stime <= timeout and retcode is None:
@ -376,6 +379,15 @@ class Action:
finally: finally:
_cmd_lock.release() _cmd_lock.release()
std_level = retcode == 0 and logging.DEBUG or logging.ERROR
if std_level >= logSys.getEffectiveLevel():
stdout.seek(0)
logSys.log(std_level, "%s stdout: %r" % (realCmd, stdout.read()))
stderr.seek(0)
logSys.log(std_level, "%s stderr: %r" % (realCmd, stderr.read()))
stdout.close()
stderr.close()
if retcode == 0: if retcode == 0:
logSys.debug("%s returned successfully" % realCmd) logSys.debug("%s returned successfully" % realCmd)
return True return True

8
fail2ban/tests/actiontestcase.py
View File

@ -103,3 +103,11 @@ class ExecuteAction(unittest.TestCase):
self.assertAlmostEqual(time.time() - stime, 2.1, places=1) self.assertAlmostEqual(time.time() - stime, 2.1, places=1)
self.assertTrue(self._is_logged('sleep 60 timed out after 2 seconds')) self.assertTrue(self._is_logged('sleep 60 timed out after 2 seconds'))
self.assertTrue(self._is_logged('sleep 60 killed with SIGTERM')) self.assertTrue(self._is_logged('sleep 60 killed with SIGTERM'))
def testCaptureStdOutErr(self):
Action.executeCmd('echo "How now brown cow"')
self.assertTrue(self._is_logged("'How now brown cow\\n'"))
Action.executeCmd(
'echo "The rain in Spain stays mainly in the plain" 1>&2')
self.assertTrue(self._is_logged(
"'The rain in Spain stays mainly in the plain\\n'"))