Handle empty token with complete GSSAPI context
This fixes a potential traceback when we try to unwrap(None). Tested-by: Stefan Hajnoczi <stefanha@redhat.com> Signed-off-by: Robbie Harwood <rharwood@redhat.com> Signed-off-by: Nicolas Sebrecht <nicolas.s-dev@laposte.net>
This commit is contained in:
parent
a51064e83a
commit
096aa07650
@ -292,6 +292,13 @@ class IMAPServer(object):
|
|||||||
if not self.gss_vc.complete:
|
if not self.gss_vc.complete:
|
||||||
response = self.gss_vc.step(token)
|
response = self.gss_vc.step(token)
|
||||||
return response if response else ""
|
return response if response else ""
|
||||||
|
elif token is None:
|
||||||
|
# uh... context is complete, so there's no negotiation we can
|
||||||
|
# do. But we also don't have a token, so we can't send any
|
||||||
|
# kind of response. Empirically, some (but not all) servers
|
||||||
|
# seem to put us in this state, and seem fine with getting no
|
||||||
|
# GSSAPI content in response, so give it to them.
|
||||||
|
return ""
|
||||||
|
|
||||||
# Don't bother checking qop because we're over a TLS channel
|
# Don't bother checking qop because we're over a TLS channel
|
||||||
# already. But hey, if some server started encrypting tomorrow,
|
# already. But hey, if some server started encrypting tomorrow,
|
||||||
|
Loading…
Reference in New Issue
Block a user