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:Ⓜ️:vm: Evaluate auth against present and relative state in sequence.

Browse source
This commit is contained in:
Jason Volk 2019-09-16 16:28:55 -07:00
parent c0f4640a74
commit fd5907a99d
1 changed files with 25 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

31
modules/m_vm.cc
View file

@ -881,6 +881,11 @@ ircd::m::vm::execute_pdu(eval &eval,
at<"type"_>(event)
};
const bool authenticate
{
opts.auth && !internal(room_id)
};
// The conform hook runs static checks on an event's formatting and
// composure; these checks only require the event data itself.
if(likely(opts.conform))
@ -915,8 +920,8 @@ ircd::m::vm::execute_pdu(eval &eval,
call_hook(fetch_hook, eval, event, eval);
// Evaluation by auth system; throws
if(likely(opts.auth) && !internal(room_id))
room::auth::check(event);
if(likely(authenticate))
room::auth::check_static(event);
// Obtain sequence number here.
const auto *const &top(eval::seqmax());
@ -930,6 +935,15 @@ ircd::m::vm::execute_pdu(eval &eval,
sequence::committed + 1
};
// Wait until this is the lowest sequence number
sequence::dock.wait([&eval]
{
return eval::seqnext(sequence::uncommitted) == &eval;
});
if(likely(authenticate))
room::auth::check_relative(event);
log::debug
{
log, "%s | acquire", loghead(eval)
@ -942,16 +956,20 @@ ircd::m::vm::execute_pdu(eval &eval,
assert(eval::sequnique(sequence::get(eval)));
sequence::uncommitted = sequence::get(eval);
// Evaluation by module hooks
if(likely(opts.eval))
call_hook(eval_hook, eval, event, eval);
// Wait until this is the lowest sequence number
sequence::dock.wait([&eval]
{
return eval::seqnext(sequence::committed) == &eval;
});
// Reevaluation of auth against the present state of the room.
if(likely(authenticate))
room::auth::check_present(event);
// Evaluation by module hooks
if(likely(opts.eval))
call_hook(eval_hook, eval, event, eval);
log::debug
{
log, "%s | commit", loghead(eval)
@ -960,6 +978,7 @@ ircd::m::vm::execute_pdu(eval &eval,
assert(sequence::committed < sequence::get(eval));
assert(sequence::retired < sequence::get(eval));
sequence::committed = sequence::get(eval);
if(likely(opts.write))
write_prepare(eval, event);