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

ircd:Ⓜ️ Fix an erroneous conforms check for version 3/4 event_id's.

Browse source
This commit is contained in:
Jason Volk 2019-08-31 15:36:58 -07:00
parent 5c591582a2
commit a9984d8b7a
1 changed files with 9 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

19
ircd/m_event.cc
View file

@ -401,9 +401,6 @@ ircd::m::vm::conform_check_event_id
|| eval.room_version == "2"
};
if(unaffected)
return;
if(eval.room_version == "3")
if(!event::id::v3::is(event.event_id))
throw error
@ -412,13 +409,15 @@ ircd::m::vm::conform_check_event_id
string_view{event.event_id}
};
if(!event::id::v4::is(event.event_id))
throw error
{
fault::INVALID, "Event ID %s is not sufficient for version %s room",
string_view{event.event_id},
eval.room_version,
};
// note: we check v4 format for all other room versions, including "4"
if(!unaffected && eval.room_version != "3")
if(!event::id::v4::is(event.event_id))
throw error
{
fault::INVALID, "Event ID %s in a version %s room is not a version 4 Event ID.",
string_view{event.event_id},
eval.room_version,
};
}
};