Mercurial > libervia-backend
diff sat/plugins/plugin_xep_0096.py @ 2927:69e4716d6268
plugins (jingle) file transfer: use initial "from" attribute as local jid instead of client.jid:
while client.jid is fine in a client context, for components it's not the right jid to use: it is the jid of the component itself while the file transfer/jingle session entity may be established with this jid + a local part (e.g. if client is files.example.net, session may be established with louise@files.example.net, in which case "from" is louise@files.example.net, while client.jid will be files.example.net).
As a consequence, using client.jid was causing trouble with components.
This patch fixes it for jingle and plugins linked to file transfer by keeping a "local_jid" variable in the session, where the jid from the original "from" attribute is used.
| author | Goffi <goffi@goffi.org> |
|---|---|
| date | Sun, 28 Apr 2019 08:55:13 +0200 |
| parents | 003b8b4b56a7 |
| children | ab2696e34d29 |
line wrap: on
line diff
--- a/sat/plugins/plugin_xep_0096.py Sun Apr 28 08:55:13 2019 +0200 +++ b/sat/plugins/plugin_xep_0096.py Sun Apr 28 08:55:13 2019 +0200 @@ -239,7 +239,7 @@ # file_obj = self._getFileObject(dest_path, can_range) # range_offset = file_obj.tell() d = data["stream_plugin"].createSession( - client, data["stream_object"], data["peer_jid"], data["si_id"] + client, data["stream_object"], client.jid, data["peer_jid"], data["si_id"] ) d.addCallback(self._transferCb, client, data) d.addErrback(self._transferEb, client, data) @@ -357,7 +357,8 @@ stream_object = stream.FileStreamObject( self.host, client, filepath, uid=sid, size=size ) - d = plugin.startStream(client, stream_object, jid.JID(iq_elt["from"]), sid) + d = plugin.startStream(client, stream_object, client.jid, + jid.JID(iq_elt["from"]), sid) d.addCallback(self._sendCb, client, sid, stream_object) d.addErrback(self._sendEb, client, sid, stream_object)