libervia-backend: sat/plugins/plugin_xep

comparison sat/plugins/plugin_xep_0047.py @ 3028:ab2696e34d29

Python 3 port: /!\ 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

author	Goffi <goffi@goffi.org>
date	Tue, 13 Aug 2019 19:08:41 +0200
parents	69e4716d6268
children	9d0df638c8b4

comparison

equal deleted inserted replaced

-:ff5bcb12ae60
+:ab2696e34d29
-#!/usr/bin/env python2
+#!/usr/bin/env python3
 # -*- coding: utf-8 -*-
 # SAT plugin for managing gateways (xep-0047)
 # Copyright (C) 2009-2019 Jérôme Poisson (goffi@goffi.org)
 from twisted.internet import defer
 from twisted.python import failure
 from wokkel import disco, iwokkel
-from zope.interface import implements
+from zope.interface import implementer
 import base64
 try:
 from twisted.words.protocols.xmlstream import XMPPHandler
 @param sid(unicode): session id of client.xep_0047_current_stream
 @param client: %(doc_client)s
 """
 log.info(
-u"In-Band Bytestream: TimeOut reached for id {sid} [{profile}]".format(
+"In-Band Bytestream: TimeOut reached for id {sid} [{profile}]".format(
 sid=sid, profile=client.profile
 )
 )
 self._killSession(sid, client, "TIMEOUT")
 else, will be used to call failure_cb
 """
 try:
 session = client.xep_0047_current_stream[sid]
 except KeyError:
-log.warning(u"kill id called on a non existant id")
+log.warning("kill id called on a non existant id")
 return
 try:
 observer_cb = session["observer_cb"]
 except KeyError:
 @param to_jid(jid.JId): jid of the other peer
 @param sid(unicode): session id
 @return (dict): session data
 """
 if sid in client.xep_0047_current_stream:
-raise exceptions.ConflictError(u"A session with this id already exists !")
+raise exceptions.ConflictError("A session with this id already exists !")
 session_data = client.xep_0047_current_stream[sid] = {
 "id": sid,
 DEFER_KEY: defer.Deferred(),
 "local_jid": local_jid,
 "to": to_jid,
 def _onIBBOpen(self, iq_elt, client):
 """"Called when an IBB <open> element is received
 @param iq_elt(domish.Element): the whole <iq> stanza
 """
-log.debug(_(u"IBB stream opening"))
+log.debug(_("IBB stream opening"))
 iq_elt.handled = True
-open_elt = iq_elt.elements(NS_IBB, "open").next()
+open_elt = next(iq_elt.elements(NS_IBB, "open"))
 block_size = open_elt.getAttribute("block-size")
 sid = open_elt.getAttribute("sid")
 stanza = open_elt.getAttribute("stanza", "iq")
 if not sid or not block_size or int(block_size) > 65535:
 return self._sendError("not-acceptable", sid or None, iq_elt, client)
 if not sid in client.xep_0047_current_stream:
-log.warning(_(u"Ignoring unexpected IBB transfer: %s" % sid))
+log.warning(_("Ignoring unexpected IBB transfer: %s" % sid))
 return self._sendError("not-acceptable", sid or None, iq_elt, client)
 session_data = client.xep_0047_current_stream[sid]
 if session_data["to"] != jid.JID(iq_elt["from"]):
 log.warning(
 _("sended jid inconsistency (man in the middle attack attempt ?)")
 @param iq_elt(domish.Element): the whole <iq> stanza
 """
 iq_elt.handled = True
 log.debug(_("IBB stream closing"))
