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

XOAUTH2: don't try this authentication method when not configured

Browse Source 
Checking if we have to run this authentication method once it's already passed
to imaplib2 is too late. Make the checks at correct time, before we try the
authentication method. IOW, before we call

  imapobj.authenticate('XOAUTH2', self.__xoauth2handler)

Github-ref: https://github.com/OfflineIMAP/offlineimap/issues/442
Tested-by: Klemens Schölhorn <klemens@schoelhorn.eu>
Signed-off-by: Nicolas Sebrecht <nicolas.s-dev@laposte.net>
This commit is contained in:
Nicolas Sebrecht 2017-03-15 22:39:41 +01:00
parent 4ac44071b6
commit 39b657194a
1 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
offlineimap/imapserver.py
View File

@ -221,10 +221,6 @@ class IMAPServer(object):
return retval return retval
def __xoauth2handler(self, response): def __xoauth2handler(self, response):
if self.oauth2_refresh_token is None \
and self.oauth2_access_token is None:
return None
if self.oauth2_access_token is None: if self.oauth2_access_token is None:
if self.oauth2_request_url is None: if self.oauth2_request_url is None:
raise OfflineImapError("No remote oauth2_request_url for " raise OfflineImapError("No remote oauth2_request_url for "
@ -353,6 +349,10 @@ class IMAPServer(object):
return True return True
def __authn_xoauth2(self, imapobj): def __authn_xoauth2(self, imapobj):
if self.oauth2_refresh_token is None \
and self.oauth2_access_token is None:
return False
imapobj.authenticate('XOAUTH2', self.__xoauth2handler) imapobj.authenticate('XOAUTH2', self.__xoauth2handler)
return True return True