Revision: 752
http://fail2ban.svn.sourceforge.net/fail2ban/?rev=752&view=rev
Author: lostcontrol
Date: 2009-09-01 21:21:30 +0000 (Tue, 01 Sep 2009)
Log Message:
-----------
- Check the inode number for rotation in addition to checking the first line of the file. Thanks to Jonathan Kamens.
- Red Hat Bugzilla - Bug 503852
- SF.net Bug #2800279.
Modified Paths:
--------------
branches/FAIL2BAN-0_8/server/filter.py
Modified: branches/FAIL2BAN-0_8/server/filter.py
===================================================================
--- branches/FAIL2BAN-0_8/server/filter.py 2009-09-01 20:25:32 UTC (rev 751)
+++ branches/FAIL2BAN-0_8/server/filter.py 2009-09-01 21:21:30 UTC (rev 752)
@@ -31,7 +31,7 @@
from mytime import MyTime
from failregex import FailRegex, Regex, RegexException
-import logging, re
+import logging, re, os
# Gets the instance of the logger.
logSys = logging.getLogger("fail2ban.filter")
@@ -449,6 +449,8 @@
self.__handler = None
# Try to open the file. Raises an exception if an error occured.
handler = open(filename)
+ stats = os.fstat(handler.fileno())
+ self.__ino = stats.st_ino
try:
firstLine = handler.readline()
# Computes the MD5 of the first line.
@@ -470,10 +472,12 @@
firstLine = self.__handler.readline()
# Computes the MD5 of the first line.
myHash = md5.new(firstLine).digest()
- # Compare hash.
- if not self.__hash == myHash:
+ stats = os.fstat(self.__handler.fileno())
+ # Compare hash and inode
+ if self.__hash != myHash or self.__ino != stats.st_ino:
logSys.info("Log rotation detected for %s" % self.__filename)
self.__hash = myHash
+ self.__ino = stats.st_ino
self.__pos = 0
# Sets the file pointer to the last position.
self.__handler.seek(self.__pos)
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
