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

learn to disable STARTTLS

Browse Source 
Some servers might have this feature broken.

Github-ref: https://github.com/OfflineIMAP/offlineimap/issues/207
Signed-off-by: Nicolas Sebrecht <nicolas.s-dev@laposte.net>
This commit is contained in:
Nicolas Sebrecht 2016-06-23 03:55:00 +02:00
parent 1410a391bc
commit ac2a547ec4
3 changed files with 21 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
offlineimap.conf
View File

@ -610,6 +610,22 @@ type = IMAP
remotehost = examplehost remotehost = examplehost
# This option stands in the [Repository RemoteExample] section.
#
# Whether or not to use STARTTLS. STARTTLS allows to upgrade a plain connection
# to TLS or SSL after negociation with the server. While a server might pretend
# to support STARTTLS, the communication might not be properly established or
# the secure tunnel might be broken in some way. In this case you might want to
# disable STARTTLS. Unless you hit issues with STARTTLS, you are strongly
# encouraged to keep STARTTLS enabled.
#
# STARTTLS can be used even if the 'ssl' option is disabled.
#
# Default is yes.
#
#starttls = yes
# This option stands in the [Repository RemoteExample] section. # This option stands in the [Repository RemoteExample] section.
# #
# Whether or not to use SSL. # Whether or not to use SSL.

3
offlineimap/imapserver.py
View File

@ -106,6 +106,7 @@ class IMAPServer(object):
self.fingerprint = repos.get_ssl_fingerprint() self.fingerprint = repos.get_ssl_fingerprint()
self.sslversion = repos.getsslversion() self.sslversion = repos.getsslversion()
self.tlslevel = repos.gettlslevel() self.tlslevel = repos.gettlslevel()
self.starttls = repos.getstarttls()
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()
@ -414,7 +415,7 @@ class IMAPServer(object):
# TLS must be initiated before checking capabilities: # TLS must be initiated before checking capabilities:
# they could have been changed after STARTTLS. # they could have been changed after STARTTLS.
if tryTLS and not tried_tls: if tryTLS and self.starttls and not tried_tls:
tried_tls = True tried_tls = True
self.__start_tls(imapobj) self.__start_tls(imapobj)

3
offlineimap/repository/IMAP.py
View File

@ -261,6 +261,9 @@ class IMAPRepository(BaseRepository):
def getsslversion(self): def getsslversion(self):
return self.getconf('ssl_version', None) return self.getconf('ssl_version', None)
def getstarttls(self):
return self.getconfboolean('starttls', True)
def get_ssl_fingerprint(self): def get_ssl_fingerprint(self):
"""Return array of possible certificate fingerprints. """Return array of possible certificate fingerprints.