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

Use NewEventFromTrustedJSON when getting events from the database

Browse source
This commit is contained in:
Neil Alexander 2020-03-25 16:54:55 +00:00
parent b54d33a3e8
commit f319de1fbe
2 changed files with 4 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
roomserver/storage/postgres/storage.go
View file

@ -266,9 +266,8 @@ func (d *Database) Events(
if err != nil { if err != nil {
return nil, err return nil, err
} }
// TODO: Use NewEventFromTrustedJSON for efficiency result.Event, err = gomatrixserverlib.NewEventFromTrustedJSON(
result.Event, err = gomatrixserverlib.NewEventFromUntrustedJSON( eventJSON.EventJSON, false, roomVersion,
eventJSON.EventJSON, roomVersion,
) )
if err != nil { if err != nil {
return nil, err return nil, err

5
roomserver/storage/sqlite3/storage.go
View file

@ -311,7 +311,6 @@ func (d *Database) Events(
var roomVersion gomatrixserverlib.RoomVersion var roomVersion gomatrixserverlib.RoomVersion
result := &results[i] result := &results[i]
result.EventNID = eventJSON.EventNID result.EventNID = eventJSON.EventNID
// TODO: Use NewEventFromTrustedJSON for efficiency
roomNID, err = d.statements.selectRoomNIDForEventNID(ctx, txn, eventJSON.EventNID) roomNID, err = d.statements.selectRoomNIDForEventNID(ctx, txn, eventJSON.EventNID)
if err != nil { if err != nil {
return err return err
@ -320,8 +319,8 @@ func (d *Database) Events(
if err != nil { if err != nil {
return err return err
} }
result.Event, err = gomatrixserverlib.NewEventFromUntrustedJSON( result.Event, err = gomatrixserverlib.NewEventFromTrustedJSON(
eventJSON.EventJSON, roomVersion, eventJSON.EventJSON, false, roomVersion,
) )
if err != nil { if err != nil {
return nil return nil