mirrors/dendrite
1
0
Fork 0
mirror of https://github.com/element-hq/dendrite.git synced 2025-09-13 12:52:24 +03:00
Code Issues Projects Releases Packages Wiki Activity Actions 1

Fix syncAPI redactions (#3118)

Browse source 
Previously we were setting `redacted_because` to the PDU event, but as
per the spec it should really be a client event.
This fixes it.
This commit is contained in:
Till 2023-06-28 10:05:00 +02:00 • committed by GitHub
parent 45082d4dce
commit a5ea928d0f
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
5 changed files with 67 additions and 6 deletions
Download patch file Download diff file Expand all files Collapse all files

51
syncapi/storage/storage_test.go
View file

@ -10,6 +10,7 @@ import (
"testing"
"github.com/matrix-org/dendrite/internal/sqlutil"
"github.com/matrix-org/dendrite/roomserver/api"
rstypes "github.com/matrix-org/dendrite/roomserver/types"
"github.com/matrix-org/dendrite/setup/config"
"github.com/matrix-org/dendrite/syncapi/storage"
@ -19,6 +20,7 @@ import (
"github.com/matrix-org/gomatrixserverlib"
"github.com/matrix-org/gomatrixserverlib/spec"
"github.com/stretchr/testify/assert"
"github.com/tidwall/gjson"
)
var ctx = context.Background()
@ -978,3 +980,52 @@ func TestRecentEvents(t *testing.T) {
}
})
}
type FakeQuerier struct {
api.QuerySenderIDAPI
}
func (f *FakeQuerier) QueryUserIDForSender(ctx context.Context, roomID spec.RoomID, senderID spec.SenderID) (*spec.UserID, error) {
return spec.NewUserID(string(senderID), true)
}
func TestRedaction(t *testing.T) {
alice := test.NewUser(t)
room := test.NewRoom(t, alice)
redactedEvent := room.CreateAndInsert(t, alice, "m.room.message", map[string]interface{}{"body": "hi"})
redactionEvent := room.CreateEvent(t, alice, spec.MRoomRedaction, map[string]string{"redacts": redactedEvent.EventID()})
test.WithAllDatabases(t, func(t *testing.T, dbType test.DBType) {
db, close := MustCreateDatabase(t, dbType)
t.Cleanup(close)
MustWriteEvents(t, db, room.Events())
err := db.RedactEvent(context.Background(), redactedEvent.EventID(), redactionEvent, &FakeQuerier{})
if err != nil {
t.Fatal(err)
}
evs, err := db.Events(context.Background(), []string{redactedEvent.EventID()})
if err != nil {
t.Fatal(err)
}
if len(evs) != 1 {
t.Fatalf("expected 1 event, got %d", len(evs))
}
// check a few fields which shouldn't be there in unsigned
authEvs := gjson.GetBytes(evs[0].Unsigned(), "redacted_because.auth_events")
if authEvs.Exists() {
t.Error("unexpected auth_events in redacted event")
}
prevEvs := gjson.GetBytes(evs[0].Unsigned(), "redacted_because.prev_events")
if prevEvs.Exists() {
t.Error("unexpected auth_events in redacted event")
}
depth := gjson.GetBytes(evs[0].Unsigned(), "redacted_because.depth")
if depth.Exists() {
t.Error("unexpected auth_events in redacted event")
}
})
}