jshiffer/slixmpp
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge pull request #292 from 4gra/develop

Browse Source 
Fix support for jabberd2 with GSSAPI
This commit is contained in:
Lance Stout 2014-05-16 08:43:26 -07:00
commit 6ecc39b816
2 changed files with 6 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
sleekxmpp/features/feature_mechanisms/mechanisms.py
View File

@ -215,6 +215,8 @@ class FeatureMechanisms(BasePlugin):
self.attempted_mechs.add(self.mech.name) self.attempted_mechs.add(self.mech.name)
self.xmpp.disconnect() self.xmpp.disconnect()
else: else:
if resp.get_value() == '':
resp.del_value()
resp.send(now=True) resp.send(now=True)
def _handle_success(self, stanza): def _handle_success(self, stanza):

5
sleekxmpp/util/sasl/mechanisms.py
View File

@ -532,6 +532,9 @@ else:
result = kerberos.authGSSClientStep(self.gss, b64_challenge) result = kerberos.authGSSClientStep(self.gss, b64_challenge)
if result != kerberos.AUTH_GSS_CONTINUE: if result != kerberos.AUTH_GSS_CONTINUE:
self.step = 1 self.step = 1
elif not challenge:
kerberos.authGSSClientClean(self.gss)
return b''
elif self.step == 1: elif self.step == 1:
username = self.credentials['username'] username = self.credentials['username']
@ -541,7 +544,7 @@ else:
resp = kerberos.authGSSClientResponse(self.gss) resp = kerberos.authGSSClientResponse(self.gss)
except kerberos.GSSError as e: except kerberos.GSSError as e:
raise SASLCancelled('Kerberos error: %s' % e.message) raise SASLCancelled('Kerberos error: %s' % e)
if not resp: if not resp:
return b'' return b''
else: else: