mirrors/dendrite
1
0
Fork 0
mirror of https://github.com/matrix-org/dendrite.git synced 2026-01-17 02:53:11 -06:00
Code Issues Packages Projects Releases Wiki Activity

Refactor federation perform relay bailout to reduce duplication

Browse source
This commit is contained in:
Devon Hudson 2023-01-12 13:24:28 -07:00
parent 0f7ac684b7
commit e089015020
No known key found for this signature in database
GPG key ID: CD06B18E77F6A628
1 changed files with 21 additions and 14 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

35
federationapi/internal/perform.go
View file

@ -25,9 +25,8 @@ func (r *FederationInternalAPI) PerformDirectoryLookup(
request *api.PerformDirectoryLookupRequest,
response *api.PerformDirectoryLookupResponse,
) (err error) {
stats := r.statistics.ForServer(request.ServerName)
if stats.AssumedOffline() && len(stats.KnownRelayServers()) > 0 {
return fmt.Errorf("not performing federation since server is assumed offline with known relay servers")
if !r.shouldAttemptDirectFederation(request.ServerName) {
return fmt.Errorf("relay servers have no meaningful response for directory lookup.")
}
dir, err := r.federation.LookupRoomAlias(
@ -150,9 +149,8 @@ func (r *FederationInternalAPI) performJoinUsingServer(
supportedVersions []gomatrixserverlib.RoomVersion,
unsigned map[string]interface{},
) error {
stats := r.statistics.ForServer(serverName)
if stats.AssumedOffline() && len(stats.KnownRelayServers()) > 0 {
return fmt.Errorf("not performing federation since server is assumed offline with known relay servers")
if !r.shouldAttemptDirectFederation(serverName) {
return fmt.Errorf("relay servers have no meaningful response for join.")
}
_, origin, err := r.cfg.Matrix.SplitLocalID('@', userID)
@ -418,9 +416,8 @@ func (r *FederationInternalAPI) performOutboundPeekUsingServer(
serverName gomatrixserverlib.ServerName,
supportedVersions []gomatrixserverlib.RoomVersion,
) error {
stats := r.statistics.ForServer(serverName)
if stats.AssumedOffline() && len(stats.KnownRelayServers()) > 0 {
return fmt.Errorf("not performing federation since server is assumed offline with known relay servers")
if !r.shouldAttemptDirectFederation(serverName) {
return fmt.Errorf("relay servers have no meaningful response for outbound peek.")
}
// create a unique ID for this peek.
@ -532,8 +529,7 @@ func (r *FederationInternalAPI) PerformLeave(
// Try each server that we were provided until we land on one that
// successfully completes the make-leave send-leave dance.
for _, serverName := range request.ServerNames {
stats := r.statistics.ForServer(serverName)
if stats.AssumedOffline() && len(stats.KnownRelayServers()) > 0 {
if !r.shouldAttemptDirectFederation(serverName) {
continue
}
@ -637,9 +633,10 @@ func (r *FederationInternalAPI) PerformInvite(
return fmt.Errorf("gomatrixserverlib.SplitID: %w", err)
}
stats := r.statistics.ForServer(destination)
if stats.AssumedOffline() && len(stats.KnownRelayServers()) > 0 {
return fmt.Errorf("not performing federation since server is assumed offline with known relay servers")
// TODO (devon): This should be allowed via a relay. Currently only transactions
// can be sent to relays. Would need to extend relays to handle invites.
if !r.shouldAttemptDirectFederation(destination) {
return fmt.Errorf("relay servers have no meaningful response for invite.")
}
logrus.WithFields(logrus.Fields{
@ -840,3 +837,13 @@ func (r *FederationInternalAPI) P2PQueryRelayServers(
response.RelayServers = relayServers
return nil
}
func (r *FederationInternalAPI) shouldAttemptDirectFederation(destination gomatrixserverlib.ServerName) bool {
var shouldRelay bool
stats := r.statistics.ForServer(destination)
if stats.AssumedOffline() && len(stats.KnownRelayServers()) > 0 {
shouldRelay = true
}
return !shouldRelay
}