mirrors/dendrite
1
0
Fork 0
mirror of https://github.com/matrix-org/dendrite.git synced 2025-12-26 00:03:09 -06:00
Code Issues Packages Projects Releases Wiki Activity

Try to find auth events at both resident joining server and event origin

Browse source
This commit is contained in:
Neil Alexander 2020-09-25 15:50:10 +01:00
parent 984d0b80c0
commit 06b2f3a3b5
No known key found for this signature in database
GPG key ID: A02A2019A2BB0944
1 changed files with 8 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
federationsender/internal/perform/join.go
View file

@ -59,9 +59,15 @@ func (r joinContext) CheckSendJoinResponse(
// Try to retrieve the event from the server that sent us the send // Try to retrieve the event from the server that sent us the send
// join response. // join response.
tx, txerr := r.federation.GetEvent(ctx, serverName, eventID) tx, txerr := r.federation.GetEvent(ctx, server, eventID)
if txerr != nil { if txerr != nil {
return nil, fmt.Errorf("missingAuth r.federation.GetEvent: %w", txerr) if server == serverName {
return nil, fmt.Errorf("missingAuth r.federation.GetEvent via %q: %w", server, txerr)
}
tx, txerr = r.federation.GetEvent(ctx, serverName, eventID)
if txerr != nil {
return nil, fmt.Errorf("missingAuth r.federation.GetEvent via %q and %q: %w", server, serverName, txerr)
}
} }
// For each event returned, add it to the set of return events. We // For each event returned, add it to the set of return events. We