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

improve error message when ssl_version must be set due to the tls_level

Browse Source 
Improve the ssl documentation.

Signed-off-by: Nicolas Sebrecht <nicolas.s-dev@laposte.net>
This commit is contained in:
Nicolas Sebrecht 2016-07-25 03:20:53 +02:00
parent c992f58530
commit 03859e89c3
3 changed files with 21 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
offlineimap.conf
View File

@ -753,6 +753,9 @@ remotehost = examplehost
# - ssl3 (less desirable than tls1) # - ssl3 (less desirable than tls1)
# - ssl23 (can fallback up to ssl3) # - ssl23 (can fallback up to ssl3)
# #
# When tls_level is not set to tls_compat, the ssl_version configuration option
# must be explicitly set.
#
#tls_level = tls_compat #tls_level = tls_compat

3
offlineimap/imaplibutil.py
View File

@ -22,10 +22,11 @@ import threading
import socket import socket
import errno import errno
import zlib import zlib
import six
from sys import exc_info from sys import exc_info
from hashlib import sha1 from hashlib import sha1
import six
from offlineimap import OfflineImapError from offlineimap import OfflineImapError
from offlineimap.ui import getglobalui from offlineimap.ui import getglobalui
from offlineimap.virtual_imaplib2 import IMAP4, IMAP4_SSL, InternalDate, Mon2num from offlineimap.virtual_imaplib2 import IMAP4, IMAP4_SSL, InternalDate, Mon2num

27
offlineimap/imapserver.py
View File

@ -20,15 +20,16 @@ import socket
import base64 import base64
import json import json
import urllib import urllib
import socket
import time import time
import errno import errno
import six import socket
from sys import exc_info
from socket import gaierror from socket import gaierror
from sys import exc_info
from ssl import SSLError, cert_time_to_seconds from ssl import SSLError, cert_time_to_seconds
from threading import Lock, BoundedSemaphore, Thread, Event, currentThread from threading import Lock, BoundedSemaphore, Thread, Event, currentThread
import six
import offlineimap.accounts import offlineimap.accounts
from offlineimap import imaplibutil, imaputil, threadutil, OfflineImapError from offlineimap import imaplibutil, imaputil, threadutil, OfflineImapError
from offlineimap.ui import getglobalui from offlineimap.ui import getglobalui
@ -102,10 +103,14 @@ class IMAPServer(object):
if self.sslcacertfile is None: if self.sslcacertfile is None:
self.__verifycert = None # disable cert verification self.__verifycert = None # disable cert verification
self.fingerprint = repos.get_ssl_fingerprint() self.fingerprint = repos.get_ssl_fingerprint()
self.sslversion = repos.getsslversion()
self.tlslevel = repos.gettlslevel() self.tlslevel = repos.gettlslevel()
self.sslversion = repos.getsslversion()
self.starttls = repos.getstarttls() self.starttls = repos.getstarttls()
if self.tlslevel is not "tls_compat" and self.sslversion is None:
raise Exception("When 'tls_version' is not 'tls_compat' "
"the 'ssl_version' must be set explicitly.")
self.oauth2_refresh_token = repos.getoauth2_refresh_token() self.oauth2_refresh_token = repos.getoauth2_refresh_token()
self.oauth2_access_token = repos.getoauth2_access_token() self.oauth2_access_token = repos.getoauth2_access_token()
self.oauth2_client_id = repos.getoauth2_client_id() self.oauth2_client_id = repos.getoauth2_client_id()
@ -494,13 +499,13 @@ class IMAPServer(object):
elif self.usessl: elif self.usessl:
self.ui.connecting(self.hostname, self.port) self.ui.connecting(self.hostname, self.port)
imapobj = imaplibutil.WrappedIMAP4_SSL( imapobj = imaplibutil.WrappedIMAP4_SSL(
self.hostname, host=self.hostname,
self.port, port=self.port,
self.sslclientkey, keyfile=self.sslclientkey,
self.sslclientcert, certfile=self.sslclientcert,
self.sslcacertfile, ca_certs=self.sslcacertfile,
self.__verifycert, cert_verify_cb=self.__verifycert,
self.sslversion, ssl_version=self.sslversion,
timeout=socket.getdefaulttimeout(), timeout=socket.getdefaulttimeout(),
fingerprint=self.fingerprint, fingerprint=self.fingerprint,
use_socket=self.proxied_socket, use_socket=self.proxied_socket,