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

Merge branch '0.10' into 0.10-full

pull/1460/head
sebres 2017-05-17 12:24:01 +02:00
parent 6724de54e6 9b83a3128d
commit 54729f9ef3
2 changed files with 17 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
fail2ban/server/filterpyinotify.py
View File

@ -115,7 +115,7 @@ class FilterPyinotify(FileFilter):
# watch was removed for some reasons (log-rotate?): # watch was removed for some reasons (log-rotate?):
if isWD and (assumeNoDir or not os.path.isdir(path)): if isWD and (assumeNoDir or not os.path.isdir(path)):
self._addPending(path, event, isDir=True) self._addPending(path, event, isDir=True)
elif not isWF: elif not isWF: # pragma: no cover (assume too sporadic)
for logpath in self.__watchDirs: for logpath in self.__watchDirs:
if logpath.startswith(path + pathsep) and (assumeNoDir or not os.path.isdir(logpath)): if logpath.startswith(path + pathsep) and (assumeNoDir or not os.path.isdir(logpath)):
self._addPending(logpath, event, isDir=True) self._addPending(logpath, event, isDir=True)
@ -182,14 +182,11 @@ class FilterPyinotify(FileFilter):
logSys.log(logging.MSG, "Log presence detected for %s %s", logSys.log(logging.MSG, "Log presence detected for %s %s",
"directory" if isDir else "file", path) "directory" if isDir else "file", path)
found[path] = isDir found[path] = isDir
for path in found:
try:
del self.__pending[path]
except KeyError: pass
self.__pendingChkTime = time.time() self.__pendingChkTime = time.time()
self.__pendingNextTime = self.__pendingChkTime + minTime self.__pendingNextTime = self.__pendingChkTime + minTime
# process now because we've missed it in monitoring: # process now because we've missed it in monitoring:
for path, isDir in found.iteritems(): for path, isDir in found.iteritems():
self._delPending(path)
# refresh monitoring of this: # refresh monitoring of this:
self._refreshWatcher(path, isDir=isDir) self._refreshWatcher(path, isDir=isDir)
if isDir: if isDir:

17
fail2ban/tests/filtertestcase.py
View File

@ -973,6 +973,7 @@ def get_monitor_failures_testcase(Filter_):
@with_tmpdir @with_tmpdir
def test_move_dir(self, tmp): def test_move_dir(self, tmp):
self.file.close() self.file.close()
self.filter.setMaxRetry(10)
self.filter.delLogPath(self.name) self.filter.delLogPath(self.name)
# if we rename parent dir into a new location (simulate directory-base log rotation) # if we rename parent dir into a new location (simulate directory-base log rotation)
tmpsub1 = os.path.join(tmp, "1") tmpsub1 = os.path.join(tmp, "1")
@ -987,13 +988,25 @@ def get_monitor_failures_testcase(Filter_):
self.file.close() self.file.close()
self._wait4failures(1) self._wait4failures(1)
# rotate whole directory: rename directory 1 as 2: # rotate whole directory: rename directory 1 as 2a:
os.rename(tmpsub1, tmpsub2) os.rename(tmpsub1, tmpsub2 + 'a')
os.mkdir(tmpsub1) os.mkdir(tmpsub1)
self.file = _copy_lines_between_files(GetFailures.FILENAME_01, self.name, self.file = _copy_lines_between_files(GetFailures.FILENAME_01, self.name,
skip=12, n=1, mode='w') skip=12, n=1, mode='w')
self.file.close() self.file.close()
self._wait4failures(2) self._wait4failures(2)
# rotate whole directory: rename directory 1 as 2b:
os.rename(tmpsub1, tmpsub2 + 'b')
# wait a bit in-between (try to increase coverage, should find pending file for pending dir):
self.waitForTicks(2)
os.mkdir(tmpsub1)
self.waitForTicks(2)
self.file = _copy_lines_between_files(GetFailures.FILENAME_01, self.name,
skip=12, n=1, mode='w')
self.file.close()
self._wait4failures(3)
# stop before tmpdir deleted (just prevents many monitor events) # stop before tmpdir deleted (just prevents many monitor events)
self.filter.stop() self.filter.stop()