mirror of
https://github.com/matrix-construct/construct
synced 2024-12-25 15:04:10 +01:00
modules/federation/invite: Re-enable auth fetch attempts for non-synapse invites.
ircd:Ⓜ️:vm::fetch: Attempt auth with tolerated failures when opts.auth=false.
This commit is contained in:
parent
b0217fd371
commit
f39e25f972
2 changed files with 8 additions and 3 deletions
|
@ -327,14 +327,19 @@ catch(const vm::error &e)
|
|||
}
|
||||
catch(const std::exception &e)
|
||||
{
|
||||
log::error
|
||||
log::logf
|
||||
{
|
||||
log, "Fetching auth chain for %s in %s :%s",
|
||||
log, eval.opts->auth? log::ERROR: log::DERROR,
|
||||
"Fetching auth chain for %s in %s :%s",
|
||||
string_view{room.event_id},
|
||||
string_view{room.room_id},
|
||||
e.what(),
|
||||
};
|
||||
|
||||
// Stop propagation if auth not required but fetch attempted anyway
|
||||
if(!eval.opts->auth)
|
||||
return;
|
||||
|
||||
throw;
|
||||
}
|
||||
|
||||
|
|
|
@ -423,7 +423,7 @@ try
|
|||
vmopts.node_id = request.node_id;
|
||||
|
||||
// Synapse may 403 a fetch of the prev_event of the invite event.
|
||||
vmopts.fetch = false;
|
||||
vmopts.phase.set(m::vm::phase::FETCH_PREV, false);
|
||||
|
||||
// Synapse now 403's a fetch of auth_events of the invite event
|
||||
vmopts.auth = false;
|
||||
|
|
Loading…
Reference in a new issue