/!\ this is a huge commit /!\ starting from this commit, SàT is needs Python 3.6+ /!\ SàT maybe be instable or some feature may not work anymore, this will improve with time This patch port backend, bridge and frontends to Python 3. Roughly this has been done this way: - 2to3 tools has been applied (with python 3.7) - all references to python2 have been replaced with python3 (notably shebangs) - fixed files not handled by 2to3 (notably the shell script) - several manual fixes - fixed issues reported by Python 3 that where not handled in Python 2 - replaced "async" with "async_" when needed (it's a reserved word from Python 3.7) - replaced zope's "implements" with @implementer decorator - temporary hack to handle data pickled in database, as str or bytes may be returned, to be checked later - fixed hash comparison for password - removed some code which is not needed anymore with Python 3 - deactivated some code which needs to be checked (notably certificate validation) - tested with jp, fixed reported issues until some basic commands worked - ported Primitivus (after porting dependencies like urwid satext) - more manual fixes
171 lines
5.6 KiB
Python
171 lines
5.6 KiB
Python
import copy
|
||
from twisted.words.protocols.jabber import xmlstream, sasl, client as tclient, jid
|
||
from twisted.internet import ssl
|
||
from wokkel import client
|
||
from sat.core.constants import Const as C
|
||
from sat.core.log import getLogger
|
||
|
||
log = getLogger(__name__)
|
||
|
||
"""This module apply monkey patches to Twisted and Wokkel
|
||
First part handle certificate validation during XMPP connectionand are temporary
|
||
(until merged upstream).
|
||
Second part add a trigger point to send and onElement method of XmlStream
|
||
"""
|
||
|
||
|
||
## certificate validation patches
|
||
|
||
class TLSInitiatingInitializer(xmlstream.TLSInitiatingInitializer):
|
||
check_certificate = True
|
||
|
||
def onProceed(self, obj):
|
||
self.xmlstream.removeObserver('/failure', self.onFailure)
|
||
trustRoot = ssl.platformTrust() if self.check_certificate else None
|
||
ctx = ssl.CertificateOptions(trustRoot=trustRoot)
|
||
self.xmlstream.transport.startTLS(ctx)
|
||
self.xmlstream.reset()
|
||
self.xmlstream.sendHeader()
|
||
self._deferred.callback(xmlstream.Reset)
|
||
|
||
|
||
class XMPPClient(client.XMPPClient):
|
||
|
||
def __init__(self, jid, password, host=None, port=5222,
|
||
check_certificate=True):
|
||
self.jid = jid
|
||
self.domain = jid.host.encode('idna')
|
||
self.host = host
|
||
self.port = port
|
||
|
||
factory = HybridClientFactory(
|
||
jid, password, check_certificate=check_certificate)
|
||
|
||
client.StreamManager.__init__(self, factory)
|
||
|
||
|
||
def HybridClientFactory(jid, password, check_certificate=True):
|
||
a = HybridAuthenticator(jid, password, check_certificate)
|
||
|
||
return xmlstream.XmlStreamFactory(a)
|
||
|
||
|
||
class HybridAuthenticator(client.HybridAuthenticator):
|
||
res_binding = True
|
||
|
||
def __init__(self, jid, password, check_certificate):
|
||
xmlstream.ConnectAuthenticator.__init__(self, jid.host)
|
||
self.jid = jid
|
||
self.password = password
|
||
self.check_certificate = check_certificate
|
||
|
||
def associateWithStream(self, xs):
|
||
xmlstream.ConnectAuthenticator.associateWithStream(self, xs)
|
||
|
||
tlsInit = xmlstream.TLSInitiatingInitializer(xs)
|
||
tlsInit.check_certificate = self.check_certificate
|
||
xs.initializers = [client.client.CheckVersionInitializer(xs),
|
||
tlsInit,
|
||
CheckAuthInitializer(xs, self.res_binding)]
|
||
|
||
|
||
# XmlStream triggers
|
||
|
||
|
||
class XmlStream(xmlstream.XmlStream):
|
||
"""XmlStream which allows to add hooks"""
|
||
|
||
def __init__(self, authenticator):
|
||
xmlstream.XmlStream.__init__(self, authenticator)
|
||
# hooks at this level should not modify content
|
||
# so it's not needed to handle priority as with triggers
|
||
self._onElementHooks = []
|
||
self._sendHooks = []
|
||
|
||
def addHook(self, hook_type, callback):
|
||
"""Add a send or receive hook"""
|
||
conflict_msg = ("Hook conflict: can't add {hook_type} hook {callback}"
|
||
.format(hook_type=hook_type, callback=callback))
|
||
if hook_type == C.STREAM_HOOK_RECEIVE:
|
||
if callback not in self._onElementHooks:
|
||
self._onElementHooks.append(callback)
|
||
else:
|
||
log.warning(conflict_msg)
|
||
elif hook_type == C.STREAM_HOOK_SEND:
|
||
if callback not in self._sendHooks:
|
||
self._sendHooks.append(callback)
|
||
else:
|
||
log.warning(conflict_msg)
|
||
else:
|
||
raise ValueError("Invalid hook type: {hook_type}"
|
||
.format(hook_type=hook_type))
|
||
|
||
def onElement(self, element):
|
||
for hook in self._onElementHooks:
|
||
hook(element)
|
||
xmlstream.XmlStream.onElement(self, element)
|
||
|
||
def send(self, obj):
|
||
for hook in self._sendHooks:
|
||
hook(obj)
|
||
xmlstream.XmlStream.send(self, obj)
|
||
|
||
|
||
# Binding activation (needed for stream management, XEP-0198)
|
||
|
||
|
||
class CheckAuthInitializer(client.CheckAuthInitializer):
|
||
|
||
def __init__(self, xs, res_binding):
|
||
super(CheckAuthInitializer, self).__init__(xs)
|
||
self.res_binding = res_binding
|
||
|
||
def initialize(self):
|
||
# XXX: modification of client.CheckAuthInitializer which has optional
|
||
# resource binding, and which doesn't do deprecated
|
||
# SessionInitializer
|
||
if (sasl.NS_XMPP_SASL, 'mechanisms') in self.xmlstream.features:
|
||
inits = [(sasl.SASLInitiatingInitializer, True)]
|
||
if self.res_binding:
|
||
inits.append((tclient.BindInitializer, True)),
|
||
|
||
for initClass, required in inits:
|
||
init = initClass(self.xmlstream)
|
||
init.required = required
|
||
self.xmlstream.initializers.append(init)
|
||
elif (tclient.NS_IQ_AUTH_FEATURE, 'auth') in self.xmlstream.features:
|
||
self.xmlstream.initializers.append(
|
||
tclient.IQAuthInitializer(self.xmlstream))
|
||
else:
|
||
raise Exception("No available authentication method found")
|
||
|
||
|
||
# jid fix
|
||
|
||
def internJID(jidstring):
|
||
"""
|
||
Return interned JID.
|
||
|
||
@rtype: L{JID}
|
||
"""
|
||
# XXX: this interJID return a copy of the cached jid
|
||
# this avoid modification of cached jid as JID is mutable
|
||
# TODO: propose this upstream
|
||
|
||
if jidstring in jid.__internJIDs:
|
||
return copy.copy(jid.__internJIDs[jidstring])
|
||
else:
|
||
j = jid.JID(jidstring)
|
||
jid.__internJIDs[jidstring] = j
|
||
return copy.copy(j)
|
||
|
||
|
||
def apply():
|
||
# FIXME: certificate validation is now implemented in Twisted trunk, to be removed
|
||
# # certificate validation
|
||
# xmlstream.TLSInitiatingInitializer = TLSInitiatingInitializer
|
||
# client.XMPPClient = XMPPClient
|
||
# XmlStream triggers
|
||
xmlstream.XmlStreamFactory.protocol = XmlStream
|
||
# jid fix
|
||
jid.internJID = internJID
|