mirror of
https://github.com/hoernschen/dendrite.git
synced 2025-07-31 13:22:46 +00:00
Update ACLs when received as outliers (#3008)
This should fix #3004 by making sure we also update our in-memory ACLs after joining a new room. Also makes use of more caching in `GetStateEvent` Bonus: Adds some tests, as I was about to use `GetBulkStateContent`, but turns out that `GetStateEvent` is basically doing the same, just that it only gets the `eventTypeNID`/`eventStateKeyNID` once and not for every call.
This commit is contained in:
parent
c4528b2de8
commit
b8f91485b4
11 changed files with 155 additions and 63 deletions
76
roomserver/storage/tables/interface_test.go
Normal file
76
roomserver/storage/tables/interface_test.go
Normal file
|
@ -0,0 +1,76 @@
|
|||
package tables
|
||||
|
||||
import (
|
||||
"testing"
|
||||
|
||||
"github.com/matrix-org/dendrite/roomserver/types"
|
||||
"github.com/matrix-org/dendrite/test"
|
||||
"github.com/matrix-org/gomatrixserverlib/spec"
|
||||
"github.com/stretchr/testify/assert"
|
||||
)
|
||||
|
||||
func TestExtractContentValue(t *testing.T) {
|
||||
alice := test.NewUser(t)
|
||||
room := test.NewRoom(t, alice)
|
||||
|
||||
tests := []struct {
|
||||
name string
|
||||
event *types.HeaderedEvent
|
||||
want string
|
||||
}{
|
||||
{
|
||||
name: "returns creator ID for create events",
|
||||
event: room.Events()[0],
|
||||
want: alice.ID,
|
||||
},
|
||||
{
|
||||
name: "returns the alias for canonical alias events",
|
||||
event: room.CreateEvent(t, alice, spec.MRoomCanonicalAlias, map[string]string{"alias": "#test:test"}),
|
||||
want: "#test:test",
|
||||
},
|
||||
{
|
||||
name: "returns the history_visibility for history visibility events",
|
||||
event: room.CreateEvent(t, alice, spec.MRoomHistoryVisibility, map[string]string{"history_visibility": "shared"}),
|
||||
want: "shared",
|
||||
},
|
||||
{
|
||||
name: "returns the join rules for join_rules events",
|
||||
event: room.CreateEvent(t, alice, spec.MRoomJoinRules, map[string]string{"join_rule": "public"}),
|
||||
want: "public",
|
||||
},
|
||||
{
|
||||
name: "returns the membership for room_member events",
|
||||
event: room.CreateEvent(t, alice, spec.MRoomMember, map[string]string{"membership": "join"}, test.WithStateKey(alice.ID)),
|
||||
want: "join",
|
||||
},
|
||||
{
|
||||
name: "returns the room name for room_name events",
|
||||
event: room.CreateEvent(t, alice, spec.MRoomName, map[string]string{"name": "testing"}, test.WithStateKey(alice.ID)),
|
||||
want: "testing",
|
||||
},
|
||||
{
|
||||
name: "returns the room avatar for avatar events",
|
||||
event: room.CreateEvent(t, alice, spec.MRoomAvatar, map[string]string{"url": "mxc://testing"}, test.WithStateKey(alice.ID)),
|
||||
want: "mxc://testing",
|
||||
},
|
||||
{
|
||||
name: "returns the room topic for topic events",
|
||||
event: room.CreateEvent(t, alice, spec.MRoomTopic, map[string]string{"topic": "testing"}, test.WithStateKey(alice.ID)),
|
||||
want: "testing",
|
||||
},
|
||||
{
|
||||
name: "returns guest_access for guest access events",
|
||||
event: room.CreateEvent(t, alice, "m.room.guest_access", map[string]string{"guest_access": "forbidden"}, test.WithStateKey(alice.ID)),
|
||||
want: "forbidden",
|
||||
},
|
||||
{
|
||||
name: "returns empty string if key can't be found or unknown event",
|
||||
event: room.CreateEvent(t, alice, "idontexist", nil),
|
||||
},
|
||||
}
|
||||
for _, tt := range tests {
|
||||
t.Run(tt.name, func(t *testing.T) {
|
||||
assert.Equalf(t, tt.want, ExtractContentValue(tt.event), "ExtractContentValue(%v)", tt.event)
|
||||
})
|
||||
}
|
||||
}
|
Loading…
Add table
Add a link
Reference in a new issue