matrix/matrix-react-sdk
1
0
Fork 0
mirror of https://github.com/matrix-org/matrix-react-sdk.git synced 2025-07-28 15:22:05 +03:00
Code Activity

Retry the request for the master key from SSSS on login

Browse Source 
If this failed we assumed it didn't exist which would erroneously
prompt people to upgrade encryption.
This commit is contained in:
David Baker
2020-04-09 13:40:46 +01:00
parent d4ba8103b6
commit b6ef30af8f
1 changed files with 13 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
src/components/structures/MatrixChat.js
View File

@ -1907,13 +1907,19 @@ export default createReactClass({
} }
// Test for the master cross-signing key in SSSS as a quick proxy for // Test for the master cross-signing key in SSSS as a quick proxy for
// whether cross-signing has been set up on the account. // whether cross-signing has been set up on the account. We can't
let masterKeyInStorage = false; // really continue until we know whether it's there or not so retry
try { // if this fails.
masterKeyInStorage = !!await cli.getAccountDataFromServer("m.cross_signing.master"); let masterKeyInStorage;
} catch (e) { while (masterKeyInStorage === undefined) {
if (e.errcode !== "M_NOT_FOUND") { try {
console.warn("Secret storage account data check failed", e); masterKeyInStorage = !!await cli.getAccountDataFromServer("m.cross_signing.master");
} catch (e) {
if (e.errcode === "M_NOT_FOUND") {
masterKeyInStorage = false;
} else {
console.warn("Secret storage account data check failed: retrying...", e);
}
} }
} }