diff options
| author | Neil Alexander <neilalexander@users.noreply.github.com> | 2020-10-07 10:30:27 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-10-07 10:30:27 +0100 |
| commit | f7c15071decd9a33fabece54b86e92e10009a034 (patch) | |
| tree | 550e4e613bfd4afa6201ac050d6371a32d34d015 /roomserver/internal/helpers | |
| parent | 0f7e707f399e7f633c58f4e1a5aedc0e45f90241 (diff) | |
Don't return 500s on checking to see if a remote server is allowed to see an event we don't know about (#1490)
Diffstat (limited to 'roomserver/internal/helpers')
| -rw-r--r-- | roomserver/internal/helpers/helpers.go | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/roomserver/internal/helpers/helpers.go b/roomserver/internal/helpers/helpers.go index b7e6ce86..a2fbd287 100644 --- a/roomserver/internal/helpers/helpers.go +++ b/roomserver/internal/helpers/helpers.go @@ -2,6 +2,8 @@ package helpers import ( "context" + "database/sql" + "errors" "fmt" "github.com/matrix-org/dendrite/roomserver/api" @@ -217,6 +219,9 @@ func CheckServerAllowedToSeeEvent( roomState := state.NewStateResolution(db, info) stateEntries, err := roomState.LoadStateAtEvent(ctx, eventID) if err != nil { + if errors.Is(err, sql.ErrNoRows) { + return false, nil + } return false, err } |