Add download keys from secret storage
This commit is contained in:
parent
9d2177afe2
commit
994c28ea95
4 changed files with 131 additions and 1 deletions
67
src/Olm.cpp
67
src/Olm.cpp
|
|
@ -1243,8 +1243,73 @@ request_cross_signing_keys()
|
|||
request(mtx::secret_storage::secrets::cross_signing_user_signing);
|
||||
request(mtx::secret_storage::secrets::megolm_backup_v1);
|
||||
}
|
||||
|
||||
namespace {
|
||||
void
|
||||
unlock_secrets(const std::string &key,
|
||||
const std::map<std::string, mtx::secret_storage::AesHmacSha2EncryptedData> &secrets)
|
||||
{
|
||||
http::client()->secret_storage_key(
|
||||
key,
|
||||
[secrets](mtx::secret_storage::AesHmacSha2KeyDescription keyDesc,
|
||||
mtx::http::RequestErr err) {
|
||||
if (err) {
|
||||
nhlog::net()->error("Failed to download secret storage key");
|
||||
return;
|
||||
}
|
||||
|
||||
emit ChatPage::instance()->downloadedSecrets(keyDesc, secrets);
|
||||
});
|
||||
}
|
||||
}
|
||||
|
||||
void
|
||||
download_cross_signing_keys()
|
||||
{}
|
||||
{
|
||||
using namespace mtx::secret_storage;
|
||||
http::client()->secret_storage_secret(
|
||||
secrets::megolm_backup_v1, [](Secret secret, mtx::http::RequestErr err) {
|
||||
std::optional<Secret> backup_key;
|
||||
if (!err)
|
||||
backup_key = secret;
|
||||
|
||||
http::client()->secret_storage_secret(
|
||||
secrets::cross_signing_self_signing,
|
||||
[backup_key](Secret secret, mtx::http::RequestErr err) {
|
||||
std::optional<Secret> self_signing_key;
|
||||
if (!err)
|
||||
self_signing_key = secret;
|
||||
|
||||
http::client()->secret_storage_secret(
|
||||
secrets::cross_signing_user_signing,
|
||||
[backup_key, self_signing_key](Secret secret,
|
||||
mtx::http::RequestErr err) {
|
||||
std::optional<Secret> user_signing_key;
|
||||
if (!err)
|
||||
user_signing_key = secret;
|
||||
|
||||
std::map<std::string,
|
||||
std::map<std::string, AesHmacSha2EncryptedData>>
|
||||
secrets;
|
||||
|
||||
if (backup_key && !backup_key->encrypted.empty())
|
||||
secrets[backup_key->encrypted.begin()->first]
|
||||
[secrets::megolm_backup_v1] =
|
||||
backup_key->encrypted.begin()->second;
|
||||
if (self_signing_key && !self_signing_key->encrypted.empty())
|
||||
secrets[self_signing_key->encrypted.begin()->first]
|
||||
[secrets::cross_signing_self_signing] =
|
||||
self_signing_key->encrypted.begin()->second;
|
||||
if (user_signing_key && !user_signing_key->encrypted.empty())
|
||||
secrets[user_signing_key->encrypted.begin()->first]
|
||||
[secrets::cross_signing_user_signing] =
|
||||
user_signing_key->encrypted.begin()->second;
|
||||
|
||||
for (const auto &[key, secrets] : secrets)
|
||||
unlock_secrets(key, secrets);
|
||||
});
|
||||
});
|
||||
});
|
||||
}
|
||||
|
||||
} // namespace olm
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue