hoernschen/dendrite
1
0
Fork 0
mirror of https://github.com/hoernschen/dendrite.git synced 2025-04-24 20:53:40 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Try to ignore anything we find that's invalid from earlier events

Browse source
This commit is contained in:
Neil Alexander 2021-06-21 16:53:58 +01:00
parent f9151302aa
commit 6f8adc7b40
No known key found for this signature in database
GPG key ID: A02A2019A2BB0944
1 changed files with 16 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

22
federationapi/routing/send.go
View file

@ -173,7 +173,10 @@ type txnReq struct {
// new events which the roomserver does not know about // new events which the roomserver does not know about
newEvents map[string]bool newEvents map[string]bool
newEventsMutex sync.RWMutex newEventsMutex sync.RWMutex
work string // metrics // invalid events which failed signature checks, don't bother
// refetching them
invalidEvents map[string]struct{}
work string // metrics
} }
// A subset of FederationClient functionality that txn requires. Useful for testing. // A subset of FederationClient functionality that txn requires. Useful for testing.
@ -236,19 +239,25 @@ func (t *txnReq) processTransaction(ctx context.Context) (*gomatrixserverlib.Res
} }
if err = gomatrixserverlib.VerifyAllEventSignatures(ctx, []*gomatrixserverlib.Event{event}, t.keys); err != nil { if err = gomatrixserverlib.VerifyAllEventSignatures(ctx, []*gomatrixserverlib.Event{event}, t.keys); err != nil {
util.GetLogger(ctx).WithError(err).Warnf("Transaction: Couldn't validate signature of event %q", event.EventID()) util.GetLogger(ctx).WithError(err).Warnf("Transaction: Couldn't validate signature of event %q", event.EventID())
/* t.invalidEvents[event.EventID()] = struct{}{}
results[event.EventID()] = gomatrixserverlib.PDUResult{
Error: err.Error(),
}
*/
continue continue
} }
pdus = append(pdus, event.Redact().Headered(verRes.RoomVersion)) pdus = append(pdus, event.Redact().Headered(verRes.RoomVersion))
} }
// Process the events. // Process the events.
processPDUs:
for _, e := range pdus { for _, e := range pdus {
evStart := time.Now() evStart := time.Now()
// If the event refers to an event we've found to be invalid then
// there's no point in doing anything with it.
for _, id := range append(e.AuthEventIDs(), e.PrevEventIDs()...) {
if _, ok := t.invalidEvents[id]; ok {
continue processPDUs
}
}
if err := t.processEvent(ctx, e.Unwrap()); err != nil { if err := t.processEvent(ctx, e.Unwrap()); err != nil {
// If the error is due to the event itself being bad then we skip // If the error is due to the event itself being bad then we skip
// it and move onto the next event. We report an error so that the // it and move onto the next event. We report an error so that the
@ -1216,6 +1225,7 @@ func (t *txnReq) lookupEvent(ctx context.Context, roomVersion gomatrixserverlib.
} }
if err := gomatrixserverlib.VerifyAllEventSignatures(ctx, []*gomatrixserverlib.Event{event}, t.keys); err != nil { if err := gomatrixserverlib.VerifyAllEventSignatures(ctx, []*gomatrixserverlib.Event{event}, t.keys); err != nil {
util.GetLogger(ctx).WithError(err).Warnf("Transaction: Couldn't validate signature of event %q", event.EventID()) util.GetLogger(ctx).WithError(err).Warnf("Transaction: Couldn't validate signature of event %q", event.EventID())
t.invalidEvents[event.EventID()] = struct{}{}
return nil, verifySigError{event.EventID(), err} return nil, verifySigError{event.EventID(), err}
} }
h := event.Headered(roomVersion) h := event.Headered(roomVersion)