mirrors/element-web
1
0
Fork 0
mirror of https://github.com/element-hq/element-web synced 2024-10-25 12:16:00 +03:00
Code Issues Projects Releases Packages Wiki Activity

Respond to backup key sharing requests

Browse source
This commit is contained in:
Zoe 2020-03-25 14:06:47 +00:00
parent d869ac9a69
commit 4d63c11f26
1 changed files with 25 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

35
src/CrossSigningManager.js
View file

@ -145,18 +145,33 @@ const onSecretRequested = async function({
console.log(`CrossSigningManager: Ignoring request from untrusted device ${deviceId}`); console.log(`CrossSigningManager: Ignoring request from untrusted device ${deviceId}`);
return; return;
} }
const callbacks = client.getCrossSigningCacheCallbacks(); if (name.startsWith("m.cross_signing")) {
if (!callbacks.getCrossSigningKeyCache) return; const callbacks = client.getCrossSigningCacheCallbacks();
if (name === "m.cross_signing.self_signing") { if (!callbacks.getCrossSigningKeyCache) return;
const key = await callbacks.getCrossSigningKeyCache("self_signing"); /* Explicit enumeration here is deliberate – never share the master key! */
if (!key) { if (name === "m.cross_signing.self_signing") {
console.log(`self_signing requested by ${deviceId}, but not found in cache`); const key = await callbacks.getCrossSigningKeyCache("self_signing");
if (!key) {
console.log(
`self_signing requested by ${deviceId}, but not found in cache`
);
}
return key && encodeBase64(key);
} else if (name === "m.cross_signing.user_signing") {
const key = await callbacks.getCrossSigningKeyCache("user_signing");
if (!key) {
console.log(
`user_signing requested by ${deviceId}, but not found in cache`
);
}
return key && encodeBase64(key);
} }
return key && encodeBase64(key); } else if (name === "m.megolm_backup.v1") {
} else if (name === "m.cross_signing.user_signing") { const key = await client._crypto.getSessionBackupPrivateKey();
const key = await callbacks.getCrossSigningKeyCache("user_signing");
if (!key) { if (!key) {
console.log(`user_signing requested by ${deviceId}, but not found in cache`); console.log(
`session backup key requested by ${deviceId}, but not found in cache`
);
} }
return key && encodeBase64(key); return key && encodeBase64(key);
} }