MirrorHub/construct
0
0
Fork 0
mirror of https://github.com/matrix-construct/construct synced 2024-11-26 08:42:34 +01:00
Code Issues Releases Wiki Activity

ircd:Ⓜ️ Add additional event conformity checks.

Browse source
This commit is contained in:
Jason Volk 2018-03-11 20:48:34 -07:00
parent 12fb9747a7
commit c2fbe50bce
2 changed files with 45 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
include/ircd/m/event.h
View file

@ -208,6 +208,11 @@ enum ircd::m::event::conforms::code
MISSING_ORIGIN_SIGNATURE, ///< no signature for origin MISSING_ORIGIN_SIGNATURE, ///< no signature for origin
MISMATCH_ORIGIN_SENDER, ///< sender mxid host not from origin MISMATCH_ORIGIN_SENDER, ///< sender mxid host not from origin
MISMATCH_ORIGIN_EVENT_ID, ///< event_id mxid host not from origin MISMATCH_ORIGIN_EVENT_ID, ///< event_id mxid host not from origin
SELF_REDACTS, ///< event redacts itself
SELF_PREV_EVENT, ///< event_id self-referenced in prev_events
SELF_PREV_STATE, ///< event_id self-referenced in prev_state
DUP_PREV_EVENT, ///< duplicate references in prev_events
DUP_PREV_STATE, ///< duplicate references in prev_state
_NUM_ _NUM_
}; };

40
ircd/m/event.cc
View file

@ -792,6 +792,11 @@ ircd::m::event_conforms_reflects
"MISSING_ORIGIN_SIGNATURE", "MISSING_ORIGIN_SIGNATURE",
"MISMATCH_ORIGIN_SENDER", "MISMATCH_ORIGIN_SENDER",
"MISMATCH_ORIGIN_EVENT_ID", "MISMATCH_ORIGIN_EVENT_ID",
"SELF_REDACTS",
"SELF_PREV_EVENT",
"SELF_PREV_STATE",
"DUP_PREV_EVENT",
"DUP_PREV_STATE",
}; };
std::ostream & std::ostream &
@ -877,6 +882,10 @@ ircd::m::event::conforms::conforms(const event &e)
if(!valid(m::id::EVENT, json::get<"redacts"_>(e))) if(!valid(m::id::EVENT, json::get<"redacts"_>(e)))
set(INVALID_OR_MISSING_REDACTS_ID); set(INVALID_OR_MISSING_REDACTS_ID);
if(json::get<"redacts"_>(e))
if(json::get<"redacts"_>(e) == json::get<"event_id"_>(e))
set(SELF_REDACTS);
if(json::get<"type"_>(e) == "m.room.member") if(json::get<"type"_>(e) == "m.room.member")
if(empty(json::get<"membership"_>(e))) if(empty(json::get<"membership"_>(e)))
set(MISSING_MEMBERSHIP); set(MISSING_MEMBERSHIP);
@ -908,6 +917,37 @@ ircd::m::event::conforms::conforms(const event &e)
if(json::get<"type"_>(e) != "m.room.create") if(json::get<"type"_>(e) != "m.room.create")
if(json::get<"depth"_>(e) == 0) if(json::get<"depth"_>(e) == 0)
set(DEPTH_ZERO); set(DEPTH_ZERO);
const prev p{e};
size_t i{0}, j{0};
for(const json::array &pe : json::get<"prev_events"_>(p))
{
if(unquote(pe.at(0)) == json::get<"event_id"_>(e))
set(SELF_PREV_EVENT);
j = 0;
for(const json::array &pe_ : json::get<"prev_events"_>(p))
if(i != j++)
if(pe_.at(0) == pe.at(0))
set(DUP_PREV_EVENT);
++i;
}
i = 0;
for(const json::array &ps : json::get<"prev_state"_>(p))
{
if(unquote(ps.at(0)) == json::get<"event_id"_>(e))
set(SELF_PREV_STATE);
j = 0;
for(const json::array &ps_ : json::get<"prev_state"_>(p))
if(i != j++)
if(ps_.at(0) == ps.at(0))
set(DUP_PREV_STATE);
++i;
}
} }
void void