MirrorHub/construct
0
0
Fork 0
mirror of https://github.com/matrix-construct/construct synced 2024-12-26 15:33:54 +01:00
Code Issues Releases Wiki Activity

modules/federation/send_*: Allow for missing top-level membership in all checks.

Browse source
This commit is contained in:
Jason Volk 2018-10-25 14:28:43 -07:00
parent 13f38782f5
commit 4457f4442e
2 changed files with 4 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
modules/federation/send_join.cc
View file

@ -95,7 +95,7 @@ put__send_join(client &client,
"Event type must be m.room.member" "Event type must be m.room.member"
}; };
if(json::get<"membership"_>(event) != "join") if(json::get<"membership"_>(event) && json::get<"membership"_>(event) != "join")
throw m::error throw m::error
{ {
http::NOT_MODIFIED, "M_INVALID_MEMBERSHIP", http::NOT_MODIFIED, "M_INVALID_MEMBERSHIP",
@ -118,6 +118,7 @@ put__send_join(client &client,
m::vm::opts vmopts; m::vm::opts vmopts;
vmopts.non_conform.set(m::event::conforms::MISSING_PREV_STATE); vmopts.non_conform.set(m::event::conforms::MISSING_PREV_STATE);
vmopts.non_conform.set(m::event::conforms::MISSING_MEMBERSHIP);
m::vm::eval eval m::vm::eval eval
{ {
event, vmopts event, vmopts

3
modules/federation/send_leave.cc
View file

@ -95,7 +95,7 @@ put__send_leave(client &client,
"Event type must be m.room.member" "Event type must be m.room.member"
}; };
if(json::get<"membership"_>(event) != "leave") if(json::get<"membership"_>(event) && json::get<"membership"_>(event) != "leave")
throw m::error throw m::error
{ {
http::NOT_MODIFIED, "M_INVALID_MEMBERSHIP", http::NOT_MODIFIED, "M_INVALID_MEMBERSHIP",
@ -118,6 +118,7 @@ put__send_leave(client &client,
m::vm::opts vmopts; m::vm::opts vmopts;
vmopts.non_conform.set(m::event::conforms::MISSING_PREV_STATE); vmopts.non_conform.set(m::event::conforms::MISSING_PREV_STATE);
vmopts.non_conform.set(m::event::conforms::MISSING_MEMBERSHIP);
m::vm::eval eval m::vm::eval eval
{ {
event, vmopts event, vmopts