pep/slixmpp
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages 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
Show stats Download patch file Download diff file Expand all files Collapse all files

7
sleekxmpp/basexmpp.py
View file

@ -68,7 +68,12 @@ class BaseXMPP(XMLStream):
#: An identifier for the stream as given by the server. #: An identifier for the stream as given by the server.
self.stream_id = None self.stream_id = None
#: The JabberID (JID) used by this connection. #: The JabberID (JID) requested for this connection.
self.requested_jid = JID(jid)
#: The JabberID (JID) used by this connection,
#: as set after session binding. This may even be a
#: different bare JID than what was requested.
self.boundjid = JID(jid) self.boundjid = JID(jid)
self._expected_server_name = self.boundjid.host self._expected_server_name = self.boundjid.host

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

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