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

Update error check to use actual error

Browse source 
Signed-off-by: Till Faelligen <tfaelligen@gmail.com>
This commit is contained in:
Till Faelligen 2020-11-17 17:22:44 +01:00
parent 3e8c91ff8b
commit 44260bba15
2 changed files with 6 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
roomserver/internal/perform/perform_invite.go
View file

@ -16,8 +16,8 @@ package perform
import ( import (
"context" "context"
"errors"
"fmt" "fmt"
"strings"
federationSenderAPI "github.com/matrix-org/dendrite/federationsender/api" federationSenderAPI "github.com/matrix-org/dendrite/federationsender/api"
"github.com/matrix-org/dendrite/internal/config" "github.com/matrix-org/dendrite/internal/config"
@ -160,8 +160,10 @@ func (r *Inviter) PerformInvite(
Code: api.PerformErrorNotAllowed, Code: api.PerformErrorNotAllowed,
} }
if strings.Contains(err.Error(), "value is outside of safe range") { // Ensure we send the correct http code if the json is invalid for
log.Debug("setting error to PerformErrCanonicalJSON") // room version 6.
if req.RoomVersion == gomatrixserverlib.RoomVersionV6 &&
errors.Is(err, gomatrixserverlib.ErrCanonicalJSON) {
res.Error.Code = api.PerformErrCanonicalJSON res.Error.Code = api.PerformErrCanonicalJSON
} }

1
sytest-whitelist
View file

@ -496,3 +496,4 @@ Forgetting room does not show up in v2 /sync
Can forget room you've been kicked from Can forget room you've been kicked from
Can re-join room if re-invited Can re-join room if re-invited
/whois /whois
Outbound federation rejects invite response which include invalid JSON for room version 6