MirrorHub/construct
0
0
Fork 0
mirror of https://github.com/matrix-construct/construct synced 2024-11-29 10:12:39 +01:00
Code Issues Releases Wiki Activity

modules/m_receipt: Validate user_id hostpart matches origin.

Browse source
This commit is contained in:
Jason Volk 2019-05-26 20:25:58 -07:00
parent 25dd717b7e
commit f11126613e
2 changed files with 28 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

34
modules/m_receipt.cc
View file

@ -18,8 +18,8 @@ extern const m::hookfn<m::vm::eval &> _implicit_receipt;
static void handle_m_receipt_m_read(const m::room::id &, const m::user::id &, const m::event::id &, const time_t &); static void handle_m_receipt_m_read(const m::room::id &, const m::user::id &, const m::event::id &, const time_t &);
static void handle_m_receipt_m_read(const m::room::id &, const m::user::id &, const m::edu::m_receipt::m_read &); static void handle_m_receipt_m_read(const m::room::id &, const m::user::id &, const m::edu::m_receipt::m_read &);
static void handle_m_receipt_m_read(const m::room::id &, const json::object &); static void handle_m_receipt_m_read(const m::event &, const m::room::id &, const json::object &);
static void handle_m_receipt(const m::room::id &, const json::object &); static void handle_m_receipt(const m::event &, const m::room::id &, const json::object &);
static void handle_edu_m_receipt(const m::event &, m::vm::eval &); static void handle_edu_m_receipt(const m::event &, m::vm::eval &);
extern const m::hookfn<m::vm::eval &> _m_receipt_eval; extern const m::hookfn<m::vm::eval &> _m_receipt_eval;
@ -52,7 +52,12 @@ handle_edu_m_receipt(const m::event &event,
if(json::get<"room_id"_>(event)) if(json::get<"room_id"_>(event))
return; return;
if(my_host(json::get<"origin"_>(event))) const auto &origin
{
json::get<"origin"_>(event)
};
if(my_host(origin))
return; return;
const json::object &content const json::object &content
@ -67,12 +72,13 @@ handle_edu_m_receipt(const m::event &event,
unquote(member.first) unquote(member.first)
}; };
handle_m_receipt(room_id, member.second); handle_m_receipt(event, room_id, member.second);
} }
} }
void void
handle_m_receipt(const m::room::id &room_id, handle_m_receipt(const m::event &event,
const m::room::id &room_id,
const json::object &content) const json::object &content)
{ {
for(const auto &member : content) for(const auto &member : content)
@ -84,7 +90,7 @@ handle_m_receipt(const m::room::id &room_id,
if(type == "m.read") if(type == "m.read")
{ {
handle_m_receipt_m_read(room_id, member.second); handle_m_receipt_m_read(event, room_id, member.second);
continue; continue;
} }
@ -98,7 +104,8 @@ handle_m_receipt(const m::room::id &room_id,
} }
void void
handle_m_receipt_m_read(const m::room::id &room_id, handle_m_receipt_m_read(const m::event &event,
const m::room::id &room_id,
const json::object &content) const json::object &content)
{ {
for(const auto &member : content) for(const auto &member : content)
@ -108,6 +115,19 @@ handle_m_receipt_m_read(const m::room::id &room_id,
unquote(member.first) unquote(member.first)
}; };
if(user_id.host() != json::get<"origin"_>(event))
{
log::dwarning
{
receipt_log, "ignoring m.receipt m.read from '%s' in %s for alien %s.",
json::get<"origin"_>(event),
string_view{room_id},
string_view{user_id},
};
continue;
}
const json::object &content const json::object &content
{ {
member.second member.second

2
modules/m_typing.cc
View file

@ -179,7 +179,7 @@ _handle_edu_m_typing(const m::event &event,
{ {
log::dwarning log::dwarning
{ {
typing_log, "Ignoring %s from %s for user %s", typing_log, "Ignoring %s from %s for alien %s",
at<"type"_>(event), at<"type"_>(event),
at<"origin"_>(event), at<"origin"_>(event),
string_view{user_id} string_view{user_id}