From f319de1fbe60c530cc908eedee49f8c6495ec99b Mon Sep 17 00:00:00 2001 From: Neil Alexander Date: Wed, 25 Mar 2020 16:54:55 +0000 Subject: [PATCH] Use NewEventFromTrustedJSON when getting events from the database --- roomserver/storage/postgres/storage.go | 5 ++--- roomserver/storage/sqlite3/storage.go | 5 ++--- 2 files changed, 4 insertions(+), 6 deletions(-) diff --git a/roomserver/storage/postgres/storage.go b/roomserver/storage/postgres/storage.go index 40d392a64..83a17b1a1 100644 --- a/roomserver/storage/postgres/storage.go +++ b/roomserver/storage/postgres/storage.go @@ -266,9 +266,8 @@ func (d *Database) Events( if err != nil { return nil, err } - // TODO: Use NewEventFromTrustedJSON for efficiency - result.Event, err = gomatrixserverlib.NewEventFromUntrustedJSON( - eventJSON.EventJSON, roomVersion, + result.Event, err = gomatrixserverlib.NewEventFromTrustedJSON( + eventJSON.EventJSON, false, roomVersion, ) if err != nil { return nil, err diff --git a/roomserver/storage/sqlite3/storage.go b/roomserver/storage/sqlite3/storage.go index 2bbc8d57f..6d6743393 100644 --- a/roomserver/storage/sqlite3/storage.go +++ b/roomserver/storage/sqlite3/storage.go @@ -311,7 +311,6 @@ func (d *Database) Events( var roomVersion gomatrixserverlib.RoomVersion result := &results[i] result.EventNID = eventJSON.EventNID - // TODO: Use NewEventFromTrustedJSON for efficiency roomNID, err = d.statements.selectRoomNIDForEventNID(ctx, txn, eventJSON.EventNID) if err != nil { return err @@ -320,8 +319,8 @@ func (d *Database) Events( if err != nil { return err } - result.Event, err = gomatrixserverlib.NewEventFromUntrustedJSON( - eventJSON.EventJSON, roomVersion, + result.Event, err = gomatrixserverlib.NewEventFromTrustedJSON( + eventJSON.EventJSON, false, roomVersion, ) if err != nil { return nil