mirror of https://github.com/fail2ban/fail2ban
-----BEGIN PGP SIGNATURE----- Version: GnuPG v1.4.12 (GNU/Linux) iEYEABECAAYFAlGRBZ8ACgkQjRFFY3XAJMhqzwCgvUsrv6cSjo1d8YCQUA8Na0Kk 44QAoKk7X2sqFM+wvj2vK3stsHa/80qm =iBfR -----END PGP SIGNATURE----- Merge tag '0.8.9' into 0.9 (quite a bit of conflicts "resolved") Release 0.8.9 * tag '0.8.9': BF: add missing files to MANIFEST (I think we shoult not rely on sdist anyways -- 'git tag' tarballs are more thorough ;) ) All the (version) updates for the release of 0.8.9 BF: (travis) relax the test for needed to be presented installed directories -- allow new BF: (travis) if tests ran under coverage -- there is a traceback parts to report (thus > would be present) ENH: also print the failing traceback line in case of failure ENH: include explicit list of new files which should not be there upon "install --root" ENH: now we know that logging handlers closing was still buggy in 2.6.2 ENH: issue a warning if jail name is longer than 19 symbols (Close #222) DOC: inline commends with ';' are in effect only if ';' follows as space BF: Fix for filterpoll incorrectly checking for jailless state ENH: strengthen detection of working pyinotify ENH: use the same python executable for setup.py test ENH: actually tune up TraceBack to determine "unittest" portions of the stack across all python releases TST: Some primarily smoke tests for tests utils TST: cover few more lines in fail2banreader.py ENH: basic test for setup.py itself (when applicable, should greatly improve coverage ;) ) ENH: consistent operation of formatExceptionInfo + unittest for it ENH: point to the status of master branch on travis Conflicts: ChangeLog MANIFEST README.md fail2ban/version.py -- all of the above obvious version changes below files primarily needed just a bit of help in resolution config/jail.conf fail2ban/server/filterpoll.py fail2ban/server/server.py fail2ban/tests/servertestcase.py and following were more difficult -- git wasn't able to track renames/moves of the code fail2ban-testcases -- needed to introduce those changes to tests/utils.py testcases/clientreadertestcase.py -- manually applied patch from master testcases/utils.py -- manually applied patch from masterpull/224/merge
Yaroslav Halchenko
12 years ago
commit
f5a8a8ac7c
@ -0,0 +1,169 @@
|
|||||||
|
# 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__ = "Yaroslav Halchenko"
|
||||||
|
__copyright__ = "Copyright (c) 2013 Yaroslav Halchenko"
|
||||||
|
__license__ = "GPL"
|
||||||
|
|
||||||
|
import logging
|
||||||
|
import os, sys, unittest
|
||||||
|
import tempfile
|
||||||
|
import shutil
|
||||||
|
|
||||||
|
from glob import glob
|
||||||
|
|
||||||
|
from utils import mbasename, TraceBack, FormatterWithTraceBack
|
||||||
|
from fail2ban.helpers import formatExceptionInfo
|
||||||
|
|
||||||
|
class HelpersTest(unittest.TestCase):
|
||||||
|
|
||||||
|
def testFormatExceptionInfoBasic(self):
|
||||||
|
try:
|
||||||
|
raise ValueError("Very bad exception")
|
||||||
|
except:
|
||||||
|
name, args = formatExceptionInfo()
|
||||||
|
self.assertEqual(name, "ValueError")
|
||||||
|
self.assertEqual(args, "Very bad exception")
|
||||||
|
|
||||||
|
def testFormatExceptionConvertArgs(self):
|
||||||
|
try:
|
||||||
|
raise ValueError("Very bad", None)
|
||||||
|
except:
|
||||||
|
name, args = formatExceptionInfo()
|
||||||
|
self.assertEqual(name, "ValueError")
|
||||||
|
# might be fragile due to ' vs "
|
||||||
|
self.assertEqual(args, "('Very bad', None)")
|
||||||
|
|
||||||
|
# based on
|
||||||
|
# http://stackoverflow.com/questions/2186525/use-a-glob-to-find-files-recursively-in-python
|
||||||
|
def recursive_glob(treeroot, pattern):
|
||||||
|
import fnmatch, os
|
||||||
|
results = []
|
||||||
|
for base, dirs, files in os.walk(treeroot):
|
||||||
|
goodfiles = fnmatch.filter(dirs + files, pattern)
|
||||||
|
results.extend(os.path.join(base, f) for f in goodfiles)
|
||||||
|
return results
|
||||||
|
|
||||||
|
class SetupTest(unittest.TestCase):
|
||||||
|
|
||||||
|
def setUp(self):
|
||||||
|
setup = os.path.join(os.path.dirname(__file__), '..', 'setup.py')
|
||||||
|
self.setup = os.path.exists(setup) and setup or None
|
||||||
|
if not self.setup and sys.version_info >= (2,7): # running not out of the source
|
||||||
|
raise unittest.SkipTest(
|
||||||
|
"Seems to be running not out of source distribution"
|
||||||
|
" -- cannot locate setup.py")
|
||||||
|
|
||||||
|
def testSetupInstallRoot(self):
|
||||||
|
if not self.setup: return # if verbose skip didn't work out
|
||||||
|
tmp = tempfile.mkdtemp()
|
||||||
|
os.system("%s %s install --root=%s >/dev/null"
|
||||||
|
% (sys.executable, self.setup, tmp))
|
||||||
|
|
||||||
|
def addpath(l):
|
||||||
|
return [os.path.join(tmp, x) for x in l]
|
||||||
|
|
||||||
|
def strippath(l):
|
||||||
|
return [x[len(tmp)+1:] for x in l]
|
||||||
|
|
||||||
|
got = strippath(sorted(glob('%s/*' % tmp)))
|
||||||
|
need = ['etc', 'usr', 'var']
|
||||||
|
|
||||||
|
# if anything is missing
|
||||||
|
if set(need).difference(got):
|
||||||
|
# below code was actually to print out not missing but
|
||||||
|
# rather files in 'excess'. Left in place in case we
|
||||||
|
# decide to revert to such more strict test
|
||||||
|
files = {}
|
||||||
|
for missing in set(got).difference(need):
|
||||||
|
missing_full = os.path.join(tmp, missing)
|
||||||
|
files[missing] = os.path.exists(missing_full) \
|
||||||
|
and strippath(recursive_glob(missing_full, '*')) or None
|
||||||
|
|
||||||
|
self.assertEqual(
|
||||||
|
got, need,
|
||||||
|
msg="Got: %s Needed: %s under %s. Files under new paths: %s"
|
||||||
|
% (got, need, tmp, files))
|
||||||
|
|
||||||
|
# Assure presence of some files we expect to see in the installation
|
||||||
|
for f in ('etc/fail2ban/fail2ban.conf',
|
||||||
|
'etc/fail2ban/jail.conf'):
|
||||||
|
self.assertTrue(os.path.exists(os.path.join(tmp, f)),
|
||||||
|
msg="Can't find %s" % f)
|
||||||
|
|
||||||
|
# clean up
|
||||||
|
shutil.rmtree(tmp)
|
||||||
|
|
||||||
|
class TestsUtilsTest(unittest.TestCase):
|
||||||
|
|
||||||
|
def testmbasename(self):
|
||||||
|
self.assertEqual(mbasename("sample.py"), 'sample')
|
||||||
|
self.assertEqual(mbasename("/long/path/sample.py"), 'sample')
|
||||||
|
# this one would include only the directory for the __init__ and base files
|
||||||
|
self.assertEqual(mbasename("/long/path/__init__.py"), 'path.__init__')
|
||||||
|
self.assertEqual(mbasename("/long/path/base.py"), 'path.base')
|
||||||
|
self.assertEqual(mbasename("/long/path/base"), 'path.base')
|
||||||
|
|
||||||
|
def testTraceBack(self):
|
||||||
|
# pretty much just a smoke test since tests runners swallow all the detail
|
||||||
|
|
||||||
|
for compress in True, False:
|
||||||
|
tb = TraceBack(compress=compress)
|
||||||
|
|
||||||
|
def func_raise():
|
||||||
|
raise ValueError()
|
||||||
|
|
||||||
|
def deep_function(i):
|
||||||
|
if i: deep_function(i-1)
|
||||||
|
else: func_raise()
|
||||||
|
|
||||||
|
try:
|
||||||
|
print deep_function(3)
|
||||||
|
except ValueError:
|
||||||
|
s = tb()
|
||||||
|
|
||||||
|
# if we run it through 'coverage' (e.g. on travis) then we
|
||||||
|
# would get a traceback
|
||||||
|
if 'coverage' in s:
|
||||||
|
self.assertTrue('>' in s, msg="no '>' in %r" % s)
|
||||||
|
else:
|
||||||
|
self.assertFalse('>' in s, msg="'>' present in %r" % s) # There is only "fail2ban-testcases" in this case, no true traceback
|
||||||
|
self.assertTrue(':' in s, msg="no ':' in %r" % s)
|
||||||
|
|
||||||
|
|
||||||
|
def testFormatterWithTraceBack(self):
|
||||||
|
from StringIO import StringIO
|
||||||
|
strout = StringIO()
|
||||||
|
Formatter = FormatterWithTraceBack
|
||||||
|
|
||||||
|
# and both types of traceback at once
|
||||||
|
fmt = ' %(tb)s | %(tbc)s : %(message)s'
|
||||||
|
logSys = logging.getLogger("fail2ban_tests")
|
||||||
|
out = logging.StreamHandler(strout)
|
||||||
|
out.setFormatter(Formatter(fmt))
|
||||||
|
logSys.addHandler(out)
|
||||||
|
logSys.error("XXX")
|
||||||
|
|
||||||
|
s = strout.getvalue()
|
||||||
|
self.assertTrue(s.rstrip().endswith(': XXX'))
|
||||||
|
pindex = s.index('|')
|
||||||
|
|
||||||
|
# in this case compressed and not should be the same (?)
|
||||||
|
self.assertTrue(pindex > 10) # we should have some traceback
|
||||||
|
self.assertEqual(s[:pindex], s[pindex+1:pindex*2 + 1])
|
||||||
Loading…
Reference in new issue