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

Send master key in verification flow (if we trust it)

Browse source
This commit is contained in:
Nicolas Werner 2020-10-08 18:30:31 +02:00
parent e5fb9a25ea
commit 8ec76daeda
2 changed files with 26 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

23
src/DeviceVerificationFlow.cpp
View file

@ -57,6 +57,25 @@ DeviceVerificationFlow::DeviceVerificationFlow(QObject *,
this->their_keys = res; this->their_keys = res;
}); });
ChatPage::instance()->query_keys(
http::client()->user_id().to_string(),
[this](const UserKeyCache &res, mtx::http::RequestErr err) {
if (err) {
nhlog::net()->warn("failed to query device keys: {},{}",
err->matrix_error.errcode,
static_cast<int>(err->status_code));
return;
}
if (res.master_keys.keys.empty())
return;
if (auto status =
cache::verificationStatus(http::client()->user_id().to_string());
status && status->user_verified)
this->our_trusted_master_key = res.master_keys.keys.begin()->second;
});
if (model) { if (model) {
connect(this->model_, connect(this->model_,
&TimelineModel::updateFlowEventId, &TimelineModel::updateFlowEventId,
@ -655,6 +674,10 @@ DeviceVerificationFlow::sendVerificationMac()
std::map<std::string, std::string> key_list; std::map<std::string, std::string> key_list;
key_list["ed25519:" + http::client()->device_id()] = olm::client()->identity_keys().ed25519; key_list["ed25519:" + http::client()->device_id()] = olm::client()->identity_keys().ed25519;
// send our master key, if we trust it
if (!this->our_trusted_master_key.empty())
key_list["ed25519:" + our_trusted_master_key] = our_trusted_master_key;
mtx::events::msg::KeyVerificationMac req = mtx::events::msg::KeyVerificationMac req =
key_verification_mac(sas.get(), key_verification_mac(sas.get(),
http::client()->user_id(), http::client()->user_id(),

3
src/DeviceVerificationFlow.h
View file

@ -185,6 +185,9 @@ private:
mtx::identifiers::User toClient; mtx::identifiers::User toClient;
QString deviceId; QString deviceId;
// public part of our master key, when trusted or empty
std::string our_trusted_master_key;
mtx::events::msg::SASMethods method = mtx::events::msg::SASMethods::Emoji; mtx::events::msg::SASMethods method = mtx::events::msg::SASMethods::Emoji;
QTimer *timeout = nullptr; QTimer *timeout = nullptr;
sas_ptr sas; sas_ptr sas;