Mercurial > libervia-backend
annotate sat/plugins/plugin_sec_otr.py @ 3376:a94cdda7d5c4
plugin app manager docker: weblate SàT app file for Docker
| author | Goffi <goffi@goffi.org> |
|---|---|
| date | Mon, 28 Sep 2020 21:10:33 +0200 |
| parents | e756e0eb1be4 |
| children | be6d91572633 |
| rev | line source |
|---|---|
| 3028 | 1 #!/usr/bin/env python3 |
| 3137 | 2 |
| 1055 | 3 |
| 4 # SAT plugin for OTR encryption | |
| 3136 | 5 # Copyright (C) 2009-2020 Jérôme Poisson (goffi@goffi.org) |
| 1055 | 6 |
| 7 # This program is free software: you can redistribute it and/or modify | |
| 8 # it under the terms of the GNU Affero General Public License as published by | |
| 9 # the Free Software Foundation, either version 3 of the License, or | |
| 10 # (at your option) any later version. | |
| 11 | |
| 12 # This program is distributed in the hope that it will be useful, | |
| 13 # but WITHOUT ANY WARRANTY; without even the implied warranty of | |
| 14 # MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the | |
| 15 # GNU Affero General Public License for more details. | |
| 16 | |
| 17 # You should have received a copy of the GNU Affero General Public License | |
| 18 # along with this program. If not, see <http://www.gnu.org/licenses/>. | |
| 19 | |
|
2643
189e38fb11ff
core: style improvments (90 chars limit)
Goffi <goffi@goffi.org>
parents:
2624
diff
changeset
|
20 # XXX: thanks to Darrik L Mazey for his documentation |
|
189e38fb11ff
core: style improvments (90 chars limit)
Goffi <goffi@goffi.org>
parents:
2624
diff
changeset
|
21 # (https://blog.darmasoft.net/2013/06/30/using-pure-python-otr.html) |
| 1055 | 22 # this implentation is based on it |
| 23 | |
| 3028 | 24 import copy |
| 25 import time | |
| 26 import uuid | |
| 27 from binascii import hexlify, unhexlify | |
|
1136
ea2bbdf5b541
plugin OTR: added start/refresh and end session menus
Goffi <goffi@goffi.org>
parents:
1135
diff
changeset
|
28 from sat.core.i18n import _, D_ |
|
ea2bbdf5b541
plugin OTR: added start/refresh and end session menus
Goffi <goffi@goffi.org>
parents:
1135
diff
changeset
|
29 from sat.core.constants import Const as C |
| 1055 | 30 from sat.core.log import getLogger |
| 31 from sat.core import exceptions | |
|
1141
7fcafc3206b1
plugin OTR: authentication management + fixed a bug in setState (due to a wrong docstring in potr.context.getCurrentTrust)
Goffi <goffi@goffi.org>
parents:
1137
diff
changeset
|
32 from sat.tools import xml_tools |
| 1055 | 33 from twisted.words.protocols.jabber import jid |
| 34 from twisted.python import failure | |
| 1095 | 35 from twisted.internet import defer |
|
1290
faa1129559b8
core, frontends: refactoring to base Libervia on QuickFrontend (big mixed commit):
Goffi <goffi@goffi.org>
parents:
1249
diff
changeset
|
36 from sat.memory import persistent |
| 1055 | 37 import potr |
| 3028 | 38 |
| 39 log = getLogger(__name__) | |
| 1095 | 40 |
| 2125 | 41 |
| 1055 | 42 PLUGIN_INFO = { |
| 3028 | 43 C.PI_NAME: "OTR", |
| 44 C.PI_IMPORT_NAME: "OTR", | |
| 45 C.PI_TYPE: "SEC", | |
| 46 C.PI_PROTOCOLS: ["XEP-0364"], | |
| 47 C.PI_DEPENDENCIES: ["XEP-0280", "XEP-0334"], | |
| 48 C.PI_MAIN: "OTR", | |
| 49 C.PI_HANDLER: "no", | |
| 50 C.PI_DESCRIPTION: _("""Implementation of OTR"""), | |
| 1055 | 51 } |
| 52 | |
|
2657
9190874a8ac5
plugin otr: use namespace specified in XEP-0378
Goffi <goffi@goffi.org>
parents:
2653
diff
changeset
|
53 NS_OTR = "urn:xmpp:otr:0" |
| 2128 | 54 PRIVATE_KEY = "PRIVATE KEY" |
| 3028 | 55 OTR_MENU = D_("OTR") |
|
2624
56f94936df1e
code style reformatting using black
Goffi <goffi@goffi.org>
parents:
2562
diff
changeset
|
56 AUTH_TXT = D_( |
| 3028 | 57 "To authenticate your correspondent, you need to give your below fingerprint " |
| 58 "*BY AN EXTERNAL CANAL* (i.e. not in this chat), and check that the one he gives " | |
| 59 "you is the same as below. If there is a mismatch, there can be a spy between you!" | |
|
2624
56f94936df1e
code style reformatting using black
Goffi <goffi@goffi.org>
parents:
2562
diff
changeset
|
60 ) |
|
56f94936df1e
code style reformatting using black
Goffi <goffi@goffi.org>
parents:
2562
diff
changeset
|
61 DROP_TXT = D_( |
| 3028 | 62 "You private key is used to encrypt messages for your correspondent, nobody except " |
| 63 "you must know it, if you are in doubt, you should drop it!\n\nAre you sure you " | |
| 64 "want to drop your private key?" | |
|
2624
56f94936df1e
code style reformatting using black
Goffi <goffi@goffi.org>
parents:
2562
diff
changeset
|
65 ) |
| 2128 | 66 # NO_LOG_AND = D_(u"/!\\Your history is not logged anymore, and") # FIXME: not used at the moment |
| 3028 | 67 NO_ADV_FEATURES = D_("Some of advanced features are disabled !") |
| 2128 | 68 |
|
2624
56f94936df1e
code style reformatting using black
Goffi <goffi@goffi.org>
parents:
2562
diff
changeset
|
69 DEFAULT_POLICY_FLAGS = {"ALLOW_V1": False, "ALLOW_V2": True, "REQUIRE_ENCRYPTION": True} |
| 2128 | 70 |
|
2624
56f94936df1e
code style reformatting using black
Goffi <goffi@goffi.org>
parents:
2562
diff
changeset
|
71 OTR_STATE_TRUSTED = "trusted" |
|
56f94936df1e
code style reformatting using black
Goffi <goffi@goffi.org>
parents:
2562
diff
changeset
|
72 OTR_STATE_UNTRUSTED = "untrusted" |
|
56f94936df1e
code style reformatting using black
Goffi <goffi@goffi.org>
parents:
2562
diff
changeset
|
73 OTR_STATE_UNENCRYPTED = "unencrypted" |
|
56f94936df1e
code style reformatting using black
Goffi <goffi@goffi.org>
parents:
2562
diff
changeset
|
74 OTR_STATE_ENCRYPTED = "encrypted" |
| 2128 | 75 |
| 1055 | 76 |
| 77 class Context(potr.context.Context): | |
|
2743
da59ff099b32
core (memory/encryption), plugin OTR: finished OTR integration in encryption:
Goffi <goffi@goffi.org>
parents:
2726
diff
changeset
|
78 def __init__(self, context_manager, other_jid): |
|
da59ff099b32
core (memory/encryption), plugin OTR: finished OTR integration in encryption:
Goffi <goffi@goffi.org>
parents:
2726
diff
changeset
|
79 self.context_manager = context_manager |
|
da59ff099b32
core (memory/encryption), plugin OTR: finished OTR integration in encryption:
Goffi <goffi@goffi.org>
parents:
2726
diff
changeset
|
80 super(Context, self).__init__(context_manager.account, other_jid) |
|
da59ff099b32
core (memory/encryption), plugin OTR: finished OTR integration in encryption:
Goffi <goffi@goffi.org>
parents:
2726
diff
changeset
|
81 |
|
da59ff099b32
core (memory/encryption), plugin OTR: finished OTR integration in encryption:
Goffi <goffi@goffi.org>
parents:
2726
diff
changeset
|
82 @property |
|
da59ff099b32
core (memory/encryption), plugin OTR: finished OTR integration in encryption:
Goffi <goffi@goffi.org>
parents:
2726
diff
changeset
|
83 def host(self): |
|
da59ff099b32
core (memory/encryption), plugin OTR: finished OTR integration in encryption:
Goffi <goffi@goffi.org>
parents:
2726
diff
changeset
|
84 return self.context_manager.host |
|
da59ff099b32
core (memory/encryption), plugin OTR: finished OTR integration in encryption:
Goffi <goffi@goffi.org>
parents:
2726
diff
changeset
|
85 |
|
da59ff099b32
core (memory/encryption), plugin OTR: finished OTR integration in encryption:
Goffi <goffi@goffi.org>
parents:
2726
diff
changeset
|
86 @property |
|
da59ff099b32
core (memory/encryption), plugin OTR: finished OTR integration in encryption:
Goffi <goffi@goffi.org>
parents:
2726
diff
changeset
|
87 def _p_hints(self): |
|
da59ff099b32
core (memory/encryption), plugin OTR: finished OTR integration in encryption:
Goffi <goffi@goffi.org>
parents:
2726
diff
changeset
|
88 return self.context_manager.parent._p_hints |
|
da59ff099b32
core (memory/encryption), plugin OTR: finished OTR integration in encryption:
Goffi <goffi@goffi.org>
parents:
2726
diff
changeset
|
89 |
|
da59ff099b32
core (memory/encryption), plugin OTR: finished OTR integration in encryption:
Goffi <goffi@goffi.org>
parents:
2726
diff
changeset
|
90 @property |
|
da59ff099b32
core (memory/encryption), plugin OTR: finished OTR integration in encryption:
Goffi <goffi@goffi.org>
parents:
2726
diff
changeset
|
91 def _p_carbons(self): |
|
da59ff099b32
core (memory/encryption), plugin OTR: finished OTR integration in encryption:
Goffi <goffi@goffi.org>
parents:
2726
diff
changeset
|
92 return self.context_manager.parent._p_carbons |
| 1055 | 93 |
| 94 def getPolicy(self, key): | |
| 95 if key in DEFAULT_POLICY_FLAGS: | |
| 96 return DEFAULT_POLICY_FLAGS[key] | |
| 97 else: | |
| 98 return False | |
| 99 | |
| 1095 | 100 def inject(self, msg_str, appdata=None): |
|
2138
6e509ee853a8
plugin OTR, core; use of new sendMessage + OTR mini refactoring:
Goffi <goffi@goffi.org>
parents:
2132
diff
changeset
|
101 """Inject encrypted data in the stream |
|
6e509ee853a8
plugin OTR, core; use of new sendMessage + OTR mini refactoring:
Goffi <goffi@goffi.org>
parents:
2132
diff
changeset
|
102 |
|
2144
1d3f73e065e1
core, jp: component handling + client handling refactoring:
Goffi <goffi@goffi.org>
parents:
2138
diff
changeset
|
103 if appdata is not None, we are sending a message in sendMessageDataTrigger |
|
2643
189e38fb11ff
core: style improvments (90 chars limit)
Goffi <goffi@goffi.org>
parents:
2624
diff
changeset
|
104 stanza will be injected directly if appdata is None, |
|
189e38fb11ff
core: style improvments (90 chars limit)
Goffi <goffi@goffi.org>
parents:
2624
diff
changeset
|
105 else we just update the element and follow normal workflow |
|
2138
6e509ee853a8
plugin OTR, core; use of new sendMessage + OTR mini refactoring:
Goffi <goffi@goffi.org>
parents:
2132
diff
changeset
|
106 @param msg_str(str): encrypted message body |
|
6e509ee853a8
plugin OTR, core; use of new sendMessage + OTR mini refactoring:
Goffi <goffi@goffi.org>
parents:
2132
diff
changeset
|
107 @param appdata(None, dict): None for signal message, |
|
6e509ee853a8
plugin OTR, core; use of new sendMessage + OTR mini refactoring:
Goffi <goffi@goffi.org>
parents:
2132
diff
changeset
|
108 message data when an encrypted message is going to be sent |
|
6e509ee853a8
plugin OTR, core; use of new sendMessage + OTR mini refactoring:
Goffi <goffi@goffi.org>
parents:
2132
diff
changeset
|
109 """ |
| 1095 | 110 assert isinstance(self.peer, jid.JID) |
| 3040 | 111 msg = msg_str.decode('utf-8') |
| 1095 | 112 client = self.user.client |
| 3028 | 113 log.debug("injecting encrypted message to {to}".format(to=self.peer)) |
|
2138
6e509ee853a8
plugin OTR, core; use of new sendMessage + OTR mini refactoring:
Goffi <goffi@goffi.org>
parents:
2132
diff
changeset
|
114 if appdata is None: |
|
6e509ee853a8
plugin OTR, core; use of new sendMessage + OTR mini refactoring:
Goffi <goffi@goffi.org>
parents:
2132
diff
changeset
|
115 mess_data = { |
|
2624
56f94936df1e
code style reformatting using black
Goffi <goffi@goffi.org>
parents:
2562
diff
changeset
|
116 "from": client.jid, |
|
56f94936df1e
code style reformatting using black
Goffi <goffi@goffi.org>
parents:
2562
diff
changeset
|
117 "to": self.peer, |
| 3028 | 118 "uid": str(uuid.uuid4()), |
|
2624
56f94936df1e
code style reformatting using black
Goffi <goffi@goffi.org>
parents:
2562
diff
changeset
|
119 "message": {"": msg}, |
|
56f94936df1e
code style reformatting using black
Goffi <goffi@goffi.org>
parents:
2562
diff
changeset
|
120 "subject": {}, |
|
56f94936df1e
code style reformatting using black
Goffi <goffi@goffi.org>
parents:
2562
diff
changeset
|
121 "type": "chat", |
|
56f94936df1e
code style reformatting using black
Goffi <goffi@goffi.org>
parents:
2562
diff
changeset
|
122 "extra": {}, |
|
56f94936df1e
code style reformatting using black
Goffi <goffi@goffi.org>
parents:
2562
diff
changeset
|
123 "timestamp": time.time(), |
|
56f94936df1e
code style reformatting using black
Goffi <goffi@goffi.org>
parents:
2562
diff
changeset
|
124 } |
|
2144
1d3f73e065e1
core, jp: component handling + client handling refactoring:
Goffi <goffi@goffi.org>
parents:
2138
diff
changeset
|
125 client.generateMessageXML(mess_data) |
| 3028 | 126 xml = mess_data['xml'] |
|
2743
da59ff099b32
core (memory/encryption), plugin OTR: finished OTR integration in encryption:
Goffi <goffi@goffi.org>
parents:
2726
diff
changeset
|
127 self._p_carbons.setPrivate(xml) |
|
da59ff099b32
core (memory/encryption), plugin OTR: finished OTR integration in encryption:
Goffi <goffi@goffi.org>
parents:
2726
diff
changeset
|
128 self._p_hints.addHintElements(xml, [ |
|
da59ff099b32
core (memory/encryption), plugin OTR: finished OTR integration in encryption:
Goffi <goffi@goffi.org>
parents:
2726
diff
changeset
|
129 self._p_hints.HINT_NO_COPY, |
|
da59ff099b32
core (memory/encryption), plugin OTR: finished OTR integration in encryption:
Goffi <goffi@goffi.org>
parents:
2726
diff
changeset
|
130 self._p_hints.HINT_NO_PERMANENT_STORE]) |
|
2624
56f94936df1e
code style reformatting using black
Goffi <goffi@goffi.org>
parents:
2562
diff
changeset
|
131 client.send(mess_data["xml"]) |
|
2138
6e509ee853a8
plugin OTR, core; use of new sendMessage + OTR mini refactoring:
Goffi <goffi@goffi.org>
parents:
2132
diff
changeset
|
132 else: |
| 3028 | 133 message_elt = appdata["xml"] |
| 134 assert message_elt.name == "message" | |
|
2138
6e509ee853a8
plugin OTR, core; use of new sendMessage + OTR mini refactoring:
Goffi <goffi@goffi.org>
parents:
2132
diff
changeset
|
135 message_elt.addElement("body", content=msg) |
| 1055 | 136 |
|
2743
da59ff099b32
core (memory/encryption), plugin OTR: finished OTR integration in encryption:
Goffi <goffi@goffi.org>
parents:
2726
diff
changeset
|
137 def stopCb(self, __, feedback): |
|
da59ff099b32
core (memory/encryption), plugin OTR: finished OTR integration in encryption:
Goffi <goffi@goffi.org>
parents:
2726
diff
changeset
|
138 client = self.user.client |
|
da59ff099b32
core (memory/encryption), plugin OTR: finished OTR integration in encryption:
Goffi <goffi@goffi.org>
parents:
2726
diff
changeset
|
139 self.host.bridge.otrState( |
|
da59ff099b32
core (memory/encryption), plugin OTR: finished OTR integration in encryption:
Goffi <goffi@goffi.org>
parents:
2726
diff
changeset
|
140 OTR_STATE_UNENCRYPTED, self.peer.full(), client.profile |
|
da59ff099b32
core (memory/encryption), plugin OTR: finished OTR integration in encryption:
Goffi <goffi@goffi.org>
parents:
2726
diff
changeset
|
141 ) |
|
da59ff099b32
core (memory/encryption), plugin OTR: finished OTR integration in encryption:
Goffi <goffi@goffi.org>
parents:
2726
diff
changeset
|
142 client.feedback(self.peer, feedback) |
|
da59ff099b32
core (memory/encryption), plugin OTR: finished OTR integration in encryption:
Goffi <goffi@goffi.org>
parents:
2726
diff
changeset
|
143 |
|
da59ff099b32
core (memory/encryption), plugin OTR: finished OTR integration in encryption:
Goffi <goffi@goffi.org>
parents:
2726
diff
changeset
|
144 def stopEb(self, failure_): |
|
da59ff099b32
core (memory/encryption), plugin OTR: finished OTR integration in encryption:
Goffi <goffi@goffi.org>
parents:
2726
diff
changeset
|
145 # encryption may be already stopped in case of manual stop |
|
da59ff099b32
core (memory/encryption), plugin OTR: finished OTR integration in encryption:
Goffi <goffi@goffi.org>
parents:
2726
diff
changeset
|
146 if not failure_.check(exceptions.NotFound): |
| 3028 | 147 log.error("Error while stopping OTR encryption: {msg}".format(msg=failure_)) |
|
2743
da59ff099b32
core (memory/encryption), plugin OTR: finished OTR integration in encryption:
Goffi <goffi@goffi.org>
parents:
2726
diff
changeset
|
148 |
|
da59ff099b32
core (memory/encryption), plugin OTR: finished OTR integration in encryption:
Goffi <goffi@goffi.org>
parents:
2726
diff
changeset
|
149 def isTrusted(self): |
|
da59ff099b32
core (memory/encryption), plugin OTR: finished OTR integration in encryption:
Goffi <goffi@goffi.org>
parents:
2726
diff
changeset
|
150 # we have to check value because potr code says that a 2-tuples should be |
|
da59ff099b32
core (memory/encryption), plugin OTR: finished OTR integration in encryption:
Goffi <goffi@goffi.org>
parents:
2726
diff
changeset
|
151 # returned while in practice it's either None or u"trusted" |
|
da59ff099b32
core (memory/encryption), plugin OTR: finished OTR integration in encryption:
Goffi <goffi@goffi.org>
parents:
2726
diff
changeset
|
152 trusted = self.getCurrentTrust() |
|
da59ff099b32
core (memory/encryption), plugin OTR: finished OTR integration in encryption:
Goffi <goffi@goffi.org>
parents:
2726
diff
changeset
|
153 if trusted is None: |
|
da59ff099b32
core (memory/encryption), plugin OTR: finished OTR integration in encryption:
Goffi <goffi@goffi.org>
parents:
2726
diff
changeset
|
154 return False |
| 3028 | 155 elif trusted == 'trusted': |
|
2743
da59ff099b32
core (memory/encryption), plugin OTR: finished OTR integration in encryption:
Goffi <goffi@goffi.org>
parents:
2726
diff
changeset
|
156 return True |
|
da59ff099b32
core (memory/encryption), plugin OTR: finished OTR integration in encryption:
Goffi <goffi@goffi.org>
parents:
2726
diff
changeset
|
157 else: |
| 3028 | 158 log.error("Unexpected getCurrentTrust() value: {value}".format( |
|
2743
da59ff099b32
core (memory/encryption), plugin OTR: finished OTR integration in encryption:
Goffi <goffi@goffi.org>
parents:
2726
diff
changeset
|
159 value=trusted)) |
|
da59ff099b32
core (memory/encryption), plugin OTR: finished OTR integration in encryption:
Goffi <goffi@goffi.org>
parents:
2726
diff
changeset
|
160 return False |
|
da59ff099b32
core (memory/encryption), plugin OTR: finished OTR integration in encryption:
Goffi <goffi@goffi.org>
parents:
2726
diff
changeset
|
161 |
| 1055 | 162 def setState(self, state): |
| 2128 | 163 client = self.user.client |
| 1095 | 164 old_state = self.state |
| 1055 | 165 super(Context, self).setState(state) |
| 3028 | 166 log.debug("setState: %s (old_state=%s)" % (state, old_state)) |
| 1095 | 167 |
| 168 if state == potr.context.STATE_PLAINTEXT: | |
| 3028 | 169 feedback = _("/!\\ conversation with %(other_jid)s is now UNENCRYPTED") % { |
|
2624
56f94936df1e
code style reformatting using black
Goffi <goffi@goffi.org>
parents:
2562
diff
changeset
|
170 "other_jid": self.peer.full() |
|
56f94936df1e
code style reformatting using black
Goffi <goffi@goffi.org>
parents:
2562
diff
changeset
|
171 } |
|
3226
2f406b762788
core (memory/encryption): encryption session are now restored on client connection
Goffi <goffi@goffi.org>
parents:
3172
diff
changeset
|
172 d = defer.ensureDeferred(client.encryption.stop(self.peer, NS_OTR)) |
|
2743
da59ff099b32
core (memory/encryption), plugin OTR: finished OTR integration in encryption:
Goffi <goffi@goffi.org>
parents:
2726
diff
changeset
|
173 d.addCallback(self.stopCb, feedback=feedback) |
|
da59ff099b32
core (memory/encryption), plugin OTR: finished OTR integration in encryption:
Goffi <goffi@goffi.org>
parents:
2726
diff
changeset
|
174 d.addErrback(self.stopEb) |
|
da59ff099b32
core (memory/encryption), plugin OTR: finished OTR integration in encryption:
Goffi <goffi@goffi.org>
parents:
2726
diff
changeset
|
175 return |
| 1095 | 176 elif state == potr.context.STATE_ENCRYPTED: |
|
3226
2f406b762788
core (memory/encryption): encryption session are now restored on client connection
Goffi <goffi@goffi.org>
parents:
3172
diff
changeset
|
177 defer.ensureDeferred(client.encryption.start(self.peer, NS_OTR)) |
| 1095 | 178 try: |
|
2743
da59ff099b32
core (memory/encryption), plugin OTR: finished OTR integration in encryption:
Goffi <goffi@goffi.org>
parents:
2726
diff
changeset
|
179 trusted = self.isTrusted() |
| 1095 | 180 except TypeError: |
| 181 trusted = False | |
| 3028 | 182 trusted_str = _("trusted") if trusted else _("untrusted") |
| 1095 | 183 |
| 184 if old_state == potr.context.STATE_ENCRYPTED: | |
|
2624
56f94936df1e
code style reformatting using black
Goffi <goffi@goffi.org>
parents:
2562
diff
changeset
|
185 feedback = D_( |
| 3028 | 186 "{trusted} OTR conversation with {other_jid} REFRESHED" |
|
2624
56f94936df1e
code style reformatting using black
Goffi <goffi@goffi.org>
parents:
2562
diff
changeset
|
187 ).format(trusted=trusted_str, other_jid=self.peer.full()) |
| 1095 | 188 else: |
|
2624
56f94936df1e
code style reformatting using black
Goffi <goffi@goffi.org>
parents:
2562
diff
changeset
|
189 feedback = D_( |
| 3028 | 190 "{trusted} encrypted OTR conversation started with {other_jid}\n" |
| 191 "{extra_info}" | |
|
2624
56f94936df1e
code style reformatting using black
Goffi <goffi@goffi.org>
parents:
2562
diff
changeset
|
192 ).format( |
|
56f94936df1e
code style reformatting using black
Goffi <goffi@goffi.org>
parents:
2562
diff
changeset
|
193 trusted=trusted_str, |
|
56f94936df1e
code style reformatting using black
Goffi <goffi@goffi.org>
parents:
2562
diff
changeset
|
194 other_jid=self.peer.full(), |
|
56f94936df1e
code style reformatting using black
Goffi <goffi@goffi.org>
parents:
2562
diff
changeset
|
195 extra_info=NO_ADV_FEATURES, |
|
56f94936df1e
code style reformatting using black
Goffi <goffi@goffi.org>
parents:
2562
diff
changeset
|
196 ) |
|
56f94936df1e
code style reformatting using black
Goffi <goffi@goffi.org>
parents:
2562
diff
changeset
|
197 self.host.bridge.otrState( |
|
56f94936df1e
code style reformatting using black
Goffi <goffi@goffi.org>
parents:
2562
diff
changeset
|
198 OTR_STATE_ENCRYPTED, self.peer.full(), client.profile |
|
56f94936df1e
code style reformatting using black
Goffi <goffi@goffi.org>
parents:
2562
diff
changeset
|
199 ) |
| 1095 | 200 elif state == potr.context.STATE_FINISHED: |
| 3028 | 201 feedback = D_("OTR conversation with {other_jid} is FINISHED").format( |
|
2624
56f94936df1e
code style reformatting using black
Goffi <goffi@goffi.org>
parents:
2562
diff
changeset
|
202 other_jid=self.peer.full() |
|
56f94936df1e
code style reformatting using black
Goffi <goffi@goffi.org>
parents:
2562
diff
changeset
|
203 ) |
|
3226
2f406b762788
core (memory/encryption): encryption session are now restored on client connection
Goffi <goffi@goffi.org>
parents:
3172
diff
changeset
|
204 d = defer.ensureDeferred(client.encryption.stop(self.peer, NS_OTR)) |
|
2743
da59ff099b32
core (memory/encryption), plugin OTR: finished OTR integration in encryption:
Goffi <goffi@goffi.org>
parents:
2726
diff
changeset
|
205 d.addCallback(self.stopCb, feedback=feedback) |
|
da59ff099b32
core (memory/encryption), plugin OTR: finished OTR integration in encryption:
Goffi <goffi@goffi.org>
parents:
2726
diff
changeset
|
206 d.addErrback(self.stopEb) |
|
da59ff099b32
core (memory/encryption), plugin OTR: finished OTR integration in encryption:
Goffi <goffi@goffi.org>
parents:
2726
diff
changeset
|
207 return |
| 1095 | 208 else: |
| 3028 | 209 log.error(D_("Unknown OTR state")) |
| 1095 | 210 return |
| 211 | |
|
2138
6e509ee853a8
plugin OTR, core; use of new sendMessage + OTR mini refactoring:
Goffi <goffi@goffi.org>
parents:
2132
diff
changeset
|
212 client.feedback(self.peer, feedback) |
| 1055 | 213 |
|
1169
a3354063dfb6
plugin OTR: disconnect the active OTR sessions and delete the context on profile disconnection
souliane <souliane@mailoo.org>
parents:
1168
diff
changeset
|
214 def disconnect(self): |
|
a3354063dfb6
plugin OTR: disconnect the active OTR sessions and delete the context on profile disconnection
souliane <souliane@mailoo.org>
parents:
1168
diff
changeset
|
215 """Disconnect the session.""" |
|
a3354063dfb6
plugin OTR: disconnect the active OTR sessions and delete the context on profile disconnection
souliane <souliane@mailoo.org>
parents:
1168
diff
changeset
|
216 if self.state != potr.context.STATE_PLAINTEXT: |
|
a3354063dfb6
plugin OTR: disconnect the active OTR sessions and delete the context on profile disconnection
souliane <souliane@mailoo.org>
parents:
1168
diff
changeset
|
217 super(Context, self).disconnect() |
|
a3354063dfb6
plugin OTR: disconnect the active OTR sessions and delete the context on profile disconnection
souliane <souliane@mailoo.org>
parents:
1168
diff
changeset
|
218 |
|
1170
2df6427a5299
plugin OTR: forces FINISHED state if we are in ENCRYPTED state on contact disconnection
souliane <souliane@mailoo.org>
parents:
1169
diff
changeset
|
219 def finish(self): |
|
2643
189e38fb11ff
core: style improvments (90 chars limit)
Goffi <goffi@goffi.org>
parents:
2624
diff
changeset
|
220 """Finish the session |
|
189e38fb11ff
core: style improvments (90 chars limit)
Goffi <goffi@goffi.org>
parents:
2624
diff
changeset
|
221 |
|
189e38fb11ff
core: style improvments (90 chars limit)
Goffi <goffi@goffi.org>
parents:
2624
diff
changeset
|
222 avoid to send any message but the user still has to end the session himself. |
|
189e38fb11ff
core: style improvments (90 chars limit)
Goffi <goffi@goffi.org>
parents:
2624
diff
changeset
|
223 """ |
|
1170
2df6427a5299
plugin OTR: forces FINISHED state if we are in ENCRYPTED state on contact disconnection
souliane <souliane@mailoo.org>
parents:
1169
diff
changeset
|
224 if self.state == potr.context.STATE_ENCRYPTED: |
|
2df6427a5299
plugin OTR: forces FINISHED state if we are in ENCRYPTED state on contact disconnection
souliane <souliane@mailoo.org>
parents:
1169
diff
changeset
|
225 self.processTLVs([potr.proto.DisconnectTLV()]) |
|
2df6427a5299
plugin OTR: forces FINISHED state if we are in ENCRYPTED state on contact disconnection
souliane <souliane@mailoo.org>
parents:
1169
diff
changeset
|
226 |
| 1055 | 227 |
| 228 class Account(potr.context.Account): | |
|
2643
189e38fb11ff
core: style improvments (90 chars limit)
Goffi <goffi@goffi.org>
parents:
2624
diff
changeset
|
229 # TODO: manage trusted keys: if a fingerprint is not used anymore, |
|
189e38fb11ff
core: style improvments (90 chars limit)
Goffi <goffi@goffi.org>
parents:
2624
diff
changeset
|
230 # we have no way to remove it from database yet (same thing for a |
|
189e38fb11ff
core: style improvments (90 chars limit)
Goffi <goffi@goffi.org>
parents:
2624
diff
changeset
|
231 # correspondent jid) |
|
2138
6e509ee853a8
plugin OTR, core; use of new sendMessage + OTR mini refactoring:
Goffi <goffi@goffi.org>
parents:
2132
diff
changeset
|
232 # TODO: manage explicit message encryption |
| 1055 | 233 |
| 1095 | 234 def __init__(self, host, client): |
| 3028 | 235 log.debug("new account: %s" % client.jid) |
|
1135
3158f9e08760
plugin OTR: a warning is logged when Account is instancied with a bare jid.
Goffi <goffi@goffi.org>
parents:
1134
diff
changeset
|
236 if not client.jid.resource: |
|
3158f9e08760
plugin OTR: a warning is logged when Account is instancied with a bare jid.
Goffi <goffi@goffi.org>
parents:
1134
diff
changeset
|
237 log.warning("Account created without resource") |
| 3028 | 238 super(Account, self).__init__(str(client.jid), "xmpp", 1024) |
| 1095 | 239 self.host = host |
| 240 self.client = client | |
| 1055 | 241 |
| 242 def loadPrivkey(self): | |
| 3028 | 243 log.debug("loadPrivkey") |
|
1146
1ac5ea74dbdf
plugin OTR: remove unnecessary attribute SatXMPPClient.otr_priv_key
souliane <souliane@mailoo.org>
parents:
1144
diff
changeset
|
244 return self.privkey |
| 1055 | 245 |
| 246 def savePrivkey(self): | |
| 3028 | 247 log.debug("savePrivkey") |
|
1137
768f1f1ef12c
plugin otr: priv_key is better than getPrivKey here, as it should not be None + fixed private key encryption/decryption
Goffi <goffi@goffi.org>
parents:
1136
diff
changeset
|
248 if self.privkey is None: |
| 3028 | 249 raise exceptions.InternalError(_("Save is called but privkey is None !")) |
| 250 priv_key = hexlify(self.privkey.serializePrivateKey()) | |
|
3160
330a5f1d9eea
core (memory/crypto): replaced `PyCrypto` by `cryptography`:
Goffi <goffi@goffi.org>
parents:
3137
diff
changeset
|
251 encrypted_priv_key = self.host.memory.encryptValue(priv_key, self.client.profile) |
|
330a5f1d9eea
core (memory/crypto): replaced `PyCrypto` by `cryptography`:
Goffi <goffi@goffi.org>
parents:
3137
diff
changeset
|
252 self.client._otr_data[PRIVATE_KEY] = encrypted_priv_key |
| 1055 | 253 |
|
1141
7fcafc3206b1
plugin OTR: authentication management + fixed a bug in setState (due to a wrong docstring in potr.context.getCurrentTrust)
Goffi <goffi@goffi.org>
parents:
1137
diff
changeset
|
254 def loadTrusts(self): |
|
2624
56f94936df1e
code style reformatting using black
Goffi <goffi@goffi.org>
parents:
2562
diff
changeset
|
255 trust_data = self.client._otr_data.get("trust", {}) |
| 3028 | 256 for jid_, jid_data in trust_data.items(): |
| 257 for fingerprint, trust_level in jid_data.items(): | |
|
2624
56f94936df1e
code style reformatting using black
Goffi <goffi@goffi.org>
parents:
2562
diff
changeset
|
258 log.debug( |
| 3028 | 259 'setting trust for {jid}: [{fingerprint}] = "{trust_level}"'.format( |
|
2624
56f94936df1e
code style reformatting using black
Goffi <goffi@goffi.org>
parents:
2562
diff
changeset
|
260 jid=jid_, fingerprint=fingerprint, trust_level=trust_level |
|
56f94936df1e
code style reformatting using black
Goffi <goffi@goffi.org>
parents:
2562
diff
changeset
|
261 ) |
|
56f94936df1e
code style reformatting using black
Goffi <goffi@goffi.org>
parents:
2562
diff
changeset
|
262 ) |
|
1141
7fcafc3206b1
plugin OTR: authentication management + fixed a bug in setState (due to a wrong docstring in potr.context.getCurrentTrust)
Goffi <goffi@goffi.org>
parents:
1137
diff
changeset
|
263 self.trusts.setdefault(jid.JID(jid_), {})[fingerprint] = trust_level |
|
7fcafc3206b1
plugin OTR: authentication management + fixed a bug in setState (due to a wrong docstring in potr.context.getCurrentTrust)
Goffi <goffi@goffi.org>
parents:
1137
diff
changeset
|
264 |
|
7fcafc3206b1
plugin OTR: authentication management + fixed a bug in setState (due to a wrong docstring in potr.context.getCurrentTrust)
Goffi <goffi@goffi.org>
parents:
1137
diff
changeset
|
265 def saveTrusts(self): |
| 3028 | 266 log.debug("saving trusts for {profile}".format(profile=self.client.profile)) |
| 267 log.debug("trusts = {}".format(self.client._otr_data["trust"])) | |
|
2624
56f94936df1e
code style reformatting using black
Goffi <goffi@goffi.org>
parents:
2562
diff
changeset
|
268 self.client._otr_data.force("trust") |
|
1141
7fcafc3206b1
plugin OTR: authentication management + fixed a bug in setState (due to a wrong docstring in potr.context.getCurrentTrust)
Goffi <goffi@goffi.org>
parents:
1137
diff
changeset
|
269 |
|
7fcafc3206b1
plugin OTR: authentication management + fixed a bug in setState (due to a wrong docstring in potr.context.getCurrentTrust)
Goffi <goffi@goffi.org>
parents:
1137
diff
changeset
|
270 def setTrust(self, other_jid, fingerprint, trustLevel): |
|
7fcafc3206b1
plugin OTR: authentication management + fixed a bug in setState (due to a wrong docstring in potr.context.getCurrentTrust)
Goffi <goffi@goffi.org>
parents:
1137
diff
changeset
|
271 try: |
|
2624
56f94936df1e
code style reformatting using black
Goffi <goffi@goffi.org>
parents:
2562
diff
changeset
|
272 trust_data = self.client._otr_data["trust"] |
|
1141
7fcafc3206b1
plugin OTR: authentication management + fixed a bug in setState (due to a wrong docstring in potr.context.getCurrentTrust)
Goffi <goffi@goffi.org>
parents:
1137
diff
changeset
|
273 except KeyError: |
|
7fcafc3206b1
plugin OTR: authentication management + fixed a bug in setState (due to a wrong docstring in potr.context.getCurrentTrust)
Goffi <goffi@goffi.org>
parents:
1137
diff
changeset
|
274 trust_data = {} |
|
2624
56f94936df1e
code style reformatting using black
Goffi <goffi@goffi.org>
parents:
2562
diff
changeset
|
275 self.client._otr_data["trust"] = trust_data |
|
1141
7fcafc3206b1
plugin OTR: authentication management + fixed a bug in setState (due to a wrong docstring in potr.context.getCurrentTrust)
Goffi <goffi@goffi.org>
parents:
1137
diff
changeset
|
276 jid_data = trust_data.setdefault(other_jid.full(), {}) |
|
7fcafc3206b1
plugin OTR: authentication management + fixed a bug in setState (due to a wrong docstring in potr.context.getCurrentTrust)
Goffi <goffi@goffi.org>
parents:
1137
diff
changeset
|
277 jid_data[fingerprint] = trustLevel |
|
7fcafc3206b1
plugin OTR: authentication management + fixed a bug in setState (due to a wrong docstring in potr.context.getCurrentTrust)
Goffi <goffi@goffi.org>
parents:
1137
diff
changeset
|
278 super(Account, self).setTrust(other_jid, fingerprint, trustLevel) |
|
7fcafc3206b1
plugin OTR: authentication management + fixed a bug in setState (due to a wrong docstring in potr.context.getCurrentTrust)
Goffi <goffi@goffi.org>
parents:
1137
diff
changeset
|
279 |
| 1055 | 280 |
| 281 class ContextManager(object): | |
|
2743
da59ff099b32
core (memory/encryption), plugin OTR: finished OTR integration in encryption:
Goffi <goffi@goffi.org>
parents:
2726
diff
changeset
|
282 def __init__(self, parent, client): |
|
da59ff099b32
core (memory/encryption), plugin OTR: finished OTR integration in encryption:
Goffi <goffi@goffi.org>
parents:
2726
diff
changeset
|
283 self.parent = parent |
|
da59ff099b32
core (memory/encryption), plugin OTR: finished OTR integration in encryption:
Goffi <goffi@goffi.org>
parents:
2726
diff
changeset
|
284 self.account = Account(parent.host, client) |
| 1055 | 285 self.contexts = {} |
| 286 | |
|
2743
da59ff099b32
core (memory/encryption), plugin OTR: finished OTR integration in encryption:
Goffi <goffi@goffi.org>
parents:
2726
diff
changeset
|
287 @property |
|
da59ff099b32
core (memory/encryption), plugin OTR: finished OTR integration in encryption:
Goffi <goffi@goffi.org>
parents:
2726
diff
changeset
|
288 def host(self): |
|
da59ff099b32
core (memory/encryption), plugin OTR: finished OTR integration in encryption:
Goffi <goffi@goffi.org>
parents:
2726
diff
changeset
|
289 return self.parent.host |
|
da59ff099b32
core (memory/encryption), plugin OTR: finished OTR integration in encryption:
Goffi <goffi@goffi.org>
parents:
2726
diff
changeset
|
290 |
| 1095 | 291 def startContext(self, other_jid): |
| 292 assert isinstance(other_jid, jid.JID) | |
|
2624
56f94936df1e
code style reformatting using black
Goffi <goffi@goffi.org>
parents:
2562
diff
changeset
|
293 context = self.contexts.setdefault( |
|
2743
da59ff099b32
core (memory/encryption), plugin OTR: finished OTR integration in encryption:
Goffi <goffi@goffi.org>
parents:
2726
diff
changeset
|
294 other_jid, Context(self, other_jid) |
|
2624
56f94936df1e
code style reformatting using black
Goffi <goffi@goffi.org>
parents:
2562
diff
changeset
|
295 ) |
| 1095 | 296 return context |
| 1055 | 297 |
| 298 def getContextForUser(self, other): | |
| 3028 | 299 log.debug("getContextForUser [%s]" % other) |
|
1135
3158f9e08760
plugin OTR: a warning is logged when Account is instancied with a bare jid.
Goffi <goffi@goffi.org>
parents:
1134
diff
changeset
|
300 if not other.resource: |
| 3028 | 301 log.warning("getContextForUser called with a bare jid: %s" % other.full()) |
| 1055 | 302 return self.startContext(other) |
| 303 | |
| 304 | |
| 305 class OTR(object): | |
|
2659
c26492bd2144
plugin OTR: use new "directed" attribute when registering + use new markAsEncrypted
Goffi <goffi@goffi.org>
parents:
2657
diff
changeset
|
306 |
| 1055 | 307 def __init__(self, host): |
| 3028 | 308 log.info(_("OTR plugin initialization")) |
| 1055 | 309 self.host = host |
| 310 self.context_managers = {} | |
|
2624
56f94936df1e
code style reformatting using black
Goffi <goffi@goffi.org>
parents:
2562
diff
changeset
|
311 self.skipped_profiles = ( |
|
56f94936df1e
code style reformatting using black
Goffi <goffi@goffi.org>
parents:
2562
diff
changeset
|
312 set() |
|
56f94936df1e
code style reformatting using black
Goffi <goffi@goffi.org>
parents:
2562
diff
changeset
|
313 ) # FIXME: OTR should not be skipped per profile, this need to be refactored |
| 3028 | 314 self._p_hints = host.plugins["XEP-0334"] |
| 315 self._p_carbons = host.plugins["XEP-0280"] | |
|
3172
dcebc585c29f
core: renamed "MessageReceived" trigger to "messageReceived" for consistency.
Goffi <goffi@goffi.org>
parents:
3160
diff
changeset
|
316 host.trigger.add("messageReceived", self.messageReceivedTrigger, priority=100000) |
|
2144
1d3f73e065e1
core, jp: component handling + client handling refactoring:
Goffi <goffi@goffi.org>
parents:
2138
diff
changeset
|
317 host.trigger.add("sendMessage", self.sendMessageTrigger, priority=100000) |
|
1d3f73e065e1
core, jp: component handling + client handling refactoring:
Goffi <goffi@goffi.org>
parents:
2138
diff
changeset
|
318 host.trigger.add("sendMessageData", self._sendMessageDataTrigger) |
|
2624
56f94936df1e
code style reformatting using black
Goffi <goffi@goffi.org>
parents:
2562
diff
changeset
|
319 host.bridge.addMethod( |
|
56f94936df1e
code style reformatting using black
Goffi <goffi@goffi.org>
parents:
2562
diff
changeset
|
320 "skipOTR", ".plugin", in_sign="s", out_sign="", method=self._skipOTR |
|
56f94936df1e
code style reformatting using black
Goffi <goffi@goffi.org>
parents:
2562
diff
changeset
|
321 ) # FIXME: must be removed, must be done on per-message basis |
|
56f94936df1e
code style reformatting using black
Goffi <goffi@goffi.org>
parents:
2562
diff
changeset
|
322 host.bridge.addSignal( |
|
56f94936df1e
code style reformatting using black
Goffi <goffi@goffi.org>
parents:
2562
diff
changeset
|
323 "otrState", ".plugin", signature="sss" |
|
56f94936df1e
code style reformatting using black
Goffi <goffi@goffi.org>
parents:
2562
diff
changeset
|
324 ) # args: state, destinee_jid, profile |
|
2811
a26b1ad2d3a4
plugin OTR: disabled menu as the new generic encryption menu allows to start/stop OTR or display the trust UI.
Goffi <goffi@goffi.org>
parents:
2771
diff
changeset
|
325 # XXX: menus are disabled in favor to the new more generic encryption menu |
|
a26b1ad2d3a4
plugin OTR: disabled menu as the new generic encryption menu allows to start/stop OTR or display the trust UI.
Goffi <goffi@goffi.org>
parents:
2771
diff
changeset
|
326 # there are let here commented for a little while as a reference |
|
a26b1ad2d3a4
plugin OTR: disabled menu as the new generic encryption menu allows to start/stop OTR or display the trust UI.
Goffi <goffi@goffi.org>
parents:
2771
diff
changeset
|
327 # host.importMenu( |
|
a26b1ad2d3a4
plugin OTR: disabled menu as the new generic encryption menu allows to start/stop OTR or display the trust UI.
Goffi <goffi@goffi.org>
parents:
2771
diff
changeset
|
328 # (OTR_MENU, D_(u"Start/Refresh")), |
|
a26b1ad2d3a4
plugin OTR: disabled menu as the new generic encryption menu allows to start/stop OTR or display the trust UI.
Goffi <goffi@goffi.org>
parents:
2771
diff
changeset
|
329 # self._otrStartRefresh, |
|
a26b1ad2d3a4
plugin OTR: disabled menu as the new generic encryption menu allows to start/stop OTR or display the trust UI.
Goffi <goffi@goffi.org>
parents:
2771
diff
changeset
|
330 # security_limit=0, |
|
a26b1ad2d3a4
plugin OTR: disabled menu as the new generic encryption menu allows to start/stop OTR or display the trust UI.
Goffi <goffi@goffi.org>
parents:
2771
diff
changeset
|
331 # help_string=D_(u"Start or refresh an OTR session"), |
|
a26b1ad2d3a4
plugin OTR: disabled menu as the new generic encryption menu allows to start/stop OTR or display the trust UI.
Goffi <goffi@goffi.org>
parents:
2771
diff
changeset
|
332 # type_=C.MENU_SINGLE, |
|
a26b1ad2d3a4
plugin OTR: disabled menu as the new generic encryption menu allows to start/stop OTR or display the trust UI.
Goffi <goffi@goffi.org>
parents:
2771
diff
changeset
|
333 # ) |
|
a26b1ad2d3a4
plugin OTR: disabled menu as the new generic encryption menu allows to start/stop OTR or display the trust UI.
Goffi <goffi@goffi.org>
parents:
2771
diff
changeset
|
334 # host.importMenu( |
|
a26b1ad2d3a4
plugin OTR: disabled menu as the new generic encryption menu allows to start/stop OTR or display the trust UI.
Goffi <goffi@goffi.org>
parents:
2771
diff
changeset
|
335 # (OTR_MENU, D_(u"End session")), |
|
a26b1ad2d3a4
plugin OTR: disabled menu as the new generic encryption menu allows to start/stop OTR or display the trust UI.
Goffi <goffi@goffi.org>
parents:
2771
diff
changeset
|
336 # self._otrSessionEnd, |
|
a26b1ad2d3a4
plugin OTR: disabled menu as the new generic encryption menu allows to start/stop OTR or display the trust UI.
Goffi <goffi@goffi.org>
parents:
2771
diff
changeset
|
337 # security_limit=0, |
|
a26b1ad2d3a4
plugin OTR: disabled menu as the new generic encryption menu allows to start/stop OTR or display the trust UI.
Goffi <goffi@goffi.org>
parents:
2771
diff
changeset
|
338 # help_string=D_(u"Finish an OTR session"), |
|
a26b1ad2d3a4
plugin OTR: disabled menu as the new generic encryption menu allows to start/stop OTR or display the trust UI.
Goffi <goffi@goffi.org>
parents:
2771
diff
changeset
|
339 # type_=C.MENU_SINGLE, |
|
a26b1ad2d3a4
plugin OTR: disabled menu as the new generic encryption menu allows to start/stop OTR or display the trust UI.
Goffi <goffi@goffi.org>
parents:
2771
diff
changeset
|
340 # ) |
|
a26b1ad2d3a4
plugin OTR: disabled menu as the new generic encryption menu allows to start/stop OTR or display the trust UI.
Goffi <goffi@goffi.org>
parents:
2771
diff
changeset
|
341 # host.importMenu( |
|
a26b1ad2d3a4
plugin OTR: disabled menu as the new generic encryption menu allows to start/stop OTR or display the trust UI.
Goffi <goffi@goffi.org>
parents:
2771
diff
changeset
|
342 # (OTR_MENU, D_(u"Authenticate")), |
|
a26b1ad2d3a4
plugin OTR: disabled menu as the new generic encryption menu allows to start/stop OTR or display the trust UI.
Goffi <goffi@goffi.org>
parents:
2771
diff
changeset
|
343 # self._otrAuthenticate, |
|
a26b1ad2d3a4
plugin OTR: disabled menu as the new generic encryption menu allows to start/stop OTR or display the trust UI.
Goffi <goffi@goffi.org>
parents:
2771
diff
changeset
|
344 # security_limit=0, |
|
a26b1ad2d3a4
plugin OTR: disabled menu as the new generic encryption menu allows to start/stop OTR or display the trust UI.
Goffi <goffi@goffi.org>
parents:
2771
diff
changeset
|
345 # help_string=D_(u"Authenticate user/see your fingerprint"), |
|
a26b1ad2d3a4
plugin OTR: disabled menu as the new generic encryption menu allows to start/stop OTR or display the trust UI.
Goffi <goffi@goffi.org>
parents:
2771
diff
changeset
|
346 # type_=C.MENU_SINGLE, |
|
a26b1ad2d3a4
plugin OTR: disabled menu as the new generic encryption menu allows to start/stop OTR or display the trust UI.
Goffi <goffi@goffi.org>
parents:
2771
diff
changeset
|
347 # ) |
|
a26b1ad2d3a4
plugin OTR: disabled menu as the new generic encryption menu allows to start/stop OTR or display the trust UI.
Goffi <goffi@goffi.org>
parents:
2771
diff
changeset
|
348 # host.importMenu( |
|
a26b1ad2d3a4
plugin OTR: disabled menu as the new generic encryption menu allows to start/stop OTR or display the trust UI.
Goffi <goffi@goffi.org>
parents:
2771
diff
changeset
|
349 # (OTR_MENU, D_(u"Drop private key")), |
|
a26b1ad2d3a4
plugin OTR: disabled menu as the new generic encryption menu allows to start/stop OTR or display the trust UI.
Goffi <goffi@goffi.org>
parents:
2771
diff
changeset
|
350 # self._dropPrivKey, |
|
a26b1ad2d3a4
plugin OTR: disabled menu as the new generic encryption menu allows to start/stop OTR or display the trust UI.
Goffi <goffi@goffi.org>
parents:
2771
diff
changeset
|
351 # security_limit=0, |
|
a26b1ad2d3a4
plugin OTR: disabled menu as the new generic encryption menu allows to start/stop OTR or display the trust UI.
Goffi <goffi@goffi.org>
parents:
2771
diff
changeset
|
352 # type_=C.MENU_SINGLE, |
|
a26b1ad2d3a4
plugin OTR: disabled menu as the new generic encryption menu allows to start/stop OTR or display the trust UI.
Goffi <goffi@goffi.org>
parents:
2771
diff
changeset
|
353 # ) |
|
2820
7ab8684784c6
core: renamed presenceReceived to presence_reveiced + use "client" as first arguments instead of "profile"
Goffi <goffi@goffi.org>
parents:
2812
diff
changeset
|
354 host.trigger.add("presence_received", self._presenceReceivedTrigger) |
| 3028 | 355 self.host.registerEncryptionPlugin(self, "OTR", NS_OTR, directed=True) |
| 1055 | 356 |
|
1149
652cd93dfdb4
plugin OTR: add bridge method skipOTR to desactivate OTR handling for a given profile
souliane <souliane@mailoo.org>
parents:
1147
diff
changeset
|
357 def _skipOTR(self, profile): |
|
652cd93dfdb4
plugin OTR: add bridge method skipOTR to desactivate OTR handling for a given profile
souliane <souliane@mailoo.org>
parents:
1147
diff
changeset
|
358 """Tell the backend to not handle OTR for this profile. |
|
652cd93dfdb4
plugin OTR: add bridge method skipOTR to desactivate OTR handling for a given profile
souliane <souliane@mailoo.org>
parents:
1147
diff
changeset
|
359 |
|
652cd93dfdb4
plugin OTR: add bridge method skipOTR to desactivate OTR handling for a given profile
souliane <souliane@mailoo.org>
parents:
1147
diff
changeset
|
360 @param profile (str): %(doc_profile)s |
|
652cd93dfdb4
plugin OTR: add bridge method skipOTR to desactivate OTR handling for a given profile
souliane <souliane@mailoo.org>
parents:
1147
diff
changeset
|
361 """ |
|
1963
a2bc5089c2eb
backend, frontends: message refactoring (huge commit):
Goffi <goffi@goffi.org>
parents:
1955
diff
changeset
|
362 # FIXME: should not be done per profile but per message, using extra data |
|
a2bc5089c2eb
backend, frontends: message refactoring (huge commit):
Goffi <goffi@goffi.org>
parents:
1955
diff
changeset
|
363 # for message received, profile wide hook may be need, but client |
|
a2bc5089c2eb
backend, frontends: message refactoring (huge commit):
Goffi <goffi@goffi.org>
parents:
1955
diff
changeset
|
364 # should be used anyway instead of a class attribute |
|
1149
652cd93dfdb4
plugin OTR: add bridge method skipOTR to desactivate OTR handling for a given profile
souliane <souliane@mailoo.org>
parents:
1147
diff
changeset
|
365 self.skipped_profiles.add(profile) |
|
652cd93dfdb4
plugin OTR: add bridge method skipOTR to desactivate OTR handling for a given profile
souliane <souliane@mailoo.org>
parents:
1147
diff
changeset
|
366 |
| 1095 | 367 @defer.inlineCallbacks |
|
2812
ba2e03ee7c4f
plugin OTR: do profile session init in profileConnecting, so it is done before receiving any stanza
Goffi <goffi@goffi.org>
parents:
2811
diff
changeset
|
368 def profileConnecting(self, client): |
|
2144
1d3f73e065e1
core, jp: component handling + client handling refactoring:
Goffi <goffi@goffi.org>
parents:
2138
diff
changeset
|
369 if client.profile in self.skipped_profiles: |
|
1149
652cd93dfdb4
plugin OTR: add bridge method skipOTR to desactivate OTR handling for a given profile
souliane <souliane@mailoo.org>
parents:
1147
diff
changeset
|
370 return |
|
2743
da59ff099b32
core (memory/encryption), plugin OTR: finished OTR integration in encryption:
Goffi <goffi@goffi.org>
parents:
2726
diff
changeset
|
371 ctxMng = client._otr_context_manager = ContextManager(self, client) |
|
2144
1d3f73e065e1
core, jp: component handling + client handling refactoring:
Goffi <goffi@goffi.org>
parents:
2138
diff
changeset
|
372 client._otr_data = persistent.PersistentBinaryDict(NS_OTR, client.profile) |
| 2128 | 373 yield client._otr_data.load() |
| 374 encrypted_priv_key = client._otr_data.get(PRIVATE_KEY, None) | |
| 1095 | 375 if encrypted_priv_key is not None: |
|
3160
330a5f1d9eea
core (memory/crypto): replaced `PyCrypto` by `cryptography`:
Goffi <goffi@goffi.org>
parents:
3137
diff
changeset
|
376 priv_key = self.host.memory.decryptValue( |
|
2624
56f94936df1e
code style reformatting using black
Goffi <goffi@goffi.org>
parents:
2562
diff
changeset
|
377 encrypted_priv_key, client.profile |
|
56f94936df1e
code style reformatting using black
Goffi <goffi@goffi.org>
parents:
2562
diff
changeset
|
378 ) |
|
56f94936df1e
code style reformatting using black
Goffi <goffi@goffi.org>
parents:
2562
diff
changeset
|
379 ctxMng.account.privkey = potr.crypt.PK.parsePrivateKey( |
| 3028 | 380 unhexlify(priv_key.encode('utf-8')) |
|
2624
56f94936df1e
code style reformatting using black
Goffi <goffi@goffi.org>
parents:
2562
diff
changeset
|
381 )[0] |
| 1095 | 382 else: |
|
1146
1ac5ea74dbdf
plugin OTR: remove unnecessary attribute SatXMPPClient.otr_priv_key
souliane <souliane@mailoo.org>
parents:
1144
diff
changeset
|
383 ctxMng.account.privkey = None |
|
1141
7fcafc3206b1
plugin OTR: authentication management + fixed a bug in setState (due to a wrong docstring in potr.context.getCurrentTrust)
Goffi <goffi@goffi.org>
parents:
1137
diff
changeset
|
384 ctxMng.account.loadTrusts() |
| 1055 | 385 |
|
2144
1d3f73e065e1
core, jp: component handling + client handling refactoring:
Goffi <goffi@goffi.org>
parents:
2138
diff
changeset
|
386 def profileDisconnected(self, client): |
|
1d3f73e065e1
core, jp: component handling + client handling refactoring:
Goffi <goffi@goffi.org>
parents:
2138
diff
changeset
|
387 if client.profile in self.skipped_profiles: |
|
1d3f73e065e1
core, jp: component handling + client handling refactoring:
Goffi <goffi@goffi.org>
parents:
2138
diff
changeset
|
388 self.skipped_profiles.remove(client.profile) |
| 2128 | 389 return |
| 3028 | 390 for context in list(client._otr_context_manager.contexts.values()): |
| 2128 | 391 context.disconnect() |
| 392 del client._otr_context_manager | |
|
1149
652cd93dfdb4
plugin OTR: add bridge method skipOTR to desactivate OTR handling for a given profile
souliane <souliane@mailoo.org>
parents:
1147
diff
changeset
|
393 |
|
2743
da59ff099b32
core (memory/encryption), plugin OTR: finished OTR integration in encryption:
Goffi <goffi@goffi.org>
parents:
2726
diff
changeset
|
394 # encryption plugin methods |
|
da59ff099b32
core (memory/encryption), plugin OTR: finished OTR integration in encryption:
Goffi <goffi@goffi.org>
parents:
2726
diff
changeset
|
395 |
|
da59ff099b32
core (memory/encryption), plugin OTR: finished OTR integration in encryption:
Goffi <goffi@goffi.org>
parents:
2726
diff
changeset
|
396 def startEncryption(self, client, entity_jid): |
|
da59ff099b32
core (memory/encryption), plugin OTR: finished OTR integration in encryption:
Goffi <goffi@goffi.org>
parents:
2726
diff
changeset
|
397 self.startRefresh(client, entity_jid) |
|
da59ff099b32
core (memory/encryption), plugin OTR: finished OTR integration in encryption:
Goffi <goffi@goffi.org>
parents:
2726
diff
changeset
|
398 |
|
da59ff099b32
core (memory/encryption), plugin OTR: finished OTR integration in encryption:
Goffi <goffi@goffi.org>
parents:
2726
diff
changeset
|
399 def stopEncryption(self, client, entity_jid): |
|
da59ff099b32
core (memory/encryption), plugin OTR: finished OTR integration in encryption:
Goffi <goffi@goffi.org>
parents:
2726
diff
changeset
|
400 self.endSession(client, entity_jid) |
|
da59ff099b32
core (memory/encryption), plugin OTR: finished OTR integration in encryption:
Goffi <goffi@goffi.org>
parents:
2726
diff
changeset
|
401 |
|
da59ff099b32
core (memory/encryption), plugin OTR: finished OTR integration in encryption:
Goffi <goffi@goffi.org>
parents:
2726
diff
changeset
|
402 def getTrustUI(self, client, entity_jid): |
|
da59ff099b32
core (memory/encryption), plugin OTR: finished OTR integration in encryption:
Goffi <goffi@goffi.org>
parents:
2726
diff
changeset
|
403 if not entity_jid.resource: |
|
da59ff099b32
core (memory/encryption), plugin OTR: finished OTR integration in encryption:
Goffi <goffi@goffi.org>
parents:
2726
diff
changeset
|
404 entity_jid.resource = self.host.memory.getMainResource( |
|
da59ff099b32
core (memory/encryption), plugin OTR: finished OTR integration in encryption:
Goffi <goffi@goffi.org>
parents:
2726
diff
changeset
|
405 client, entity_jid |
|
da59ff099b32
core (memory/encryption), plugin OTR: finished OTR integration in encryption:
Goffi <goffi@goffi.org>
parents:
2726
diff
changeset
|
406 ) # FIXME: temporary and unsecure, must be changed when frontends |
|
da59ff099b32
core (memory/encryption), plugin OTR: finished OTR integration in encryption:
Goffi <goffi@goffi.org>
parents:
2726
diff
changeset
|
407 # are refactored |
|
da59ff099b32
core (memory/encryption), plugin OTR: finished OTR integration in encryption:
Goffi <goffi@goffi.org>
parents:
2726
diff
changeset
|
408 ctxMng = client._otr_context_manager |
|
da59ff099b32
core (memory/encryption), plugin OTR: finished OTR integration in encryption:
Goffi <goffi@goffi.org>
parents:
2726
diff
changeset
|
409 otrctx = ctxMng.getContextForUser(entity_jid) |
|
da59ff099b32
core (memory/encryption), plugin OTR: finished OTR integration in encryption:
Goffi <goffi@goffi.org>
parents:
2726
diff
changeset
|
410 priv_key = ctxMng.account.privkey |
|
da59ff099b32
core (memory/encryption), plugin OTR: finished OTR integration in encryption:
Goffi <goffi@goffi.org>
parents:
2726
diff
changeset
|
411 |
|
da59ff099b32
core (memory/encryption), plugin OTR: finished OTR integration in encryption:
Goffi <goffi@goffi.org>
parents:
2726
diff
changeset
|
412 if priv_key is None: |
|
da59ff099b32
core (memory/encryption), plugin OTR: finished OTR integration in encryption:
Goffi <goffi@goffi.org>
parents:
2726
diff
changeset
|
413 # we have no private key yet |
|
da59ff099b32
core (memory/encryption), plugin OTR: finished OTR integration in encryption:
Goffi <goffi@goffi.org>
parents:
2726
diff
changeset
|
414 dialog = xml_tools.XMLUI( |
|
da59ff099b32
core (memory/encryption), plugin OTR: finished OTR integration in encryption:
Goffi <goffi@goffi.org>
parents:
2726
diff
changeset
|
415 C.XMLUI_DIALOG, |
|
da59ff099b32
core (memory/encryption), plugin OTR: finished OTR integration in encryption:
Goffi <goffi@goffi.org>
parents:
2726
diff
changeset
|
416 dialog_opt={ |
|
da59ff099b32
core (memory/encryption), plugin OTR: finished OTR integration in encryption:
Goffi <goffi@goffi.org>
parents:
2726
diff
changeset
|
417 C.XMLUI_DATA_TYPE: C.XMLUI_DIALOG_MESSAGE, |
|
da59ff099b32
core (memory/encryption), plugin OTR: finished OTR integration in encryption:
Goffi <goffi@goffi.org>
parents:
2726
diff
changeset
|
418 C.XMLUI_DATA_MESS: _( |
| 3028 | 419 "You have no private key yet, start an OTR conversation to " |
| 420 "have one" | |
|
2743
da59ff099b32
core (memory/encryption), plugin OTR: finished OTR integration in encryption:
Goffi <goffi@goffi.org>
parents:
2726
diff
changeset
|
421 ), |
|
da59ff099b32
core (memory/encryption), plugin OTR: finished OTR integration in encryption:
Goffi <goffi@goffi.org>
parents:
2726
diff
changeset
|
422 C.XMLUI_DATA_LVL: C.XMLUI_DATA_LVL_WARNING, |
|
da59ff099b32
core (memory/encryption), plugin OTR: finished OTR integration in encryption:
Goffi <goffi@goffi.org>
parents:
2726
diff
changeset
|
423 }, |
| 3028 | 424 title=_("No private key"), |
|
2743
da59ff099b32
core (memory/encryption), plugin OTR: finished OTR integration in encryption:
Goffi <goffi@goffi.org>
parents:
2726
diff
changeset
|
425 ) |
|
da59ff099b32
core (memory/encryption), plugin OTR: finished OTR integration in encryption:
Goffi <goffi@goffi.org>
parents:
2726
diff
changeset
|
426 return dialog |
|
da59ff099b32
core (memory/encryption), plugin OTR: finished OTR integration in encryption:
Goffi <goffi@goffi.org>
parents:
2726
diff
changeset
|
427 |
|
da59ff099b32
core (memory/encryption), plugin OTR: finished OTR integration in encryption:
Goffi <goffi@goffi.org>
parents:
2726
diff
changeset
|
428 other_fingerprint = otrctx.getCurrentKey() |
|
da59ff099b32
core (memory/encryption), plugin OTR: finished OTR integration in encryption:
Goffi <goffi@goffi.org>
parents:
2726
diff
changeset
|
429 |
|
da59ff099b32
core (memory/encryption), plugin OTR: finished OTR integration in encryption:
Goffi <goffi@goffi.org>
parents:
2726
diff
changeset
|
430 if other_fingerprint is None: |
|
da59ff099b32
core (memory/encryption), plugin OTR: finished OTR integration in encryption:
Goffi <goffi@goffi.org>
parents:
2726
diff
changeset
|
431 # we have a private key, but not the fingerprint of our correspondent |
|
da59ff099b32
core (memory/encryption), plugin OTR: finished OTR integration in encryption:
Goffi <goffi@goffi.org>
parents:
2726
diff
changeset
|
432 dialog = xml_tools.XMLUI( |
|
da59ff099b32
core (memory/encryption), plugin OTR: finished OTR integration in encryption:
Goffi <goffi@goffi.org>
parents:
2726
diff
changeset
|
433 C.XMLUI_DIALOG, |
|
da59ff099b32
core (memory/encryption), plugin OTR: finished OTR integration in encryption:
Goffi <goffi@goffi.org>
parents:
2726
diff
changeset
|
434 dialog_opt={ |
|
da59ff099b32
core (memory/encryption), plugin OTR: finished OTR integration in encryption:
Goffi <goffi@goffi.org>
parents:
2726
diff
changeset
|
435 C.XMLUI_DATA_TYPE: C.XMLUI_DIALOG_MESSAGE, |
|
da59ff099b32
core (memory/encryption), plugin OTR: finished OTR integration in encryption:
Goffi <goffi@goffi.org>
parents:
2726
diff
changeset
|
436 C.XMLUI_DATA_MESS: _( |
| 3028 | 437 "Your fingerprint is:\n{fingerprint}\n\n" |
| 438 "Start an OTR conversation to have your correspondent one." | |
|
2743
da59ff099b32
core (memory/encryption), plugin OTR: finished OTR integration in encryption:
Goffi <goffi@goffi.org>
parents:
2726
diff
changeset
|
439 ).format(fingerprint=priv_key), |
|
da59ff099b32
core (memory/encryption), plugin OTR: finished OTR integration in encryption:
Goffi <goffi@goffi.org>
parents:
2726
diff
changeset
|
440 C.XMLUI_DATA_LVL: C.XMLUI_DATA_LVL_INFO, |
|
da59ff099b32
core (memory/encryption), plugin OTR: finished OTR integration in encryption:
Goffi <goffi@goffi.org>
parents:
2726
diff
changeset
|
441 }, |
| 3028 | 442 title=_("Fingerprint"), |
|
2743
da59ff099b32
core (memory/encryption), plugin OTR: finished OTR integration in encryption:
Goffi <goffi@goffi.org>
parents:
2726
diff
changeset
|
443 ) |
|
da59ff099b32
core (memory/encryption), plugin OTR: finished OTR integration in encryption:
Goffi <goffi@goffi.org>
parents:
2726
diff
changeset
|
444 return dialog |
|
da59ff099b32
core (memory/encryption), plugin OTR: finished OTR integration in encryption:
Goffi <goffi@goffi.org>
parents:
2726
diff
changeset
|
445 |
|
da59ff099b32
core (memory/encryption), plugin OTR: finished OTR integration in encryption:
Goffi <goffi@goffi.org>
parents:
2726
diff
changeset
|
446 def setTrust(raw_data, profile): |
|
da59ff099b32
core (memory/encryption), plugin OTR: finished OTR integration in encryption:
Goffi <goffi@goffi.org>
parents:
2726
diff
changeset
|
447 if xml_tools.isXMLUICancelled(raw_data): |
|
da59ff099b32
core (memory/encryption), plugin OTR: finished OTR integration in encryption:
Goffi <goffi@goffi.org>
parents:
2726
diff
changeset
|
448 return {} |
|
da59ff099b32
core (memory/encryption), plugin OTR: finished OTR integration in encryption:
Goffi <goffi@goffi.org>
parents:
2726
diff
changeset
|
449 # This method is called when authentication form is submited |
|
da59ff099b32
core (memory/encryption), plugin OTR: finished OTR integration in encryption:
Goffi <goffi@goffi.org>
parents:
2726
diff
changeset
|
450 data = xml_tools.XMLUIResult2DataFormResult(raw_data) |
|
da59ff099b32
core (memory/encryption), plugin OTR: finished OTR integration in encryption:
Goffi <goffi@goffi.org>
parents:
2726
diff
changeset
|
451 if data["match"] == "yes": |
|
da59ff099b32
core (memory/encryption), plugin OTR: finished OTR integration in encryption:
Goffi <goffi@goffi.org>
parents:
2726
diff
changeset
|
452 otrctx.setCurrentTrust(OTR_STATE_TRUSTED) |
| 3028 | 453 note_msg = _("Your correspondent {correspondent} is now TRUSTED") |
|
2743
da59ff099b32
core (memory/encryption), plugin OTR: finished OTR integration in encryption:
Goffi <goffi@goffi.org>
parents:
2726
diff
changeset
|
454 self.host.bridge.otrState( |
|
da59ff099b32
core (memory/encryption), plugin OTR: finished OTR integration in encryption:
Goffi <goffi@goffi.org>
parents:
2726
diff
changeset
|
455 OTR_STATE_TRUSTED, entity_jid.full(), client.profile |
|
da59ff099b32
core (memory/encryption), plugin OTR: finished OTR integration in encryption:
Goffi <goffi@goffi.org>
parents:
2726
diff
changeset
|
456 ) |
|
da59ff099b32
core (memory/encryption), plugin OTR: finished OTR integration in encryption:
Goffi <goffi@goffi.org>
parents:
2726
diff
changeset
|
457 else: |
|
da59ff099b32
core (memory/encryption), plugin OTR: finished OTR integration in encryption:
Goffi <goffi@goffi.org>
parents:
2726
diff
changeset
|
458 otrctx.setCurrentTrust("") |
| 3028 | 459 note_msg = _("Your correspondent {correspondent} is now UNTRUSTED") |
|
2743
da59ff099b32
core (memory/encryption), plugin OTR: finished OTR integration in encryption:
Goffi <goffi@goffi.org>
parents:
2726
diff
changeset
|
460 self.host.bridge.otrState( |
|
da59ff099b32
core (memory/encryption), plugin OTR: finished OTR integration in encryption:
Goffi <goffi@goffi.org>
parents:
2726
diff
changeset
|
461 OTR_STATE_UNTRUSTED, entity_jid.full(), client.profile |
|
da59ff099b32
core (memory/encryption), plugin OTR: finished OTR integration in encryption:
Goffi <goffi@goffi.org>
parents:
2726
diff
changeset
|
462 ) |
|
da59ff099b32
core (memory/encryption), plugin OTR: finished OTR integration in encryption:
Goffi <goffi@goffi.org>
parents:
2726
diff
changeset
|
463 note = xml_tools.XMLUI( |
|
da59ff099b32
core (memory/encryption), plugin OTR: finished OTR integration in encryption:
Goffi <goffi@goffi.org>
parents:
2726
diff
changeset
|
464 C.XMLUI_DIALOG, |
|
da59ff099b32
core (memory/encryption), plugin OTR: finished OTR integration in encryption:
Goffi <goffi@goffi.org>
parents:
2726
diff
changeset
|
465 dialog_opt={ |
|
da59ff099b32
core (memory/encryption), plugin OTR: finished OTR integration in encryption:
Goffi <goffi@goffi.org>
parents:
2726
diff
changeset
|
466 C.XMLUI_DATA_TYPE: C.XMLUI_DIALOG_NOTE, |
|
da59ff099b32
core (memory/encryption), plugin OTR: finished OTR integration in encryption:
Goffi <goffi@goffi.org>
parents:
2726
diff
changeset
|
467 C.XMLUI_DATA_MESS: note_msg.format(correspondent=otrctx.peer), |
|
da59ff099b32
core (memory/encryption), plugin OTR: finished OTR integration in encryption:
Goffi <goffi@goffi.org>
parents:
2726
diff
changeset
|
468 }, |
|
da59ff099b32
core (memory/encryption), plugin OTR: finished OTR integration in encryption:
Goffi <goffi@goffi.org>
parents:
2726
diff
changeset
|
469 ) |
|
da59ff099b32
core (memory/encryption), plugin OTR: finished OTR integration in encryption:
Goffi <goffi@goffi.org>
parents:
2726
diff
changeset
|
470 return {"xmlui": note.toXml()} |
|
da59ff099b32
core (memory/encryption), plugin OTR: finished OTR integration in encryption:
Goffi <goffi@goffi.org>
parents:
2726
diff
changeset
|
471 |
|
da59ff099b32
core (memory/encryption), plugin OTR: finished OTR integration in encryption:
Goffi <goffi@goffi.org>
parents:
2726
diff
changeset
|
472 submit_id = self.host.registerCallback(setTrust, with_data=True, one_shot=True) |
|
da59ff099b32
core (memory/encryption), plugin OTR: finished OTR integration in encryption:
Goffi <goffi@goffi.org>
parents:
2726
diff
changeset
|
473 trusted = otrctx.isTrusted() |
|
da59ff099b32
core (memory/encryption), plugin OTR: finished OTR integration in encryption:
Goffi <goffi@goffi.org>
parents:
2726
diff
changeset
|
474 |
|
da59ff099b32
core (memory/encryption), plugin OTR: finished OTR integration in encryption:
Goffi <goffi@goffi.org>
parents:
2726
diff
changeset
|
475 xmlui = xml_tools.XMLUI( |
|
da59ff099b32
core (memory/encryption), plugin OTR: finished OTR integration in encryption:
Goffi <goffi@goffi.org>
parents:
2726
diff
changeset
|
476 C.XMLUI_FORM, |
| 3028 | 477 title=_("Authentication ({entity_jid})").format(entity_jid=entity_jid.full()), |
|
2743
da59ff099b32
core (memory/encryption), plugin OTR: finished OTR integration in encryption:
Goffi <goffi@goffi.org>
parents:
2726
diff
changeset
|
478 submit_id=submit_id, |
|
da59ff099b32
core (memory/encryption), plugin OTR: finished OTR integration in encryption:
Goffi <goffi@goffi.org>
parents:
2726
diff
changeset
|
479 ) |
|
da59ff099b32
core (memory/encryption), plugin OTR: finished OTR integration in encryption:
Goffi <goffi@goffi.org>
parents:
2726
diff
changeset
|
480 xmlui.addText(_(AUTH_TXT)) |
|
da59ff099b32
core (memory/encryption), plugin OTR: finished OTR integration in encryption:
Goffi <goffi@goffi.org>
parents:
2726
diff
changeset
|
481 xmlui.addDivider() |
|
da59ff099b32
core (memory/encryption), plugin OTR: finished OTR integration in encryption:
Goffi <goffi@goffi.org>
parents:
2726
diff
changeset
|
482 xmlui.addText( |
| 3028 | 483 D_("Your own fingerprint is:\n{fingerprint}").format(fingerprint=priv_key) |
|
2743
da59ff099b32
core (memory/encryption), plugin OTR: finished OTR integration in encryption:
Goffi <goffi@goffi.org>
parents:
2726
diff
changeset
|
484 ) |
|
da59ff099b32
core (memory/encryption), plugin OTR: finished OTR integration in encryption:
Goffi <goffi@goffi.org>
parents:
2726
diff
changeset
|
485 xmlui.addText( |
| 3028 | 486 D_("Your correspondent fingerprint should be:\n{fingerprint}").format( |
|
2743
da59ff099b32
core (memory/encryption), plugin OTR: finished OTR integration in encryption:
Goffi <goffi@goffi.org>
parents:
2726
diff
changeset
|
487 fingerprint=other_fingerprint |
|
da59ff099b32
core (memory/encryption), plugin OTR: finished OTR integration in encryption:
Goffi <goffi@goffi.org>
parents:
2726
diff
changeset
|
488 ) |
|
da59ff099b32
core (memory/encryption), plugin OTR: finished OTR integration in encryption:
Goffi <goffi@goffi.org>
parents:
2726
diff
changeset
|
489 ) |
|
da59ff099b32
core (memory/encryption), plugin OTR: finished OTR integration in encryption:
Goffi <goffi@goffi.org>
parents:
2726
diff
changeset
|
490 xmlui.addDivider("blank") |
|
da59ff099b32
core (memory/encryption), plugin OTR: finished OTR integration in encryption:
Goffi <goffi@goffi.org>
parents:
2726
diff
changeset
|
491 xmlui.changeContainer("pairs") |
| 3028 | 492 xmlui.addLabel(D_("Is your correspondent fingerprint the same as here ?")) |
|
2743
da59ff099b32
core (memory/encryption), plugin OTR: finished OTR integration in encryption:
Goffi <goffi@goffi.org>
parents:
2726
diff
changeset
|
493 xmlui.addList( |
|
da59ff099b32
core (memory/encryption), plugin OTR: finished OTR integration in encryption:
Goffi <goffi@goffi.org>
parents:
2726
diff
changeset
|
494 "match", [("yes", _("yes")), ("no", _("no"))], ["yes" if trusted else "no"] |
|
da59ff099b32
core (memory/encryption), plugin OTR: finished OTR integration in encryption:
Goffi <goffi@goffi.org>
parents:
2726
diff
changeset
|
495 ) |
|
da59ff099b32
core (memory/encryption), plugin OTR: finished OTR integration in encryption:
Goffi <goffi@goffi.org>
parents:
2726
diff
changeset
|
496 return xmlui |
|
da59ff099b32
core (memory/encryption), plugin OTR: finished OTR integration in encryption:
Goffi <goffi@goffi.org>
parents:
2726
diff
changeset
|
497 |
| 2125 | 498 def _otrStartRefresh(self, menu_data, profile): |
|
1136
ea2bbdf5b541
plugin OTR: added start/refresh and end session menus
Goffi <goffi@goffi.org>
parents:
1135
diff
changeset
|
499 """Start or refresh an OTR session |
|
ea2bbdf5b541
plugin OTR: added start/refresh and end session menus
Goffi <goffi@goffi.org>
parents:
1135
diff
changeset
|
500 |
|
ea2bbdf5b541
plugin OTR: added start/refresh and end session menus
Goffi <goffi@goffi.org>
parents:
1135
diff
changeset
|
501 @param menu_data: %(menu_data)s |
|
ea2bbdf5b541
plugin OTR: added start/refresh and end session menus
Goffi <goffi@goffi.org>
parents:
1135
diff
changeset
|
502 @param profile: %(doc_profile)s |
|
ea2bbdf5b541
plugin OTR: added start/refresh and end session menus
Goffi <goffi@goffi.org>
parents:
1135
diff
changeset
|
503 """ |
|
1970
200cd707a46d
plugin XEP-0045, quick_frontend + primitivus (chat): cleaning of XEP-0045 (first pass):
Goffi <goffi@goffi.org>
parents:
1963
diff
changeset
|
504 client = self.host.getClient(profile) |
|
1136
ea2bbdf5b541
plugin OTR: added start/refresh and end session menus
Goffi <goffi@goffi.org>
parents:
1135
diff
changeset
|
505 try: |
|
2624
56f94936df1e
code style reformatting using black
Goffi <goffi@goffi.org>
parents:
2562
diff
changeset
|
506 to_jid = jid.JID(menu_data["jid"]) |
|
1136
ea2bbdf5b541
plugin OTR: added start/refresh and end session menus
Goffi <goffi@goffi.org>
parents:
1135
diff
changeset
|
507 except KeyError: |
| 3028 | 508 log.error(_("jid key is not present !")) |
|
1136
ea2bbdf5b541
plugin OTR: added start/refresh and end session menus
Goffi <goffi@goffi.org>
parents:
1135
diff
changeset
|
509 return defer.fail(exceptions.DataError) |
| 2125 | 510 self.startRefresh(client, to_jid) |
|
1136
ea2bbdf5b541
plugin OTR: added start/refresh and end session menus
Goffi <goffi@goffi.org>
parents:
1135
diff
changeset
|
511 return {} |
|
ea2bbdf5b541
plugin OTR: added start/refresh and end session menus
Goffi <goffi@goffi.org>
parents:
1135
diff
changeset
|
512 |
| 2125 | 513 def startRefresh(self, client, to_jid): |
| 514 """Start or refresh an OTR session | |
| 515 | |
| 516 @param to_jid(jid.JID): jid to start encrypted session with | |
| 517 """ | |
|
2653
7213caa5c5d0
plugin OTR: integrated in new encryption handler + fixed use of bare jid where full jid was expected
Goffi <goffi@goffi.org>
parents:
2643
diff
changeset
|
518 encrypted_session = client.encryption.getSession(to_jid.userhostJID()) |
| 3028 | 519 if encrypted_session and encrypted_session['plugin'].namespace != NS_OTR: |
|
2653
7213caa5c5d0
plugin OTR: integrated in new encryption handler + fixed use of bare jid where full jid was expected
Goffi <goffi@goffi.org>
parents:
2643
diff
changeset
|
520 raise exceptions.ConflictError(_( |
| 3028 | 521 "Can't start an OTR session, there is already an encrypted session " |
| 522 "with {name}").format(name=encrypted_session['plugin'].name)) | |
| 2125 | 523 if not to_jid.resource: |
|
2624
56f94936df1e
code style reformatting using black
Goffi <goffi@goffi.org>
parents:
2562
diff
changeset
|
524 to_jid.resource = self.host.memory.getMainResource( |
|
56f94936df1e
code style reformatting using black
Goffi <goffi@goffi.org>
parents:
2562
diff
changeset
|
525 client, to_jid |
|
2643
189e38fb11ff
core: style improvments (90 chars limit)
Goffi <goffi@goffi.org>
parents:
2624
diff
changeset
|
526 ) # FIXME: temporary and unsecure, must be changed when frontends |
|
189e38fb11ff
core: style improvments (90 chars limit)
Goffi <goffi@goffi.org>
parents:
2624
diff
changeset
|
527 # are refactored |
| 2128 | 528 otrctx = client._otr_context_manager.getContextForUser(to_jid) |
| 3040 | 529 query = otrctx.sendMessage(0, b"?OTRv?") |
| 2125 | 530 otrctx.inject(query) |
| 531 | |
| 532 def _otrSessionEnd(self, menu_data, profile): | |
|
1136
ea2bbdf5b541
plugin OTR: added start/refresh and end session menus
Goffi <goffi@goffi.org>
parents:
1135
diff
changeset
|
533 """End an OTR session |
|
ea2bbdf5b541
plugin OTR: added start/refresh and end session menus
Goffi <goffi@goffi.org>
parents:
1135
diff
changeset
|
534 |
|
ea2bbdf5b541
plugin OTR: added start/refresh and end session menus
Goffi <goffi@goffi.org>
parents:
1135
diff
changeset
|
535 @param menu_data: %(menu_data)s |
|
ea2bbdf5b541
plugin OTR: added start/refresh and end session menus
Goffi <goffi@goffi.org>
parents:
1135
diff
changeset
|
536 @param profile: %(doc_profile)s |
|
ea2bbdf5b541
plugin OTR: added start/refresh and end session menus
Goffi <goffi@goffi.org>
parents:
1135
diff
changeset
|
537 """ |
|
1970
200cd707a46d
plugin XEP-0045, quick_frontend + primitivus (chat): cleaning of XEP-0045 (first pass):
Goffi <goffi@goffi.org>
parents:
1963
diff
changeset
|
538 client = self.host.getClient(profile) |
|
1136
ea2bbdf5b541
plugin OTR: added start/refresh and end session menus
Goffi <goffi@goffi.org>
parents:
1135
diff
changeset
|
539 try: |
|
2624
56f94936df1e
code style reformatting using black
Goffi <goffi@goffi.org>
parents:
2562
diff
changeset
|
540 to_jid = jid.JID(menu_data["jid"]) |
|
1136
ea2bbdf5b541
plugin OTR: added start/refresh and end session menus
Goffi <goffi@goffi.org>
parents:
1135
diff
changeset
|
541 except KeyError: |
| 3028 | 542 log.error(_("jid key is not present !")) |
|
1136
ea2bbdf5b541
plugin OTR: added start/refresh and end session menus
Goffi <goffi@goffi.org>
parents:
1135
diff
changeset
|
543 return defer.fail(exceptions.DataError) |
| 2125 | 544 self.endSession(client, to_jid) |
| 545 return {} | |
| 546 | |
| 547 def endSession(self, client, to_jid): | |
| 548 """End an OTR session""" | |
| 549 if not to_jid.resource: | |
|
2624
56f94936df1e
code style reformatting using black
Goffi <goffi@goffi.org>
parents:
2562
diff
changeset
|
550 to_jid.resource = self.host.memory.getMainResource( |
|
56f94936df1e
code style reformatting using black
Goffi <goffi@goffi.org>
parents:
2562
diff
changeset
|
551 client, to_jid |
|
2643
189e38fb11ff
core: style improvments (90 chars limit)
Goffi <goffi@goffi.org>
parents:
2624
diff
changeset
|
552 ) # FIXME: temporary and unsecure, must be changed when frontends |
|
189e38fb11ff
core: style improvments (90 chars limit)
Goffi <goffi@goffi.org>
parents:
2624
diff
changeset
|
553 # are refactored |
| 2128 | 554 otrctx = client._otr_context_manager.getContextForUser(to_jid) |
|
1136
ea2bbdf5b541
plugin OTR: added start/refresh and end session menus
Goffi <goffi@goffi.org>
parents:
1135
diff
changeset
|
555 otrctx.disconnect() |
|
ea2bbdf5b541
plugin OTR: added start/refresh and end session menus
Goffi <goffi@goffi.org>
parents:
1135
diff
changeset
|
556 return {} |
|
ea2bbdf5b541
plugin OTR: added start/refresh and end session menus
Goffi <goffi@goffi.org>
parents:
1135
diff
changeset
|
557 |
| 2125 | 558 def _otrAuthenticate(self, menu_data, profile): |
| 559 """End an OTR session | |
|
1141
7fcafc3206b1
plugin OTR: authentication management + fixed a bug in setState (due to a wrong docstring in potr.context.getCurrentTrust)
Goffi <goffi@goffi.org>
parents:
1137
diff
changeset
|
560 |
|
7fcafc3206b1
plugin OTR: authentication management + fixed a bug in setState (due to a wrong docstring in potr.context.getCurrentTrust)
Goffi <goffi@goffi.org>
parents:
1137
diff
changeset
|
561 @param menu_data: %(menu_data)s |
|
7fcafc3206b1
plugin OTR: authentication management + fixed a bug in setState (due to a wrong docstring in potr.context.getCurrentTrust)
Goffi <goffi@goffi.org>
parents:
1137
diff
changeset
|
562 @param profile: %(doc_profile)s |
|
7fcafc3206b1
plugin OTR: authentication management + fixed a bug in setState (due to a wrong docstring in potr.context.getCurrentTrust)
Goffi <goffi@goffi.org>
parents:
1137
diff
changeset
|
563 """ |
|
1970
200cd707a46d
plugin XEP-0045, quick_frontend + primitivus (chat): cleaning of XEP-0045 (first pass):
Goffi <goffi@goffi.org>
parents:
1963
diff
changeset
|
564 client = self.host.getClient(profile) |
|
1141
7fcafc3206b1
plugin OTR: authentication management + fixed a bug in setState (due to a wrong docstring in potr.context.getCurrentTrust)
Goffi <goffi@goffi.org>
parents:
1137
diff
changeset
|
565 try: |
|
2624
56f94936df1e
code style reformatting using black
Goffi <goffi@goffi.org>
parents:
2562
diff
changeset
|
566 to_jid = jid.JID(menu_data["jid"]) |
|
1141
7fcafc3206b1
plugin OTR: authentication management + fixed a bug in setState (due to a wrong docstring in potr.context.getCurrentTrust)
Goffi <goffi@goffi.org>
parents:
1137
diff
changeset
|
567 except KeyError: |
| 3028 | 568 log.error(_("jid key is not present !")) |
|
1141
7fcafc3206b1
plugin OTR: authentication management + fixed a bug in setState (due to a wrong docstring in potr.context.getCurrentTrust)
Goffi <goffi@goffi.org>
parents:
1137
diff
changeset
|
569 return defer.fail(exceptions.DataError) |
| 2125 | 570 return self.authenticate(client, to_jid) |
| 571 | |
| 572 def authenticate(self, client, to_jid): | |
| 573 """Authenticate other user and see our own fingerprint""" | |
|
2743
da59ff099b32
core (memory/encryption), plugin OTR: finished OTR integration in encryption:
Goffi <goffi@goffi.org>
parents:
2726
diff
changeset
|
574 xmlui = self.getTrustUI(client, to_jid) |
|
2624
56f94936df1e
code style reformatting using black
Goffi <goffi@goffi.org>
parents:
2562
diff
changeset
|
575 return {"xmlui": xmlui.toXml()} |
|
1141
7fcafc3206b1
plugin OTR: authentication management + fixed a bug in setState (due to a wrong docstring in potr.context.getCurrentTrust)
Goffi <goffi@goffi.org>
parents:
1137
diff
changeset
|
576 |
|
1144
2481fa96ac1c
plugin OTR: added ability to drop private key
Goffi <goffi@goffi.org>
parents:
1141
diff
changeset
|
577 def _dropPrivKey(self, menu_data, profile): |
|
2481fa96ac1c
plugin OTR: added ability to drop private key
Goffi <goffi@goffi.org>
parents:
1141
diff
changeset
|
578 """Drop our private Key |
|
2481fa96ac1c
plugin OTR: added ability to drop private key
Goffi <goffi@goffi.org>
parents:
1141
diff
changeset
|
579 |
|
2481fa96ac1c
plugin OTR: added ability to drop private key
Goffi <goffi@goffi.org>
parents:
1141
diff
changeset
|
580 @param menu_data: %(menu_data)s |
|
2481fa96ac1c
plugin OTR: added ability to drop private key
Goffi <goffi@goffi.org>
parents:
1141
diff
changeset
|
581 @param profile: %(doc_profile)s |
|
2481fa96ac1c
plugin OTR: added ability to drop private key
Goffi <goffi@goffi.org>
parents:
1141
diff
changeset
|
582 """ |
|
1970
200cd707a46d
plugin XEP-0045, quick_frontend + primitivus (chat): cleaning of XEP-0045 (first pass):
Goffi <goffi@goffi.org>
parents:
1963
diff
changeset
|
583 client = self.host.getClient(profile) |
|
1144
2481fa96ac1c
plugin OTR: added ability to drop private key
Goffi <goffi@goffi.org>
parents:
1141
diff
changeset
|
584 try: |
|
2624
56f94936df1e
code style reformatting using black
Goffi <goffi@goffi.org>
parents:
2562
diff
changeset
|
585 to_jid = jid.JID(menu_data["jid"]) |
|
1144
2481fa96ac1c
plugin OTR: added ability to drop private key
Goffi <goffi@goffi.org>
parents:
1141
diff
changeset
|
586 if not to_jid.resource: |
|
2624
56f94936df1e
code style reformatting using black
Goffi <goffi@goffi.org>
parents:
2562
diff
changeset
|
587 to_jid.resource = self.host.memory.getMainResource( |
|
56f94936df1e
code style reformatting using black
Goffi <goffi@goffi.org>
parents:
2562
diff
changeset
|
588 client, to_jid |
|
2643
189e38fb11ff
core: style improvments (90 chars limit)
Goffi <goffi@goffi.org>
parents:
2624
diff
changeset
|
589 ) # FIXME: temporary and unsecure, must be changed when frontends |
|
189e38fb11ff
core: style improvments (90 chars limit)
Goffi <goffi@goffi.org>
parents:
2624
diff
changeset
|
590 # are refactored |
|
1144
2481fa96ac1c
plugin OTR: added ability to drop private key
Goffi <goffi@goffi.org>
parents:
1141
diff
changeset
|
591 except KeyError: |
| 3028 | 592 log.error(_("jid key is not present !")) |
|
1144
2481fa96ac1c
plugin OTR: added ability to drop private key
Goffi <goffi@goffi.org>
parents:
1141
diff
changeset
|
593 return defer.fail(exceptions.DataError) |
|
2481fa96ac1c
plugin OTR: added ability to drop private key
Goffi <goffi@goffi.org>
parents:
1141
diff
changeset
|
594 |
| 2128 | 595 ctxMng = client._otr_context_manager |
|
1146
1ac5ea74dbdf
plugin OTR: remove unnecessary attribute SatXMPPClient.otr_priv_key
souliane <souliane@mailoo.org>
parents:
1144
diff
changeset
|
596 if ctxMng.account.privkey is None: |
|
2624
56f94936df1e
code style reformatting using black
Goffi <goffi@goffi.org>
parents:
2562
diff
changeset
|
597 return { |
| 3028 | 598 "xmlui": xml_tools.note(_("You don't have a private key yet !")).toXml() |
|
2624
56f94936df1e
code style reformatting using black
Goffi <goffi@goffi.org>
parents:
2562
diff
changeset
|
599 } |
|
1144
2481fa96ac1c
plugin OTR: added ability to drop private key
Goffi <goffi@goffi.org>
parents:
1141
diff
changeset
|
600 |
|
2481fa96ac1c
plugin OTR: added ability to drop private key
Goffi <goffi@goffi.org>
parents:
1141
diff
changeset
|
601 def dropKey(data, profile): |
|
2624
56f94936df1e
code style reformatting using black
Goffi <goffi@goffi.org>
parents:
2562
diff
changeset
|
602 if C.bool(data["answer"]): |
|
1144
2481fa96ac1c
plugin OTR: added ability to drop private key
Goffi <goffi@goffi.org>
parents:
1141
diff
changeset
|
603 # we end all sessions |
| 3028 | 604 for context in list(ctxMng.contexts.values()): |
|
1169
a3354063dfb6
plugin OTR: disconnect the active OTR sessions and delete the context on profile disconnection
souliane <souliane@mailoo.org>
parents:
1168
diff
changeset
|
605 context.disconnect() |
|
1147
736f1dd6e142
plugin OTR: two small fixes
souliane <souliane@mailoo.org>
parents:
1146
diff
changeset
|
606 ctxMng.account.privkey = None |
|
2643
189e38fb11ff
core: style improvments (90 chars limit)
Goffi <goffi@goffi.org>
parents:
2624
diff
changeset
|
607 ctxMng.account.getPrivkey() # as account.privkey is None, getPrivkey |
|
189e38fb11ff
core: style improvments (90 chars limit)
Goffi <goffi@goffi.org>
parents:
2624
diff
changeset
|
608 # will generate a new key, and save it |
|
2624
56f94936df1e
code style reformatting using black
Goffi <goffi@goffi.org>
parents:
2562
diff
changeset
|
609 return { |
|
56f94936df1e
code style reformatting using black
Goffi <goffi@goffi.org>
parents:
2562
diff
changeset
|
610 "xmlui": xml_tools.note( |
| 3028 | 611 D_("Your private key has been dropped") |
|
2624
56f94936df1e
code style reformatting using black
Goffi <goffi@goffi.org>
parents:
2562
diff
changeset
|
612 ).toXml() |
|
56f94936df1e
code style reformatting using black
Goffi <goffi@goffi.org>
parents:
2562
diff
changeset
|
613 } |
|
1144
2481fa96ac1c
plugin OTR: added ability to drop private key
Goffi <goffi@goffi.org>
parents:
1141
diff
changeset
|
614 return {} |
|
2481fa96ac1c
plugin OTR: added ability to drop private key
Goffi <goffi@goffi.org>
parents:
1141
diff
changeset
|
615 |
|
2481fa96ac1c
plugin OTR: added ability to drop private key
Goffi <goffi@goffi.org>
parents:
1141
diff
changeset
|
616 submit_id = self.host.registerCallback(dropKey, with_data=True, one_shot=True) |
|
2481fa96ac1c
plugin OTR: added ability to drop private key
Goffi <goffi@goffi.org>
parents:
1141
diff
changeset
|
617 |
|
2624
56f94936df1e
code style reformatting using black
Goffi <goffi@goffi.org>
parents:
2562
diff
changeset
|
618 confirm = xml_tools.XMLUI( |
|
56f94936df1e
code style reformatting using black
Goffi <goffi@goffi.org>
parents:
2562
diff
changeset
|
619 C.XMLUI_DIALOG, |
| 3028 | 620 title=_("Confirm private key drop"), |
|
2624
56f94936df1e
code style reformatting using black
Goffi <goffi@goffi.org>
parents:
2562
diff
changeset
|
621 dialog_opt={"type": C.XMLUI_DIALOG_CONFIRM, "message": _(DROP_TXT)}, |
|
56f94936df1e
code style reformatting using black
Goffi <goffi@goffi.org>
parents:
2562
diff
changeset
|
622 submit_id=submit_id, |
|
56f94936df1e
code style reformatting using black
Goffi <goffi@goffi.org>
parents:
2562
diff
changeset
|
623 ) |
|
56f94936df1e
code style reformatting using black
Goffi <goffi@goffi.org>
parents:
2562
diff
changeset
|
624 return {"xmlui": confirm.toXml()} |
|
1144
2481fa96ac1c
plugin OTR: added ability to drop private key
Goffi <goffi@goffi.org>
parents:
1141
diff
changeset
|
625 |
| 2128 | 626 def _receivedTreatment(self, data, client): |
|
2624
56f94936df1e
code style reformatting using black
Goffi <goffi@goffi.org>
parents:
2562
diff
changeset
|
627 from_jid = data["from"] |
| 3028 | 628 log.debug("_receivedTreatment [from_jid = %s]" % from_jid) |
| 2128 | 629 otrctx = client._otr_context_manager.getContextForUser(from_jid) |
| 1055 | 630 |
| 631 try: | |
|
2624
56f94936df1e
code style reformatting using black
Goffi <goffi@goffi.org>
parents:
2562
diff
changeset
|
632 message = ( |
| 3028 | 633 next(iter(data["message"].values())) |
|
2624
56f94936df1e
code style reformatting using black
Goffi <goffi@goffi.org>
parents:
2562
diff
changeset
|
634 ) # FIXME: Q&D fix for message refactoring, message is now a dict |
|
56f94936df1e
code style reformatting using black
Goffi <goffi@goffi.org>
parents:
2562
diff
changeset
|
635 res = otrctx.receiveMessage(message.encode("utf-8")) |
|
3058
0408df45ebe7
plugin OTR: work around a bad exception raised in potr
Goffi <goffi@goffi.org>
parents:
3040
diff
changeset
|
636 except (potr.context.UnencryptedMessage, potr.context.NotOTRMessage): |
|
0408df45ebe7
plugin OTR: work around a bad exception raised in potr
Goffi <goffi@goffi.org>
parents:
3040
diff
changeset
|
637 # potr has a bug with Python 3 and test message against str while bytes are |
|
0408df45ebe7
plugin OTR: work around a bad exception raised in potr
Goffi <goffi@goffi.org>
parents:
3040
diff
changeset
|
638 # expected, resulting in a NoOTRMessage raised instead of UnencryptedMessage; |
|
0408df45ebe7
plugin OTR: work around a bad exception raised in potr
Goffi <goffi@goffi.org>
parents:
3040
diff
changeset
|
639 # so we catch NotOTRMessage as a workaround |
|
0408df45ebe7
plugin OTR: work around a bad exception raised in potr
Goffi <goffi@goffi.org>
parents:
3040
diff
changeset
|
640 # TODO: report this upstream |
| 2128 | 641 encrypted = False |
| 1095 | 642 if otrctx.state == potr.context.STATE_ENCRYPTED: |
|
2624
56f94936df1e
code style reformatting using black
Goffi <goffi@goffi.org>
parents:
2562
diff
changeset
|
643 log.warning( |
| 3028 | 644 "Received unencrypted message in an encrypted context (from {jid})" |
|
2643
189e38fb11ff
core: style improvments (90 chars limit)
Goffi <goffi@goffi.org>
parents:
2624
diff
changeset
|
645 .format(jid=from_jid.full()) |
|
2624
56f94936df1e
code style reformatting using black
Goffi <goffi@goffi.org>
parents:
2562
diff
changeset
|
646 ) |
| 2125 | 647 |
|
2624
56f94936df1e
code style reformatting using black
Goffi <goffi@goffi.org>
parents:
2562
diff
changeset
|
648 feedback = ( |
|
56f94936df1e
code style reformatting using black
Goffi <goffi@goffi.org>
parents:
2562
diff
changeset
|
649 D_( |
| 3028 | 650 "WARNING: received unencrypted data in a supposedly encrypted " |
| 651 "context" | |
|
2624
56f94936df1e
code style reformatting using black
Goffi <goffi@goffi.org>
parents:
2562
diff
changeset
|
652 ), |
|
56f94936df1e
code style reformatting using black
Goffi <goffi@goffi.org>
parents:
2562
diff
changeset
|
653 ) |
|
2144
1d3f73e065e1
core, jp: component handling + client handling refactoring:
Goffi <goffi@goffi.org>
parents:
2138
diff
changeset
|
654 client.feedback(from_jid, feedback) |
|
2653
7213caa5c5d0
plugin OTR: integrated in new encryption handler + fixed use of bare jid where full jid was expected
Goffi <goffi@goffi.org>
parents:
2643
diff
changeset
|
655 except potr.context.NotEncryptedError: |
| 3028 | 656 msg = D_("WARNING: received OTR encrypted data in an unencrypted context") |
|
2653
7213caa5c5d0
plugin OTR: integrated in new encryption handler + fixed use of bare jid where full jid was expected
Goffi <goffi@goffi.org>
parents:
2643
diff
changeset
|
657 log.warning(msg) |
|
7213caa5c5d0
plugin OTR: integrated in new encryption handler + fixed use of bare jid where full jid was expected
Goffi <goffi@goffi.org>
parents:
2643
diff
changeset
|
658 feedback = msg |
|
7213caa5c5d0
plugin OTR: integrated in new encryption handler + fixed use of bare jid where full jid was expected
Goffi <goffi@goffi.org>
parents:
2643
diff
changeset
|
659 client.feedback(from_jid, msg) |
|
7213caa5c5d0
plugin OTR: integrated in new encryption handler + fixed use of bare jid where full jid was expected
Goffi <goffi@goffi.org>
parents:
2643
diff
changeset
|
660 raise failure.Failure(exceptions.CancelError(msg)) |
|
2726
a86f494457c2
plugin OTR: catch and log potr.context.ErrorReceived instead of raising it.
Goffi <goffi@goffi.org>
parents:
2659
diff
changeset
|
661 except potr.context.ErrorReceived as e: |
| 3028 | 662 msg = D_("WARNING: received OTR error message: {msg}".format(msg=e)) |
|
2726
a86f494457c2
plugin OTR: catch and log potr.context.ErrorReceived instead of raising it.
Goffi <goffi@goffi.org>
parents:
2659
diff
changeset
|
663 log.warning(msg) |
|
a86f494457c2
plugin OTR: catch and log potr.context.ErrorReceived instead of raising it.
Goffi <goffi@goffi.org>
parents:
2659
diff
changeset
|
664 feedback = msg |
|
a86f494457c2
plugin OTR: catch and log potr.context.ErrorReceived instead of raising it.
Goffi <goffi@goffi.org>
parents:
2659
diff
changeset
|
665 client.feedback(from_jid, msg) |
|
a86f494457c2
plugin OTR: catch and log potr.context.ErrorReceived instead of raising it.
Goffi <goffi@goffi.org>
parents:
2659
diff
changeset
|
666 raise failure.Failure(exceptions.CancelError(msg)) |
|
2743
da59ff099b32
core (memory/encryption), plugin OTR: finished OTR integration in encryption:
Goffi <goffi@goffi.org>
parents:
2726
diff
changeset
|
667 except potr.crypt.InvalidParameterError as e: |
| 3028 | 668 msg = D_("Error while trying de decrypt OTR message: {msg}".format(msg=e)) |
|
2743
da59ff099b32
core (memory/encryption), plugin OTR: finished OTR integration in encryption:
Goffi <goffi@goffi.org>
parents:
2726
diff
changeset
|
669 log.warning(msg) |
|
da59ff099b32
core (memory/encryption), plugin OTR: finished OTR integration in encryption:
Goffi <goffi@goffi.org>
parents:
2726
diff
changeset
|
670 feedback = msg |
|
da59ff099b32
core (memory/encryption), plugin OTR: finished OTR integration in encryption:
Goffi <goffi@goffi.org>
parents:
2726
diff
changeset
|
671 client.feedback(from_jid, msg) |
|
da59ff099b32
core (memory/encryption), plugin OTR: finished OTR integration in encryption:
Goffi <goffi@goffi.org>
parents:
2726
diff
changeset
|
672 raise failure.Failure(exceptions.CancelError(msg)) |
|
1955
633b5c21aefd
backend, frontend: messages refactoring (huge commit, not finished):
Goffi <goffi@goffi.org>
parents:
1934
diff
changeset
|
673 except StopIteration: |
|
633b5c21aefd
backend, frontend: messages refactoring (huge commit, not finished):
Goffi <goffi@goffi.org>
parents:
1934
diff
changeset
|
674 return data |
| 2128 | 675 else: |
| 676 encrypted = True | |
| 1055 | 677 |
| 2128 | 678 if encrypted: |
| 1055 | 679 if res[0] != None: |
| 680 # decrypted messages handling. | |
|
2643
189e38fb11ff
core: style improvments (90 chars limit)
Goffi <goffi@goffi.org>
parents:
2624
diff
changeset
|
681 # receiveMessage() will return a tuple, |
|
189e38fb11ff
core: style improvments (90 chars limit)
Goffi <goffi@goffi.org>
parents:
2624
diff
changeset
|
682 # the first part of which will be the decrypted message |
|
2624
56f94936df1e
code style reformatting using black
Goffi <goffi@goffi.org>
parents:
2562
diff
changeset
|
683 data["message"] = { |
| 3028 | 684 "": res[0] |
|
2624
56f94936df1e
code style reformatting using black
Goffi <goffi@goffi.org>
parents:
2562
diff
changeset
|
685 } # FIXME: Q&D fix for message refactoring, message is now a dict |
|
2132
c0577837680a
core: replaced SkipHistory exception by a key in mess_data:
Goffi <goffi@goffi.org>
parents:
2129
diff
changeset
|
686 try: |
|
2643
189e38fb11ff
core: style improvments (90 chars limit)
Goffi <goffi@goffi.org>
parents:
2624
diff
changeset
|
687 # we want to keep message in history, even if no store is |
|
189e38fb11ff
core: style improvments (90 chars limit)
Goffi <goffi@goffi.org>
parents:
2624
diff
changeset
|
688 # requested in message hints |
| 3028 | 689 del data["history"] |
|
2132
c0577837680a
core: replaced SkipHistory exception by a key in mess_data:
Goffi <goffi@goffi.org>
parents:
2129
diff
changeset
|
690 except KeyError: |
|
c0577837680a
core: replaced SkipHistory exception by a key in mess_data:
Goffi <goffi@goffi.org>
parents:
2129
diff
changeset
|
691 pass |
| 2128 | 692 # TODO: add skip history as an option, but by default we don't skip it |
|
2643
189e38fb11ff
core: style improvments (90 chars limit)
Goffi <goffi@goffi.org>
parents:
2624
diff
changeset
|
693 # data[u'history'] = C.HISTORY_SKIP # we send the decrypted message to |
|
189e38fb11ff
core: style improvments (90 chars limit)
Goffi <goffi@goffi.org>
parents:
2624
diff
changeset
|
694 # frontends, but we don't want it in |
|
189e38fb11ff
core: style improvments (90 chars limit)
Goffi <goffi@goffi.org>
parents:
2624
diff
changeset
|
695 # history |
| 1055 | 696 else: |
|
2624
56f94936df1e
code style reformatting using black
Goffi <goffi@goffi.org>
parents:
2562
diff
changeset
|
697 raise failure.Failure( |
|
56f94936df1e
code style reformatting using black
Goffi <goffi@goffi.org>
parents:
2562
diff
changeset
|
698 exceptions.CancelError("Cancelled by OTR") |
|
56f94936df1e
code style reformatting using black
Goffi <goffi@goffi.org>
parents:
2562
diff
changeset
|
699 ) # no message at all (no history, no signal) |
|
2753
3dd265d281e1
plugin OTR: fixed a bug which was tagging every message as "encrypted"
Goffi <goffi@goffi.org>
parents:
2743
diff
changeset
|
700 |
|
3231
e756e0eb1be4
core (memory/encryption): automatic start encryption if peer send encrypted message:
Goffi <goffi@goffi.org>
parents:
3226
diff
changeset
|
701 client.encryption.markAsEncrypted(data, namespace=NS_OTR) |
|
2753
3dd265d281e1
plugin OTR: fixed a bug which was tagging every message as "encrypted"
Goffi <goffi@goffi.org>
parents:
2743
diff
changeset
|
702 trusted = otrctx.isTrusted() |
|
2743
da59ff099b32
core (memory/encryption), plugin OTR: finished OTR integration in encryption:
Goffi <goffi@goffi.org>
parents:
2726
diff
changeset
|
703 |
|
2753
3dd265d281e1
plugin OTR: fixed a bug which was tagging every message as "encrypted"
Goffi <goffi@goffi.org>
parents:
2743
diff
changeset
|
704 if trusted: |
|
3dd265d281e1
plugin OTR: fixed a bug which was tagging every message as "encrypted"
Goffi <goffi@goffi.org>
parents:
2743
diff
changeset
|
705 client.encryption.markAsTrusted(data) |
|
3dd265d281e1
plugin OTR: fixed a bug which was tagging every message as "encrypted"
Goffi <goffi@goffi.org>
parents:
2743
diff
changeset
|
706 else: |
|
3dd265d281e1
plugin OTR: fixed a bug which was tagging every message as "encrypted"
Goffi <goffi@goffi.org>
parents:
2743
diff
changeset
|
707 client.encryption.markAsUntrusted(data) |
|
2743
da59ff099b32
core (memory/encryption), plugin OTR: finished OTR integration in encryption:
Goffi <goffi@goffi.org>
parents:
2726
diff
changeset
|
708 |
| 2128 | 709 return data |
| 1055 | 710 |
| 2128 | 711 def _receivedTreatmentForSkippedProfiles(self, data): |
|
1174
bc811915a96a
plugin OTR: do not save in history the encrypted messages for skipped profiles
souliane <souliane@mailoo.org>
parents:
1171
diff
changeset
|
712 """This profile must be skipped because the frontend manages OTR itself, |
| 2128 | 713 |
| 714 but we still need to check if the message must be stored in history or not | |
| 715 """ | |
|
2624
56f94936df1e
code style reformatting using black
Goffi <goffi@goffi.org>
parents:
2562
diff
changeset
|
716 # XXX: FIXME: this should not be done on a per-profile basis, but per-message |
|
1955
633b5c21aefd
backend, frontend: messages refactoring (huge commit, not finished):
Goffi <goffi@goffi.org>
parents:
1934
diff
changeset
|
717 try: |
|
2624
56f94936df1e
code style reformatting using black
Goffi <goffi@goffi.org>
parents:
2562
diff
changeset
|
718 message = ( |
| 3028 | 719 iter(data["message"].values()).next().encode("utf-8") |
|
2624
56f94936df1e
code style reformatting using black
Goffi <goffi@goffi.org>
parents:
2562
diff
changeset
|
720 ) # FIXME: Q&D fix for message refactoring, message is now a dict |
|
1955
633b5c21aefd
backend, frontend: messages refactoring (huge commit, not finished):
Goffi <goffi@goffi.org>
parents:
1934
diff
changeset
|
721 except StopIteration: |
|
633b5c21aefd
backend, frontend: messages refactoring (huge commit, not finished):
Goffi <goffi@goffi.org>
parents:
1934
diff
changeset
|
722 return data |
|
633b5c21aefd
backend, frontend: messages refactoring (huge commit, not finished):
Goffi <goffi@goffi.org>
parents:
1934
diff
changeset
|
723 if message.startswith(potr.proto.OTRTAG): |
|
2643
189e38fb11ff
core: style improvments (90 chars limit)
Goffi <goffi@goffi.org>
parents:
2624
diff
changeset
|
724 # FIXME: it may be better to cancel the message and send it direclty to |
|
189e38fb11ff
core: style improvments (90 chars limit)
Goffi <goffi@goffi.org>
parents:
2624
diff
changeset
|
725 # bridge |
|
189e38fb11ff
core: style improvments (90 chars limit)
Goffi <goffi@goffi.org>
parents:
2624
diff
changeset
|
726 # this is used by Libervia, but this may send garbage message to |
|
189e38fb11ff
core: style improvments (90 chars limit)
Goffi <goffi@goffi.org>
parents:
2624
diff
changeset
|
727 # other frontends |
|
2132
c0577837680a
core: replaced SkipHistory exception by a key in mess_data:
Goffi <goffi@goffi.org>
parents:
2129
diff
changeset
|
728 # if they are used at the same time as Libervia. |
|
c0577837680a
core: replaced SkipHistory exception by a key in mess_data:
Goffi <goffi@goffi.org>
parents:
2129
diff
changeset
|
729 # Hard to avoid with decryption on Libervia though. |
| 3028 | 730 data["history"] = C.HISTORY_SKIP |
|
1174
bc811915a96a
plugin OTR: do not save in history the encrypted messages for skipped profiles
souliane <souliane@mailoo.org>
parents:
1171
diff
changeset
|
731 return data |
|
bc811915a96a
plugin OTR: do not save in history the encrypted messages for skipped profiles
souliane <souliane@mailoo.org>
parents:
1171
diff
changeset
|
732 |
|
3172
dcebc585c29f
core: renamed "MessageReceived" trigger to "messageReceived" for consistency.
Goffi <goffi@goffi.org>
parents:
3160
diff
changeset
|
733 def messageReceivedTrigger(self, client, message_elt, post_treat): |
|
2624
56f94936df1e
code style reformatting using black
Goffi <goffi@goffi.org>
parents:
2562
diff
changeset
|
734 if message_elt.getAttribute("type") == C.MESS_TYPE_GROUPCHAT: |
| 2128 | 735 # OTR is not possible in group chats |
| 736 return True | |
|
2821
3d735e0ab2fa
plugin OTR: ignore messages from sender without resource or from own jid
Goffi <goffi@goffi.org>
parents:
2820
diff
changeset
|
737 from_jid = jid.JID(message_elt['from']) |
|
3d735e0ab2fa
plugin OTR: ignore messages from sender without resource or from own jid
Goffi <goffi@goffi.org>
parents:
2820
diff
changeset
|
738 if not from_jid.resource or from_jid.userhostJID() == client.jid.userhostJID(): |
|
3d735e0ab2fa
plugin OTR: ignore messages from sender without resource or from own jid
Goffi <goffi@goffi.org>
parents:
2820
diff
changeset
|
739 # OTR is only usable when resources are present |
|
3d735e0ab2fa
plugin OTR: ignore messages from sender without resource or from own jid
Goffi <goffi@goffi.org>
parents:
2820
diff
changeset
|
740 return True |
| 2128 | 741 if client.profile in self.skipped_profiles: |
| 742 post_treat.addCallback(self._receivedTreatmentForSkippedProfiles) | |
|
1174
bc811915a96a
plugin OTR: do not save in history the encrypted messages for skipped profiles
souliane <souliane@mailoo.org>
parents:
1171
diff
changeset
|
743 else: |
| 2128 | 744 post_treat.addCallback(self._receivedTreatment, client) |
| 1055 | 745 return True |
| 746 | |
|
2144
1d3f73e065e1
core, jp: component handling + client handling refactoring:
Goffi <goffi@goffi.org>
parents:
2138
diff
changeset
|
747 def _sendMessageDataTrigger(self, client, mess_data): |
|
2653
7213caa5c5d0
plugin OTR: integrated in new encryption handler + fixed use of bare jid where full jid was expected
Goffi <goffi@goffi.org>
parents:
2643
diff
changeset
|
748 encryption = mess_data.get(C.MESS_KEY_ENCRYPTION) |
|
7213caa5c5d0
plugin OTR: integrated in new encryption handler + fixed use of bare jid where full jid was expected
Goffi <goffi@goffi.org>
parents:
2643
diff
changeset
|
749 if encryption is None or encryption['plugin'].namespace != NS_OTR: |
|
2138
6e509ee853a8
plugin OTR, core; use of new sendMessage + OTR mini refactoring:
Goffi <goffi@goffi.org>
parents:
2132
diff
changeset
|
750 return |
|
2653
7213caa5c5d0
plugin OTR: integrated in new encryption handler + fixed use of bare jid where full jid was expected
Goffi <goffi@goffi.org>
parents:
2643
diff
changeset
|
751 to_jid = mess_data['to'] |
|
7213caa5c5d0
plugin OTR: integrated in new encryption handler + fixed use of bare jid where full jid was expected
Goffi <goffi@goffi.org>
parents:
2643
diff
changeset
|
752 if not to_jid.resource: |
|
7213caa5c5d0
plugin OTR: integrated in new encryption handler + fixed use of bare jid where full jid was expected
Goffi <goffi@goffi.org>
parents:
2643
diff
changeset
|
753 to_jid.resource = self.host.memory.getMainResource( |
|
7213caa5c5d0
plugin OTR: integrated in new encryption handler + fixed use of bare jid where full jid was expected
Goffi <goffi@goffi.org>
parents:
2643
diff
changeset
|
754 client, to_jid |
|
7213caa5c5d0
plugin OTR: integrated in new encryption handler + fixed use of bare jid where full jid was expected
Goffi <goffi@goffi.org>
parents:
2643
diff
changeset
|
755 ) # FIXME: temporary and unsecure, must be changed when frontends |
|
7213caa5c5d0
plugin OTR: integrated in new encryption handler + fixed use of bare jid where full jid was expected
Goffi <goffi@goffi.org>
parents:
2643
diff
changeset
|
756 otrctx = client._otr_context_manager.getContextForUser(to_jid) |
|
2624
56f94936df1e
code style reformatting using black
Goffi <goffi@goffi.org>
parents:
2562
diff
changeset
|
757 message_elt = mess_data["xml"] |
|
2138
6e509ee853a8
plugin OTR, core; use of new sendMessage + OTR mini refactoring:
Goffi <goffi@goffi.org>
parents:
2132
diff
changeset
|
758 if otrctx.state == potr.context.STATE_ENCRYPTED: |
| 3028 | 759 log.debug("encrypting message") |
|
2138
6e509ee853a8
plugin OTR, core; use of new sendMessage + OTR mini refactoring:
Goffi <goffi@goffi.org>
parents:
2132
diff
changeset
|
760 body = None |
|
6e509ee853a8
plugin OTR, core; use of new sendMessage + OTR mini refactoring:
Goffi <goffi@goffi.org>
parents:
2132
diff
changeset
|
761 for child in list(message_elt.children): |
|
2624
56f94936df1e
code style reformatting using black
Goffi <goffi@goffi.org>
parents:
2562
diff
changeset
|
762 if child.name == "body": |
|
2138
6e509ee853a8
plugin OTR, core; use of new sendMessage + OTR mini refactoring:
Goffi <goffi@goffi.org>
parents:
2132
diff
changeset
|
763 # we remove all unencrypted body, |
|
6e509ee853a8
plugin OTR, core; use of new sendMessage + OTR mini refactoring:
Goffi <goffi@goffi.org>
parents:
2132
diff
changeset
|
764 # and will only encrypt the first one |
|
6e509ee853a8
plugin OTR, core; use of new sendMessage + OTR mini refactoring:
Goffi <goffi@goffi.org>
parents:
2132
diff
changeset
|
765 if body is None: |
|
6e509ee853a8
plugin OTR, core; use of new sendMessage + OTR mini refactoring:
Goffi <goffi@goffi.org>
parents:
2132
diff
changeset
|
766 body = child |
|
6e509ee853a8
plugin OTR, core; use of new sendMessage + OTR mini refactoring:
Goffi <goffi@goffi.org>
parents:
2132
diff
changeset
|
767 message_elt.children.remove(child) |
|
2624
56f94936df1e
code style reformatting using black
Goffi <goffi@goffi.org>
parents:
2562
diff
changeset
|
768 elif child.name == "html": |
|
2138
6e509ee853a8
plugin OTR, core; use of new sendMessage + OTR mini refactoring:
Goffi <goffi@goffi.org>
parents:
2132
diff
changeset
|
769 # we don't want any XHTML-IM element |
|
6e509ee853a8
plugin OTR, core; use of new sendMessage + OTR mini refactoring:
Goffi <goffi@goffi.org>
parents:
2132
diff
changeset
|
770 message_elt.children.remove(child) |
|
6e509ee853a8
plugin OTR, core; use of new sendMessage + OTR mini refactoring:
Goffi <goffi@goffi.org>
parents:
2132
diff
changeset
|
771 if body is None: |
| 3028 | 772 log.warning("No message found") |
|
1168
39572f9d5249
plugin OTR: fixes handling of the FINISHED state
souliane <souliane@mailoo.org>
parents:
1149
diff
changeset
|
773 else: |
|
2138
6e509ee853a8
plugin OTR, core; use of new sendMessage + OTR mini refactoring:
Goffi <goffi@goffi.org>
parents:
2132
diff
changeset
|
774 self._p_carbons.setPrivate(message_elt) |
|
2653
7213caa5c5d0
plugin OTR: integrated in new encryption handler + fixed use of bare jid where full jid was expected
Goffi <goffi@goffi.org>
parents:
2643
diff
changeset
|
775 self._p_hints.addHintElements(message_elt, [ |
|
7213caa5c5d0
plugin OTR: integrated in new encryption handler + fixed use of bare jid where full jid was expected
Goffi <goffi@goffi.org>
parents:
2643
diff
changeset
|
776 self._p_hints.HINT_NO_COPY, |
|
7213caa5c5d0
plugin OTR: integrated in new encryption handler + fixed use of bare jid where full jid was expected
Goffi <goffi@goffi.org>
parents:
2643
diff
changeset
|
777 self._p_hints.HINT_NO_PERMANENT_STORE]) |
| 3028 | 778 otrctx.sendMessage(0, str(body).encode("utf-8"), appdata=mess_data) |
| 1055 | 779 else: |
|
2624
56f94936df1e
code style reformatting using black
Goffi <goffi@goffi.org>
parents:
2562
diff
changeset
|
780 feedback = D_( |
| 3028 | 781 "Your message was not sent because your correspondent closed the " |
| 782 "encrypted conversation on his/her side. " | |
| 783 "Either close your own side, or refresh the session." | |
|
2624
56f94936df1e
code style reformatting using black
Goffi <goffi@goffi.org>
parents:
2562
diff
changeset
|
784 ) |
| 3028 | 785 log.warning(_("Message discarded because closed encryption channel")) |
|
2144
1d3f73e065e1
core, jp: component handling + client handling refactoring:
Goffi <goffi@goffi.org>
parents:
2138
diff
changeset
|
786 client.feedback(to_jid, feedback) |
| 3028 | 787 raise failure.Failure(exceptions.CancelError("Cancelled by OTR plugin")) |
| 2128 | 788 |
|
2643
189e38fb11ff
core: style improvments (90 chars limit)
Goffi <goffi@goffi.org>
parents:
2624
diff
changeset
|
789 def sendMessageTrigger(self, client, mess_data, pre_xml_treatments, |
|
189e38fb11ff
core: style improvments (90 chars limit)
Goffi <goffi@goffi.org>
parents:
2624
diff
changeset
|
790 post_xml_treatments): |
|
2624
56f94936df1e
code style reformatting using black
Goffi <goffi@goffi.org>
parents:
2562
diff
changeset
|
791 if mess_data["type"] == "groupchat": |
| 1055 | 792 return True |
|
2643
189e38fb11ff
core: style improvments (90 chars limit)
Goffi <goffi@goffi.org>
parents:
2624
diff
changeset
|
793 |
|
189e38fb11ff
core: style improvments (90 chars limit)
Goffi <goffi@goffi.org>
parents:
2624
diff
changeset
|
794 if client.profile in self.skipped_profiles: |
|
189e38fb11ff
core: style improvments (90 chars limit)
Goffi <goffi@goffi.org>
parents:
2624
diff
changeset
|
795 # FIXME: should not be done on a per-profile basis |
| 2128 | 796 return True |
|
2643
189e38fb11ff
core: style improvments (90 chars limit)
Goffi <goffi@goffi.org>
parents:
2624
diff
changeset
|
797 |
|
2624
56f94936df1e
code style reformatting using black
Goffi <goffi@goffi.org>
parents:
2562
diff
changeset
|
798 to_jid = copy.copy(mess_data["to"]) |
|
2653
7213caa5c5d0
plugin OTR: integrated in new encryption handler + fixed use of bare jid where full jid was expected
Goffi <goffi@goffi.org>
parents:
2643
diff
changeset
|
799 if client.encryption.getSession(to_jid.userhostJID()): |
|
7213caa5c5d0
plugin OTR: integrated in new encryption handler + fixed use of bare jid where full jid was expected
Goffi <goffi@goffi.org>
parents:
2643
diff
changeset
|
800 # there is already an encrypted session with this entity |
|
7213caa5c5d0
plugin OTR: integrated in new encryption handler + fixed use of bare jid where full jid was expected
Goffi <goffi@goffi.org>
parents:
2643
diff
changeset
|
801 return True |
|
7213caa5c5d0
plugin OTR: integrated in new encryption handler + fixed use of bare jid where full jid was expected
Goffi <goffi@goffi.org>
parents:
2643
diff
changeset
|
802 |
|
2138
6e509ee853a8
plugin OTR, core; use of new sendMessage + OTR mini refactoring:
Goffi <goffi@goffi.org>
parents:
2132
diff
changeset
|
803 if not to_jid.resource: |
|
2624
56f94936df1e
code style reformatting using black
Goffi <goffi@goffi.org>
parents:
2562
diff
changeset
|
804 to_jid.resource = self.host.memory.getMainResource( |
|
56f94936df1e
code style reformatting using black
Goffi <goffi@goffi.org>
parents:
2562
diff
changeset
|
805 client, to_jid |
|
56f94936df1e
code style reformatting using black
Goffi <goffi@goffi.org>
parents:
2562
diff
changeset
|
806 ) # FIXME: full jid may not be known |
|
2643
189e38fb11ff
core: style improvments (90 chars limit)
Goffi <goffi@goffi.org>
parents:
2624
diff
changeset
|
807 |
|
2138
6e509ee853a8
plugin OTR, core; use of new sendMessage + OTR mini refactoring:
Goffi <goffi@goffi.org>
parents:
2132
diff
changeset
|
808 otrctx = client._otr_context_manager.getContextForUser(to_jid) |
|
2643
189e38fb11ff
core: style improvments (90 chars limit)
Goffi <goffi@goffi.org>
parents:
2624
diff
changeset
|
809 |
|
2138
6e509ee853a8
plugin OTR, core; use of new sendMessage + OTR mini refactoring:
Goffi <goffi@goffi.org>
parents:
2132
diff
changeset
|
810 if otrctx.state != potr.context.STATE_PLAINTEXT: |
|
3226
2f406b762788
core (memory/encryption): encryption session are now restored on client connection
Goffi <goffi@goffi.org>
parents:
3172
diff
changeset
|
811 defer.ensureDeferred(client.encryption.start(to_jid, NS_OTR)) |
|
2653
7213caa5c5d0
plugin OTR: integrated in new encryption handler + fixed use of bare jid where full jid was expected
Goffi <goffi@goffi.org>
parents:
2643
diff
changeset
|
812 client.encryption.setEncryptionFlag(mess_data) |
|
2643
189e38fb11ff
core: style improvments (90 chars limit)
Goffi <goffi@goffi.org>
parents:
2624
diff
changeset
|
813 if not mess_data["to"].resource: |
|
189e38fb11ff
core: style improvments (90 chars limit)
Goffi <goffi@goffi.org>
parents:
2624
diff
changeset
|
814 # if not resource was given, we force it here |
|
2624
56f94936df1e
code style reformatting using black
Goffi <goffi@goffi.org>
parents:
2562
diff
changeset
|
815 mess_data["to"] = to_jid |
| 2128 | 816 return True |
| 1055 | 817 |
|
2820
7ab8684784c6
core: renamed presenceReceived to presence_reveiced + use "client" as first arguments instead of "profile"
Goffi <goffi@goffi.org>
parents:
2812
diff
changeset
|
818 def _presenceReceivedTrigger(self, client, entity, show, priority, statuses): |
|
1480
8d61160ee4b8
core, plugin watched: new plugin, show an alert when a watched entity goes online
Goffi <goffi@goffi.org>
parents:
1463
diff
changeset
|
819 if show != C.PRESENCE_UNAVAILABLE: |
|
1249
3be9d8ab2e15
plugin sec_otr: a trigger was not returning True
souliane <souliane@mailoo.org>
parents:
1246
diff
changeset
|
820 return True |
|
1170
2df6427a5299
plugin OTR: forces FINISHED state if we are in ENCRYPTED state on contact disconnection
souliane <souliane@mailoo.org>
parents:
1169
diff
changeset
|
821 if not entity.resource: |
|
1657
62cd8fc1aef7
plugin sec_otr: fixes bad handling of entity disconnection
souliane <souliane@mailoo.org>
parents:
1480
diff
changeset
|
822 try: |
|
2624
56f94936df1e
code style reformatting using black
Goffi <goffi@goffi.org>
parents:
2562
diff
changeset
|
823 entity.resource = self.host.memory.getMainResource( |
|
56f94936df1e
code style reformatting using black
Goffi <goffi@goffi.org>
parents:
2562
diff
changeset
|
824 client, entity |
|
2643
189e38fb11ff
core: style improvments (90 chars limit)
Goffi <goffi@goffi.org>
parents:
2624
diff
changeset
|
825 ) # FIXME: temporary and unsecure, must be changed when frontends |
|
189e38fb11ff
core: style improvments (90 chars limit)
Goffi <goffi@goffi.org>
parents:
2624
diff
changeset
|
826 # are refactored |
|
1657
62cd8fc1aef7
plugin sec_otr: fixes bad handling of entity disconnection
souliane <souliane@mailoo.org>
parents:
1480
diff
changeset
|
827 except exceptions.UnknownEntityError: |
|
62cd8fc1aef7
plugin sec_otr: fixes bad handling of entity disconnection
souliane <souliane@mailoo.org>
parents:
1480
diff
changeset
|
828 return True # entity was not connected |
| 2128 | 829 if entity in client._otr_context_manager.contexts: |
| 830 otrctx = client._otr_context_manager.getContextForUser(entity) | |
|
1657
62cd8fc1aef7
plugin sec_otr: fixes bad handling of entity disconnection
souliane <souliane@mailoo.org>
parents:
1480
diff
changeset
|
831 otrctx.disconnect() |
|
1170
2df6427a5299
plugin OTR: forces FINISHED state if we are in ENCRYPTED state on contact disconnection
souliane <souliane@mailoo.org>
parents:
1169
diff
changeset
|
832 return True |