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

Ensure that auth is done based on the original, requested JID and not on the bound JID.

Browse Source
This commit is contained in:
Lance Stout
2012-08-17 10:17:35 -07:00
parent f0e1fc5aad
commit 8a03bd72ae
2 changed files with 10 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -92,13 +92,13 @@ class FeatureMechanisms(BasePlugin):
values = required_values.union(optional_values)
for value in values:
if value == 'username':
result[value] = self.xmpp.boundjid.user
result[value] = self.xmpp.requested_jid.user
elif value == 'password':
result[value] = creds['password']
elif value == 'authzid':
result[value] = creds.get('authzid', '')
elif value == 'email':
jid = self.xmpp.boundjid.bare
jid = self.xmpp.requested_jid.bare
result[value] = creds.get('email', jid)
elif value == 'channel_binding':
if sys.version_info >= (3, 3):
@@ -106,9 +106,9 @@ class FeatureMechanisms(BasePlugin):
else:
result[value] = None
elif value == 'host':
result[value] = self.xmpp.boundjid.domain
result[value] = self.xmpp.requested_jid.domain
elif value == 'realm':
result[value] = self.xmpp.boundjid.domain
result[value] = self.xmpp.requested_jid.domain
elif value == 'service-name':
result[value] = self.xmpp._service_name
elif value == 'service':