MirrorHub/construct
0
0
Fork 0
mirror of https://github.com/matrix-construct/construct synced 2024-09-26 18:38:52 +02:00
Code Issues Releases Wiki Activity

ircd:Ⓜ️ Ensure X-Matrix content is properly excluded or included for verification.

Browse source
This commit is contained in:
Jason Volk 2018-04-04 14:52:12 -07:00
parent 43e77537c6
commit bf4da27fc6
1 changed files with 11 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

13
ircd/m/request.cc
View file

@ -199,9 +199,18 @@ const
1_MiB
};
// Matrix spec sez that an empty content object {} is excluded entirely
// from the verification. Our JSON only excludes members if they evaluate
// to undefined i.e json::object{}/string_view{} but not json::object{"{}"}
// or even json::object{""}; rather than burdening the caller with ensuring
// their assignment conforms perfectly, we ensure correctness manually.
auto _this(*this);
if(empty(json::get<"content"_>(*this)))
json::get<"content"_>(_this) = json::object{};
const size_t request_size
{
json::serialized(*this)
json::serialized(_this)
};
const ctx::critical_assertion ca;
@ -217,7 +226,7 @@ const
const json::object object
{
stringify(mutable_buffer{buf}, *this)
stringify(mutable_buffer{buf}, _this)
};
return verify(pk, sig, object);