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

Get cross-signing private keys from secret storage

Browse Source 
If you've already set up cross-signing elsewhere and start using a new device,
this loads the private keys from secret storage and regenerates the public keys
to match.

We may also want to download the public keys from the homeserver's key sharing
and verify that they match the private keys, but for now that's left as future
work.
This commit is contained in:
J. Ryan Stinnett
2019-11-29 11:11:45 +00:00
parent e2b680c223
commit f404c80714
2 changed files with 85 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

25
src/crypto/index.js
View File

@@ -268,6 +268,7 @@ Crypto.prototype.init = async function() {
(txn) => {
this._cryptoStore.getCrossSigningKeys(txn, (keys) => {
if (keys) {
logger.log("Loaded cross-signing public keys from crypto store");
this._crossSigningInfo.setKeys(keys);
}
});
@@ -304,12 +305,24 @@ Crypto.prototype.bootstrapSecretStorage = async function({
// effectively need it for both reading and writing secrets.
let crossSigningKeysChanged = false;
if (!this._crossSigningInfo.getId()) {
logger.log("Cross-signing keys not found, creating new keys");
await this.resetCrossSigningKeys(
CrossSigningLevel.MASTER,
{ doInteractiveAuthFlow },
logger.log(
"Cross-signing public keys not found on device, " +
"checking secret storage for private keys",
);
crossSigningKeysChanged = true;
if (this._crossSigningInfo.isStoredInSecretStorage(this._secretStorage)) {
logger.log("Cross-signing private keys found in secret storage");
this._crossSigningInfo.getFromSecretStorage(this._secretStorage);
} else {
logger.log(
"Cross-signing private keys not found in secret storage, " +
"creating new keys",
);
await this.resetCrossSigningKeys(
CrossSigningLevel.MASTER,
{ doInteractiveAuthFlow },
);
crossSigningKeysChanged = true;
}
}
// Check if Secure Secret Storage has a default key. If we don't have one, create the
@@ -324,7 +337,7 @@ Crypto.prototype.bootstrapSecretStorage = async function({
// If cross-signing keys changed, store them in Secure Secret Storage.
if (crossSigningKeysChanged) {
logger.log("Storing cross-signing keys in secret storage");
logger.log("Storing cross-signing private keys in secret storage");
// XXX: We need to think about how to re-do this step if it fails.
await this._crossSigningInfo.storeInSecretStorage(this._secretStorage);
}