OpenCloud
/
riot-web
mirror of https://github.com/vector-im/riot-web
1
0
Fork 0
Code Issues Releases Wiki Activity

use the default SSSS key if the default is set 

implements MSC2874
pull/21833/head
Hubert Chathi 2021-02-11 16:34:15 -05:00
parent 7865f15ac2
commit a61462bc85
1 changed files with 17 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
src/SecurityManager.ts
View File

@ -98,11 +98,24 @@ async function getSecretStorageKey(
{ keys: keyInfos }: { keys: Record<string, ISecretStorageKeyInfo> }, { keys: keyInfos }: { keys: Record<string, ISecretStorageKeyInfo> },
ssssItemName, ssssItemName,
): Promise<[string, Uint8Array]> { ): Promise<[string, Uint8Array]> {
const cli = MatrixClientPeg.get();
let keyId = await cli.getDefaultSecretStorageKeyId();
let keyInfo;
if (keyId) {
// use the default SSSS key if set
keyInfo = keyInfos[keyId];
if (!keyInfo) {
throw new Error("Unable to use default SSSS key");
}
} else {
// if no default SSSS key is set, fall back to a heuristic of using the
// only available key, if only one key is set
const keyInfoEntries = Object.entries(keyInfos); const keyInfoEntries = Object.entries(keyInfos);
if (keyInfoEntries.length > 1) { if (keyInfoEntries.length > 1) {
throw new Error("Multiple storage key requests not implemented"); throw new Error("Multiple storage key requests not implemented");
} }
const [keyId, keyInfo] = keyInfoEntries[0]; [keyId, keyInfo] = keyInfoEntries[0];
}
// Check the in-memory cache // Check the in-memory cache
if (isCachingAllowed() && secretStorageKeys[keyId]) { if (isCachingAllowed() && secretStorageKeys[keyId]) {