-close_elt = iq_elt.elements(NS_IBB, "close").next()
+close_elt = next(iq_elt.elements(NS_IBB, "close"))
 # XXX: this observer is only triggered on valid sid, so we don't need to check it
 sid = close_elt["sid"]
 iq_result_elt = xmlstream.toResponse(iq_elt, "result")
 client.send(iq_result_elt)
 Manage the data elelement (check validity and write to the stream_object)
 @param element(domish.Element): <iq> or <message> stanza
 """
 element.handled = True
-data_elt = element.elements(NS_IBB, "data").next()
+data_elt = next(element.elements(NS_IBB, "data"))
 sid = data_elt["sid"]
 try:
 session_data = client.xep_0047_current_stream[sid]
 except KeyError:
-log.warning(_(u"Received data for an unknown session id"))
+log.warning(_("Received data for an unknown session id"))
 return self._sendError("item-not-found", None, element, client)
 from_jid = session_data["to"]
 stream_object = session_data["stream_object"]
 if from_jid.full() != element["from"]:
 log.warning(
 _(
-u"sended jid inconsistency (man in the middle attack attempt ?)\ninitial={initial}\ngiven={given}"
+"sended jid inconsistency (man in the middle attack attempt ?)\ninitial={initial}\ngiven={given}"
 ).format(initial=from_jid, given=element["from"])
 )
 if element.name == "iq":
 self._sendError("not-acceptable", sid, element, client)
 return
 session_data["seq"] = (session_data["seq"] + 1) % 65535
 if int(data_elt.getAttribute("seq", -1)) != session_data["seq"]:
-log.warning(_(u"Sequence error"))
+log.warning(_("Sequence error"))
 if element.name == "iq":
 reason = "not-acceptable"
 self._sendError(reason, sid, element, client)
 self.terminateStream(session_data, client, reason)
 return
 # we can now decode the data
 try:
 stream_object.write(base64.b64decode(str(data_elt)))
 except TypeError:
 # The base64 data is invalid
-log.warning(_(u"Invalid base64 data"))
+log.warning(_("Invalid base64 data"))
 if element.name == "iq":
 self._sendError("not-acceptable", sid, element, client)
 self.terminateStream(session_data, client, reason)
 return
 @param iq_elt(domish.Element): full <iq> stanza
 @param client: %(doc_client)s
 """
 iq_elt = error.StanzaError(error_condition).toResponse(iq_elt)
 log.warning(
-u"Error while managing in-band bytestream session, cancelling: {}".format(
+"Error while managing in-band bytestream session, cancelling: {}".format(
 error_condition
 )
 )
 if sid is not None:
 self._killSession(sid, client, error_condition)
 next_iq_elt = client.IQ()
 next_iq_elt["from"] = session_data["local_jid"].full()
 next_iq_elt["to"] = session_data["to"].full()
 data_elt = next_iq_elt.addElement((NS_IBB, "data"))
 seq = session_data["seq"] = (session_data["seq"] + 1) % 65535
-data_elt["seq"] = unicode(seq)
+data_elt["seq"] = str(seq)
 data_elt["sid"] = session_data["id"]
 data_elt.addContent(base64.b64encode(buffer_))
 args = [session_data, client]
 d = next_iq_elt.send()
 d.addCallbacks(self._IQDataStreamCb, self._IQDataStreamEb, args, None, args)
 else:
 self.terminateStream(session_data, client)
 def _IQDataStreamEb(self, failure, session_data, client):
 if failure.check(error.StanzaError):
-log.warning(u"IBB transfer failed: {}".format(failure.value))
+log.warning("IBB transfer failed: {}".format(failure.value))
 else:
-log.error(u"IBB transfer failed: {}".format(failure.value))
+log.error("IBB transfer failed: {}".format(failure.value))
 self.terminateStream(session_data, client, "IQ_ERROR")
 def terminateStream(self, session_data, client, failure_reason=None):
 """Terminate the stream session
 close_elt["sid"] = session_data["id"]
 iq_elt.send()
 self._killSession(session_data["id"], client, failure_reason)
+@implementer(iwokkel.IDisco)
 class XEP_0047_handler(XMPPHandler):
-implements(iwokkel.IDisco)
 def __init__(self, parent):
 self.plugin_parent = parent
 def connectionInitialized(self):

Mercurial > libervia-backend

comparison sat/plugins/plugin_xep_0047.py @ 3028:ab2696e34d29