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
This commit is contained in:
Goffi 2019-08-13 19:08:41 +02:00
commit fbfe96c505

View file

@ -1,4 +1,4 @@
#!/usr/bin/env python2
#!/usr/bin/env python3
# -*- coding: utf-8 -*-
# SAT plugin for Explicit Message Encryption
@ -25,21 +25,21 @@ from twisted.words.protocols.jabber import jid
log = getLogger(__name__)
PLUGIN_INFO = {
C.PI_NAME: u"Explicit Message Encryption",
C.PI_IMPORT_NAME: u"XEP-0380",
C.PI_TYPE: u"SEC",
C.PI_PROTOCOLS: [u"XEP-0380"],
C.PI_NAME: "Explicit Message Encryption",
C.PI_IMPORT_NAME: "XEP-0380",
C.PI_TYPE: "SEC",
C.PI_PROTOCOLS: ["XEP-0380"],
C.PI_DEPENDENCIES: [],
C.PI_MAIN: u"XEP_0380",
C.PI_HANDLER: u"no",
C.PI_DESCRIPTION: _(u"""Implementation of Explicit Message Encryption"""),
C.PI_MAIN: "XEP_0380",
C.PI_HANDLER: "no",
C.PI_DESCRIPTION: _("""Implementation of Explicit Message Encryption"""),
}
NS_EME = u"urn:xmpp:eme:0"
NS_EME = "urn:xmpp:eme:0"
KNOWN_NAMESPACES = {
u"urn:xmpp:otr:0": u"OTR",
u"jabber:x:encrypted": u"Legacy OpenPGP",
u"urn:xmpp:openpgp:0": u"OpenPGP for XMPP",
"urn:xmpp:otr:0": "OTR",
"jabber:x:encrypted": "Legacy OpenPGP",
"urn:xmpp:openpgp:0": "OpenPGP for XMPP",
}
@ -49,14 +49,14 @@ class XEP_0380(object):
self.host = host
host.trigger.add("sendMessage", self._sendMessageTrigger)
host.trigger.add("MessageReceived", self._MessageReceivedTrigger, priority=100)
host.registerNamespace(u"eme", NS_EME)
host.registerNamespace("eme", NS_EME)
def _addEMEElement(self, mess_data, namespace, name):
message_elt = mess_data[u'xml']
encryption_elt = message_elt.addElement((NS_EME, u'encryption'))
encryption_elt[u'namespace'] = namespace
message_elt = mess_data['xml']
encryption_elt = message_elt.addElement((NS_EME, 'encryption'))
encryption_elt['namespace'] = namespace
if name is not None:
encryption_elt[u'name'] = name
encryption_elt['name'] = name
return mess_data
def _sendMessageTrigger(self, client, mess_data, __, post_xml_treatments):
@ -64,7 +64,7 @@ class XEP_0380(object):
if encryption is not None:
namespace = encryption['plugin'].namespace
if namespace not in KNOWN_NAMESPACES:
name = encryption[u'plugin'].name
name = encryption['plugin'].name
else:
name = None
post_xml_treatments.addCallback(
@ -73,7 +73,7 @@ class XEP_0380(object):
def _MessageReceivedTrigger(self, client, message_elt, post_treat):
try:
encryption_elt = next(message_elt.elements(NS_EME, u'encryption'))
encryption_elt = next(message_elt.elements(NS_EME, 'encryption'))
except StopIteration:
return True
@ -82,20 +82,20 @@ class XEP_0380(object):
# message is encrypted and we can decrypt it
return True
name = KNOWN_NAMESPACES.get(namespace, encryption_elt.getAttribute(u"name"))
name = KNOWN_NAMESPACES.get(namespace, encryption_elt.getAttribute("name"))
# at this point, message is encrypted but we know that we can't decrypt it,
# we need to notify the user
sender_s = message_elt[u'from']
to_jid = jid.JID(message_elt[u'from'])
algorithm = u"{} [{}]".format(name, namespace) if name else namespace
sender_s = message_elt['from']
to_jid = jid.JID(message_elt['from'])
algorithm = "{} [{}]".format(name, namespace) if name else namespace
log.warning(
_(u"Message from {sender} is encrypted with {algorithm} and we can't "
u"decrypt it.".format(sender=message_elt['from'], algorithm=algorithm)))
_("Message from {sender} is encrypted with {algorithm} and we can't "
"decrypt it.".format(sender=message_elt['from'], algorithm=algorithm)))
user_msg = D_(
u"User {sender} sent you an encrypted message (encrypted with {algorithm}), "
u"and we can't decrypt it.").format(sender=sender_s, algorithm=algorithm)
"User {sender} sent you an encrypted message (encrypted with {algorithm}), "
"and we can't decrypt it.").format(sender=sender_s, algorithm=algorithm)
extra = {C.MESS_EXTRA_INFO: C.EXTRA_INFO_DECR_ERR}
client.feedback(to_jid, user_msg, extra)