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

More error tweaks

Browse source
This commit is contained in:
Neil Alexander 2020-09-29 13:18:13 +01:00
parent 0fc1029874
commit c47609139b
No known key found for this signature in database
GPG key ID: A02A2019A2BB0944
2 changed files with 5 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
federationapi/routing/send.go
View file

@ -17,7 +17,6 @@ package routing
import ( import (
"context" "context"
"encoding/json" "encoding/json"
"errors"
"fmt" "fmt"
"net/http" "net/http"
"sync" "sync"
@ -208,7 +207,7 @@ func (t *txnReq) processTransaction(ctx context.Context) (*gomatrixserverlib.Res
} else { } else {
// Auth errors mean the event is 'rejected' which have to be silent to appease sytest // Auth errors mean the event is 'rejected' which have to be silent to appease sytest
errMsg := "" errMsg := ""
rejected := errors.Is(err, &gomatrixserverlib.NotAllowed{}) _, rejected := err.(*gomatrixserverlib.NotAllowed)
if !rejected { if !rejected {
errMsg = err.Error() errMsg = err.Error()
} }
@ -371,7 +370,7 @@ func (t *txnReq) processEvent(ctx context.Context, e gomatrixserverlib.Event, is
} }
if len(stateResp.MissingAuthEventIDs) > 0 { if len(stateResp.MissingAuthEventIDs) > 0 {
logger.Infof("%d missing auth_events", len(stateResp.MissingAuthEventIDs)) logger.Infof("Event refers to %d unknown auth_events", len(stateResp.MissingAuthEventIDs))
servers := []gomatrixserverlib.ServerName{t.Origin} servers := []gomatrixserverlib.ServerName{t.Origin}
serverReq := &api.QueryServerJoinedToRoomRequest{ serverReq := &api.QueryServerJoinedToRoomRequest{
@ -416,7 +415,7 @@ func (t *txnReq) processEvent(ctx context.Context, e gomatrixserverlib.Event, is
} }
if len(stateResp.MissingPrevEventIDs) > 0 { if len(stateResp.MissingPrevEventIDs) > 0 {
logger.Infof("%d missing prev_events", len(stateResp.MissingAuthEventIDs)) logger.Infof("Event refers to %d unknown prev_events", len(stateResp.MissingPrevEventIDs))
return t.processEventWithMissingState(ctx, e, stateResp.RoomVersion, isInboundTxn) return t.processEventWithMissingState(ctx, e, stateResp.RoomVersion, isInboundTxn)
} }

4
roomserver/internal/helpers/auth.go
View file

@ -83,7 +83,7 @@ func CheckForSoftFail(
// Check if the event is allowed. // Check if the event is allowed.
if err = gomatrixserverlib.Allowed(event.Event, &authEvents); err != nil { if err = gomatrixserverlib.Allowed(event.Event, &authEvents); err != nil {
// return true, nil // return true, nil
return true, fmt.Errorf("gomatrixserverlib.Allowed: %w", err) return true, err
} }
return false, nil return false, nil
} }
@ -114,7 +114,7 @@ func CheckAuthEvents(
// Check if the event is allowed. // Check if the event is allowed.
if err = gomatrixserverlib.Allowed(event.Event, &authEvents); err != nil { if err = gomatrixserverlib.Allowed(event.Event, &authEvents); err != nil {
return nil, fmt.Errorf("gomatrixserverlib.Allowed: %w", err) return nil, err
} }
// Return the numeric IDs for the auth events. // Return the numeric IDs for the auth events.