tobias/docker-offlineimap
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Added support for sha512, sha384, sha256, sha224 hashing algorithms to calculate server certificate fingerprints.

Browse Source 
Signed-off-by: velleto <rr@velleto.com>
Signed-off-by: Nicolas Sebrecht <nicolas.s-dev@laposte.net>
This commit is contained in:
velleto 2018-05-14 00:20:37 +02:00 committed by Nicolas Sebrecht
parent db4a5e149f
commit b150daaa49
1 changed files with 7 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
offlineimap/imaplibutil.py
View File

@ -23,7 +23,7 @@ import socket
import errno import errno
import zlib import zlib
from sys import exc_info from sys import exc_info
from hashlib import sha1 from hashlib import sha512, sha384, sha256, sha224, sha1
import six import six
@ -201,15 +201,18 @@ class WrappedIMAP4_SSL(UsefulIMAPMixIn, IMAP4_SSL):
"having SSL helps nothing.", OfflineImapError.ERROR.REPO) "having SSL helps nothing.", OfflineImapError.ERROR.REPO)
super(WrappedIMAP4_SSL, self).open(host, port) super(WrappedIMAP4_SSL, self).open(host, port)
if self._fingerprint: if self._fingerprint:
server_cert = self.sock.getpeercert(True)
hashes = sha512, sha384, sha256, sha224, sha1
server_fingerprints = [hash(server_cert).hexdigest() for hash in hashes]
# compare fingerprints # compare fingerprints
fingerprint = sha1(self.sock.getpeercert(True)).hexdigest() matches = [(server_fingerprint in self._fingerprint) for server_fingerprint in server_fingerprints]
if fingerprint not in self._fingerprint: if not any(matches):
raise OfflineImapError("Server SSL fingerprint '%s' " raise OfflineImapError("Server SSL fingerprint '%s' "
"for hostname '%s' " "for hostname '%s' "
"does not match configured fingerprint(s) %s. " "does not match configured fingerprint(s) %s. "
"Please verify and set 'cert_fingerprint' accordingly " "Please verify and set 'cert_fingerprint' accordingly "
"if not set yet."% "if not set yet."%
(fingerprint, host, self._fingerprint), (server_fingerprints, host, self._fingerprint),
OfflineImapError.ERROR.REPO) OfflineImapError.ERROR.REPO)