mirrors/dendrite
1
0
Fork 0
mirror of https://github.com/matrix-org/dendrite.git synced 2025-12-23 14:53:10 -06:00
Code Issues Packages Projects Releases Wiki Activity

Revert some changes from wrong branch

Browse source
This commit is contained in:
Neil Alexander 2020-09-24 15:25:23 +01:00
parent 252830b2b0
commit e846ae0e5d
No known key found for this signature in database
GPG key ID: A02A2019A2BB0944
2 changed files with 0 additions and 39 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

28
roomserver/internal/helpers/sanity.go
View file

@ -1,28 +0,0 @@
package helpers
import (
"encoding/json"
"fmt"
"github.com/matrix-org/gomatrixserverlib"
)
// SanityCheckEvent looks for any obvious problems with the event before
// we bother to continue processing it any further.
func SanityCheckEvent(event *gomatrixserverlib.Event) error {
switch event.Type() {
case gomatrixserverlib.MRoomCreate:
var content gomatrixserverlib.CreateContent
if err := json.Unmarshal(event.Content(), &content); err != nil {
return fmt.Errorf("Failed to unmarshal content of create event %q", event.EventID())
}
// Check that the room version is supported.
if content.RoomVersion != nil {
if _, err := content.RoomVersion.EventFormat(); err != nil {
return fmt.Errorf("Room version %q is unsupported in create event %q", *content.RoomVersion, event.EventID())
}
}
}
return nil
}

11
roomserver/internal/input/input_events.go
View file

@ -44,17 +44,6 @@ func (r *Inputer) processRoomEvent(
headered := input.Event
event := headered.Unwrap()
// Run sanity checks against the event. This will catch any really
// obvious problems.
if err = helpers.SanityCheckEvent(&event); err != nil {
logrus.WithFields(logrus.Fields{
"event_id": event.EventID(),
"type": event.Type(),
"room": event.RoomID(),
}).WithError(err).Info("Event failed sanity-checks")
return
}
// Check that the event passes authentication checks and work out
// the numeric IDs for the auth events.
isRejected := false