matrix/matrix-js-sdk
1
0
Fork 0
mirror of https://github.com/matrix-org/matrix-js-sdk.git synced 2025-11-28 05:03:59 +03:00
Code Activity

various fixes

Browse Source
This commit is contained in:
Hubert Chathi
2021-03-11 17:30:05 -05:00
parent 0bfcb5071d
commit a489691151
1 changed files with 20 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

28
src/crypto/algorithms/megolm.js
View File

@@ -275,11 +275,12 @@ MegolmEncryption.prototype._ensureOutboundSession = async function(
const payload = { const payload = {
type: "m.room_key", type: "m.room_key",
content: { content: {
algorithm: olmlib.MEGOLM_ALGORITHM, "algorithm": olmlib.MEGOLM_ALGORITHM,
room_id: this._roomId, "room_id": this._roomId,
session_id: session.sessionId, "session_id": session.sessionId,
session_key: key.key, "session_key": key.key,
chain_index: key.chain_index, "chain_index": key.chain_index,
"io.element.unstable.shareable": shareable,
}, },
}; };
const [devicesWithoutSession, olmSessions] = await olmlib.getExistingOlmSessions( const [devicesWithoutSession, olmSessions] = await olmlib.getExistingOlmSessions(
@@ -1399,10 +1400,14 @@ MegolmDecryption.prototype.onRoomKeyEvent = function(event) {
keysClaimed = event.getKeysClaimed(); keysClaimed = event.getKeysClaimed();
} }
const extraSessionData = {};
if (content["io.element.unstable.shareable"]) {
extraSessionData.shareable = true;
}
return this._olmDevice.addInboundGroupSession( return this._olmDevice.addInboundGroupSession(
content.room_id, senderKey, forwardingKeyChain, sessionId, content.room_id, senderKey, forwardingKeyChain, sessionId,
content.session_key, keysClaimed, content.session_key, keysClaimed,
exportFormat, exportFormat, extraSessionData,
).then(() => { ).then(() => {
// have another go at decrypting events sent with this session. // have another go at decrypting events sent with this session.
this._retryDecryption(senderKey, sessionId) this._retryDecryption(senderKey, sessionId)
@@ -1624,6 +1629,13 @@ MegolmDecryption.prototype._buildKeyForwardingMessage = async function(
* @param {string} [opts.source] where the key came from * @param {string} [opts.source] where the key came from
*/ */
MegolmDecryption.prototype.importRoomKey = function(session, opts = {}) { MegolmDecryption.prototype.importRoomKey = function(session, opts = {}) {
const extraSessionData = {};
if (opts.untrusted) {
extraSessionData.untrusted = true;
}
if (session["io.element.unstable.shareable"]) {
extraSessionData.shareable = true;
}
return this._olmDevice.addInboundGroupSession( return this._olmDevice.addInboundGroupSession(
session.room_id, session.room_id,
session.sender_key, session.sender_key,
@@ -1632,7 +1644,7 @@ MegolmDecryption.prototype.importRoomKey = function(session, opts = {}) {
session.session_key, session.session_key,
session.sender_claimed_keys, session.sender_claimed_keys,
true, true,
opts.untrusted ? { untrusted: opts.untrusted } : {}, extraSessionData,
).then(() => { ).then(() => {
if (opts.source !== "backup") { if (opts.source !== "backup") {
// don't wait for it to complete // don't wait for it to complete
@@ -1723,7 +1735,7 @@ MegolmDecryption.prototype.sendShareableInboundSessions = async function(devices
); );
logger.log("shareable sessions", shareableSessions); logger.log("shareable sessions", shareableSessions);
for (const [senderKey, sessionId] of shareableSessions) { for (const [senderKey, sessionId] of shareableSessions) {
const payload = this._buildKeyForwardingMessage( const payload = await this._buildKeyForwardingMessage(
this._roomId, senderKey, sessionId, this._roomId, senderKey, sessionId,
); );