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

Answer key requests for all our sessions

Browse source
This commit is contained in:
Nicolas Werner 2020-10-17 00:12:26 +02:00
parent b23913fa7c
commit bc7494473b
1 changed files with 10 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

17
src/Olm.cpp
View file

@ -500,12 +500,14 @@ handle_key_request_message(const mtx::events::DeviceEvent<mtx::events::msg::KeyR
} }
// Check that the requested session_id and the one we have saved match. // Check that the requested session_id and the one we have saved match.
const auto session = cache::getOutboundMegolmSession(req.content.room_id); MegolmSessionIndex index{};
if (req.content.session_id != session.data.session_id) { index.room_id = req.content.room_id;
nhlog::crypto()->warn("session id of retrieved session doesn't match the request: " index.session_id = req.content.session_id;
"requested({}), ours({})", index.sender_key = olm::client()->identity_keys().curve25519;
req.content.session_id,
session.data.session_id); const auto session = cache::getInboundMegolmSession(index);
if (!session) {
nhlog::crypto()->warn("No session with id {} in db", req.content.session_id);
return; return;
} }
@ -523,13 +525,14 @@ handle_key_request_message(const mtx::events::DeviceEvent<mtx::events::msg::KeyR
return; return;
} }
auto session_key = mtx::crypto::export_session(session);
// //
// Prepare the m.room_key event. // Prepare the m.room_key event.
// //
auto payload = json{{"algorithm", "m.megolm.v1.aes-sha2"}, auto payload = json{{"algorithm", "m.megolm.v1.aes-sha2"},
{"room_id", req.content.room_id}, {"room_id", req.content.room_id},
{"session_id", req.content.session_id}, {"session_id", req.content.session_id},
{"session_key", session.data.session_key}}; {"session_key", session_key}};
send_megolm_key_to_device(req.sender, req.content.requesting_device_id, payload); send_megolm_key_to_device(req.sender, req.content.requesting_device_id, payload);
} }