Mercurial > libervia-backend

diff src/plugins/plugin_sec_otr.py @ 1963:a2bc5089c2eb

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
backend, frontends: message refactoring (huge commit): /!\ several features are temporarily disabled, like notifications in frontends next step in refactoring, with the following changes: - jp: updated jp message to follow changes in backend/bridge - jp: added --lang, --subject, --subject_lang, and --type options to jp message + fixed unicode handling for jid - quick_frontend (QuickApp, QuickChat): - follow backend changes - refactored chat, message are now handled in OrderedDict and uid are kept so they can be updated - Message and Occupant classes handle metadata, so frontend just have to display them - Primitivus (Chat): - follow backend/QuickFrontend changes - info & standard messages are handled in the same MessageWidget class - improved/simplified handling of messages, removed update() method - user joined/left messages are merged when next to each other - a separator is shown when message is received while widget is out of focus, so user can quickly see the new messages - affiliation/role are shown (in a basic way for now) in occupants panel - removed "/me" messages handling, as it will be done by a backend plugin - message language is displayed when available (only one language per message for now) - fixed :history and :search commands - core (constants): new constants for messages type, XML namespace, entity type - core: *Message methods renamed to follow new code sytle (e.g. sendMessageToBridge => messageSendToBridge) - core (messages handling): fixed handling of language - core (messages handling): mes_data['from'] and ['to'] are now jid.JID - core (core.xmpp): reorganised message methods, added getNick() method to client.roster - plugin text commands: fixed plugin and adapted to new messages behaviour. client is now used in arguments instead of profile - plugins: added information for cancellation reason in CancelError calls - plugin XEP-0045: various improvments, but this plugin still need work: - trigger is used to avoid message already handled by the plugin to be handled a second time - changed the way to handle history, the last message from DB is checked and we request only messages since this one, in seconds (thanks Poezio folks :)) - subject reception is waited before sending the roomJoined signal, this way we are sure that everything including history is ready - cmd_* method now follow the new convention with client instead of profile - roomUserJoined and roomUserLeft messages are removed, the events are now handled with info message with a "ROOM_USER_JOINED" info subtype - probably other forgotten stuffs :p
author Goffi <goffi@goffi.org>
date Mon, 20 Jun 2016 18:41:53 +0200
parents 633b5c21aefd
children 200cd707a46d
line wrap: on
line diff
--- a/src/plugins/plugin_sec_otr.py	Sun Jun 19 22:22:13 2016 +0200
+++ b/src/plugins/plugin_sec_otr.py	Mon Jun 20 18:41:53 2016 +0200
@@ -209,7 +209,7 @@
         self.skipped_profiles = set()
         host.trigger.add("MessageReceived", self.MessageReceivedTrigger, priority=100000)
         host.trigger.add("messageSend", self.messageSendTrigger, priority=100000)
-        host.bridge.addMethod("skipOTR", ".plugin", in_sign='s', out_sign='', method=self._skipOTR)
+        host.bridge.addMethod("skipOTR", ".plugin", in_sign='s', out_sign='', method=self._skipOTR)  # FIXME: must be removed, must be done on per-message basis
         host.importMenu((MAIN_MENU, D_("Start/Refresh")), self._startRefresh, security_limit=0, help_string=D_("Start or refresh an OTR session"), type_=C.MENU_SINGLE)
         host.importMenu((MAIN_MENU, D_("End session")), self._endSession, security_limit=0, help_string=D_("Finish an OTR session"), type_=C.MENU_SINGLE)
         host.importMenu((MAIN_MENU, D_("Authenticate")), self._authenticate, security_limit=0, help_string=D_("Authenticate user/see your fingerprint"), type_=C.MENU_SINGLE)
@@ -237,6 +237,9 @@
 
         @param profile (str): %(doc_profile)s
         """
+        # FIXME: should not be done per profile but per message, using extra data
+        #        for message received, profile wide hook may be need, but client
+        #        should be used anyway instead of a class attribute
         self.skipped_profiles.add(profile)
 
     @defer.inlineCallbacks
@@ -406,7 +409,7 @@
         return {'xmlui': confirm.toXml()}
 
     def _receivedTreatment(self, data, profile):
-        from_jid = jid.JID(data['from'])
+        from_jid = data['from']
         log.debug(u"_receivedTreatment [from_jid = %s]" % from_jid)
         otrctx = self.context_managers[profile].getContextForUser(from_jid)
         encrypted = True
@@ -437,7 +440,7 @@
                 data['message'] = {'':res[0].decode('utf-8')} # FIXME: Q&D fix for message refactoring, message is now a dict
                 raise failure.Failure(exceptions.SkipHistory()) # we send the decrypted message to frontends, but we don't want it in history
             else:
-                raise failure.Failure(exceptions.CancelError()) # no message at all (no history, no signal)
+                raise failure.Failure(exceptions.CancelError('Cancelled by OTR')) # no message at all (no history, no signal)
 
     def _receivedTreatmentForSkippedProfiles(self, data, profile):
         """This profile must be skipped because the frontend manages OTR itself,
@@ -450,7 +453,7 @@
             raise failure.Failure(exceptions.SkipHistory())
         return data
 
-    def MessageReceivedTrigger(self, client, message, post_treat):
+    def MessageReceivedTrigger(self, client, message_elt, post_treat):
         profile = client.profile
         if profile in self.skipped_profiles:
             post_treat.addCallback(self._receivedTreatmentForSkippedProfiles, profile)
@@ -478,7 +481,7 @@
                         log.warning(u"No message found")
                         return False
                 otrctx.sendMessage(0, msg.encode('utf-8'))
-                self.host.sendMessageToBridge(mess_data, client)
+                self.host.messageSendToBridge(mess_data, client)
             else:
                 feedback = D_("Your message was not sent because your correspondent closed the encrypted conversation on his/her side. Either close your own side, or refresh the session.")
                 self.host.bridge.messageNew(to_jid.full(),