Mercurial > libervia-backend
comparison 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 |
comparison
equal
deleted
inserted
replaced
2926:4cd7545c4ebb | 2927:69e4716d6268 |
---|---|
237 # return | 237 # return |
238 | 238 |
239 # file_obj = self._getFileObject(dest_path, can_range) | 239 # file_obj = self._getFileObject(dest_path, can_range) |
240 # range_offset = file_obj.tell() | 240 # range_offset = file_obj.tell() |
241 d = data["stream_plugin"].createSession( | 241 d = data["stream_plugin"].createSession( |
242 client, data["stream_object"], data["peer_jid"], data["si_id"] | 242 client, data["stream_object"], client.jid, data["peer_jid"], data["si_id"] |
243 ) | 243 ) |
244 d.addCallback(self._transferCb, client, data) | 244 d.addCallback(self._transferCb, client, data) |
245 d.addErrback(self._transferEb, client, data) | 245 d.addErrback(self._transferEb, client, data) |
246 | 246 |
247 # we can send the iq result | 247 # we can send the iq result |
355 return | 355 return |
356 | 356 |
357 stream_object = stream.FileStreamObject( | 357 stream_object = stream.FileStreamObject( |
358 self.host, client, filepath, uid=sid, size=size | 358 self.host, client, filepath, uid=sid, size=size |
359 ) | 359 ) |
360 d = plugin.startStream(client, stream_object, jid.JID(iq_elt["from"]), sid) | 360 d = plugin.startStream(client, stream_object, client.jid, |
361 jid.JID(iq_elt["from"]), sid) | |
361 d.addCallback(self._sendCb, client, sid, stream_object) | 362 d.addCallback(self._sendCb, client, sid, stream_object) |
362 d.addErrback(self._sendEb, client, sid, stream_object) | 363 d.addErrback(self._sendEb, client, sid, stream_object) |
363 | 364 |
364 def _fileEb(self, failure, filepath, sid, size, client): | 365 def _fileEb(self, failure, filepath, sid, size, client): |
365 if failure.check(error.StanzaError): | 366 if failure.check(error.StanzaError): |