Philipp Hörist pushed to branch master at gajim / python-nbxmpp
Commits:
f19ef1d9 by Philipp Hörist at 2019-02-05T19:50:41Z
Support domain based name for GSSAPI
- - - - -
2 changed files:
- nbxmpp/auth.py
- nbxmpp/protocol.py
Changes:
=====================================
nbxmpp/auth.py
=====================================
@@ -29,6 +29,7 @@ from nbxmpp.protocol import Node
from nbxmpp.protocol import NodeProcessed
from nbxmpp.protocol import SASL_ERROR_CONDITIONS
from nbxmpp.protocol import SASL_AUTH_MECHS
+from nbxmpp.protocol import NS_DOMAIN_BASED_NAME
from nbxmpp.util import b64decode
from nbxmpp.util import b64encode
from nbxmpp.const import GSSAPIState
@@ -77,6 +78,7 @@ class SASL(PlugIn):
self._method = None
self._channel_binding = None
+ self._domain_based_name = None
def _setup_mechs(self):
if self._owner.connected in ('ssl', 'tls'):
@@ -139,6 +141,11 @@ class SASL(PlugIn):
log.info('Available mechanisms: %s', available_mechs)
+ hostname = stanza.getTag('hostname', namespace=NS_DOMAIN_BASED_NAME)
+ if hostname is not None:
+ self._domain_based_name = hostname.getData()
+ log.info('Found domain based name: %s', self._domain_based_name)
+
if not available_mechs:
log.error('No available auth mechanisms found')
self._abort_auth('invalid-mechanism')
@@ -192,7 +199,8 @@ class SASL(PlugIn):
elif self._chosen_mechanism == 'GSSAPI':
self._method = GSSAPI(self._owner.Connection)
- self._method.initiate(self._owner.xmpp_hostname)
+ self._method.initiate(self._domain_based_name or
+ self._owner.xmpp_hostname)
else:
log.error('Unknown auth mech')
=====================================
nbxmpp/protocol.py
=====================================
@@ -190,6 +190,7 @@ NS_HASHES_BLAKE2B_256 =
'urn:xmpp:hash-function-text-names:id-blake2b256'
NS_HASHES_BLAKE2B_512 = 'urn:xmpp:hash-function-text-names:id-blake2b512'
NS_OPENPGP = 'urn:xmpp:openpgp:0'
NS_BOOKMARK_CONVERSION = 'urn:xmpp:bookmarks-conversion:0'
+NS_DOMAIN_BASED_NAME = 'urn:xmpp:domain-based-name:1'
#xmpp_stream_error_conditions = '''
#bad-format -- -- -- The entity has sent XML that cannot be processed.
View it on GitLab:
https://dev.gajim.org/gajim/python-nbxmpp/commit/f19ef1d9382670eca23cedc003e9700acb00b30a
--
View it on GitLab:
https://dev.gajim.org/gajim/python-nbxmpp/commit/f19ef1d9382670eca23cedc003e9700acb00b30a
You're receiving this email because of your account on dev.gajim.org.
_______________________________________________
Commits mailing list
[email protected]
https://lists.gajim.org/cgi-bin/listinfo/commits
