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

Check for unicode and encode before md5sum in filter

pull/128/merge^2
Steven Hiscocks 2013-02-23 18:47:56 +00:00
parent c926c88ea1
commit 99c92a56ca
1 changed files with 8 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
server/filter.py
View File

@ -526,7 +526,10 @@ class FileContainer:
try: try:
firstLine = handler.readline() firstLine = handler.readline()
# Computes the MD5 of the first line. # Computes the MD5 of the first line.
self.__hash = md5sum(firstLine).digest() if isinstance(firstLine, unicode):
self.__hash = md5sum(firstLine.encode('utf-8')).digest()
else:
self.__hash = md5sum(firstLine).digest()
# Start at the beginning of file if tail mode is off. # Start at the beginning of file if tail mode is off.
if tail: if tail:
handler.seek(0, 2) handler.seek(0, 2)
@ -546,7 +549,10 @@ class FileContainer:
fcntl.fcntl(fd, fcntl.F_SETFD, fd | fcntl.FD_CLOEXEC) fcntl.fcntl(fd, fcntl.F_SETFD, fd | fcntl.FD_CLOEXEC)
firstLine = self.__handler.readline() firstLine = self.__handler.readline()
# Computes the MD5 of the first line. # Computes the MD5 of the first line.
myHash = md5sum(firstLine).digest() if isinstance(firstLine, unicode):
myHash = md5sum(firstLine.encode('utf-8')).digest()
else:
myHash = md5sum(firstLine).digest()
stats = os.fstat(self.__handler.fileno()) stats = os.fstat(self.__handler.fileno())
# Compare hash and inode # Compare hash and inode
if self.__hash != myHash or self.__ino != stats.st_ino: if self.__hash != myHash or self.__ino != stats.st_ino: