MirrorHub
/
construct
mirror of https://github.com/matrix-construct/construct
0
0
Fork 0
Code Issues Releases Wiki Activity

modules/client/keys/claim: Enforce remote authority over results; relax log level.

This commit is contained in:
Jason Volk 2023-04-27 12:31:11 -07:00
parent 6f5121dc6a
commit f70d837258
1 changed files with 12 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
modules/client/keys/claim.cc
View File

@ -154,7 +154,7 @@ post__keys_claim(client &client,
recv_responses(queries, failures, top, timeout); recv_responses(queries, failures, top, timeout);
handle_failures(failures, top); handle_failures(failures, top);
return {}; return response;
} }
void void
@ -223,14 +223,22 @@ try
}; };
for(const auto &[user_id, keys] : one_time_keys) for(const auto &[user_id, keys] : one_time_keys)
{
if(m::user::id(user_id).host() != remote)
continue;
json::stack::member json::stack::member
{ {
object, user_id, json::object{keys} object, user_id, json::object
{
keys
}
}; };
}
} }
catch(const std::exception &e) catch(const std::exception &e)
{ {
log::error log::derror
{ {
m::log, "user keys claim from %s :%s", m::log, "user keys claim from %s :%s",
remote, remote,
@ -292,7 +300,7 @@ try
} }
catch(const std::exception &e) catch(const std::exception &e)
{ {
log::error log::derror
{ {
m::log, "user keys claim to %s for %zu users :%s", m::log, "user keys claim to %s for %zu users :%s",
remote, remote,