d3v1l/matrixion
1
0
Fork 0
mirror of https://github.com/Nheko-Reborn/nheko.git synced 2024-11-22 19:08:58 +03:00
Code Issues Projects Releases Packages Wiki Activity Actions

Fix key count updates on conduit

Browse source
This commit is contained in:
Nicolas Werner 2021-09-06 00:07:14 +02:00
parent e035d1407a
commit 70e20f5d10
No known key found for this signature in database
GPG key ID: C8D75E610773F2D9
2 changed files with 41 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

43
src/ChatPage.cpp
View file

@ -434,6 +434,7 @@ ChatPage::loadStateFromCache()
getProfileInfo(); getProfileInfo();
getBackupVersion(); getBackupVersion();
verifyOneTimeKeyCountAfterStartup();
emit contentLoaded(); emit contentLoaded();
@ -936,12 +937,48 @@ ChatPage::currentPresence() const
} }
} }
void
ChatPage::verifyOneTimeKeyCountAfterStartup()
{
http::client()->upload_keys(
olm::client()->create_upload_keys_request(),
[this](const mtx::responses::UploadKeys &res, mtx::http::RequestErr err) {
if (err) {
nhlog::crypto()->warn("failed to update one-time keys: {} {} {}",
err->matrix_error.error,
static_cast<int>(err->status_code),
static_cast<int>(err->error_code));
if (err->status_code < 400 || err->status_code >= 500)
return;
}
std::map<std::string, uint16_t> key_counts;
auto count = 0;
if (auto c = res.one_time_key_counts.find(mtx::crypto::SIGNED_CURVE25519);
c == res.one_time_key_counts.end()) {
key_counts[mtx::crypto::SIGNED_CURVE25519] = 0;
} else {
key_counts[mtx::crypto::SIGNED_CURVE25519] = c->second;
count = c->second;
}
nhlog::crypto()->info(
"Fetched server key count {} {}", count, mtx::crypto::SIGNED_CURVE25519);
ensureOneTimeKeyCount(key_counts);
});
}
void void
ChatPage::ensureOneTimeKeyCount(const std::map<std::string, uint16_t> &counts) ChatPage::ensureOneTimeKeyCount(const std::map<std::string, uint16_t> &counts)
{ {
if (auto count = counts.find(mtx::crypto::SIGNED_CURVE25519); c != counts.end()) { if (auto count = counts.find(mtx::crypto::SIGNED_CURVE25519); count != counts.end()) {
if (count < MAX_ONETIME_KEYS) { nhlog::crypto()->debug(
const int nkeys = MAX_ONETIME_KEYS - count; "Updated server key count {} {}", count->second, mtx::crypto::SIGNED_CURVE25519);
if (count->second < MAX_ONETIME_KEYS) {
const int nkeys = MAX_ONETIME_KEYS - count->second;
nhlog::crypto()->info( nhlog::crypto()->info(
"uploading {} {} keys", nkeys, mtx::crypto::SIGNED_CURVE25519); "uploading {} {} keys", nkeys, mtx::crypto::SIGNED_CURVE25519);

1
src/ChatPage.h
View file

@ -181,6 +181,7 @@ private:
void startInitialSync(); void startInitialSync();
void tryInitialSync(); void tryInitialSync();
void trySync(); void trySync();
void verifyOneTimeKeyCountAfterStartup();
void ensureOneTimeKeyCount(const std::map<std::string, uint16_t> &counts); void ensureOneTimeKeyCount(const std::map<std::string, uint16_t> &counts);
void getProfileInfo(); void getProfileInfo();
void getBackupVersion(); void getBackupVersion();