mirrors/dendrite
1
0
Fork 0
mirror of https://github.com/matrix-org/dendrite.git synced 2026-01-16 18:43:10 -06:00
Code Issues Packages Projects Releases Wiki Activity

Don't check blacklist when attempting federated join

Browse source
This commit is contained in:
Devon Hudson 2023-04-26 10:12:21 -06:00
parent 174a777818
commit d3f8ab1d28
No known key found for this signature in database
GPG key ID: CD06B18E77F6A628
1 changed files with 4 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

14
federationapi/internal/federationclient.go
View file

@ -19,14 +19,11 @@ func (a *FederationInternalAPI) MakeJoin(
) (res gomatrixserverlib.MakeJoinResponse, err error) { ) (res gomatrixserverlib.MakeJoinResponse, err error) {
ctx, cancel := context.WithTimeout(ctx, defaultTimeout) ctx, cancel := context.WithTimeout(ctx, defaultTimeout)
defer cancel() defer cancel()
ires, err := a.doRequestIfNotBlacklisted(s, func() (interface{}, error) { ires, err := a.federation.MakeJoin(ctx, origin, s, roomID, userID)
return a.federation.MakeJoin(ctx, origin, s, roomID, userID)
})
if err != nil { if err != nil {
return &fclient.RespMakeJoin{}, err return &fclient.RespMakeJoin{}, err
} }
r := ires.(fclient.RespMakeJoin) return &ires, nil
return &r, nil
} }
func (a *FederationInternalAPI) SendJoin( func (a *FederationInternalAPI) SendJoin(
@ -34,14 +31,11 @@ func (a *FederationInternalAPI) SendJoin(
) (res gomatrixserverlib.SendJoinResponse, err error) { ) (res gomatrixserverlib.SendJoinResponse, err error) {
ctx, cancel := context.WithTimeout(ctx, defaultTimeout) ctx, cancel := context.WithTimeout(ctx, defaultTimeout)
defer cancel() defer cancel()
ires, err := a.doRequestIfNotBlacklisted(s, func() (interface{}, error) { ires, err := a.federation.SendJoin(ctx, origin, s, event)
return a.federation.SendJoin(ctx, origin, s, event)
})
if err != nil { if err != nil {
return &fclient.RespSendJoin{}, err return &fclient.RespSendJoin{}, err
} }
r := ires.(fclient.RespSendJoin) return &ires, nil
return &r, nil
} }
func (a *FederationInternalAPI) GetEventAuth( func (a *FederationInternalAPI) GetEventAuth(