mirror of
https://github.com/element-hq/dendrite.git
synced 2025-09-13 12:52:24 +03:00
Fix filtering issue
Signed-off-by: Till Faelligen <2353100+S7evinK@users.noreply.github.com>
This commit is contained in:
Till Faelligen
parent
ee42cb48a4
commit
7e5e7dc34b
2 changed files with 78 additions and 68 deletions
|
|
@ -46,7 +46,7 @@ func prepareWithFilters(
|
||||||
params, offset = append(params, v), offset+1
|
params, offset = append(params, v), offset+1
|
||||||
}
|
}
|
||||||
} else {
|
} else {
|
||||||
query += ` AND sender NOT = ""`
|
query += ` AND sender != ""`
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
if types != nil {
|
if types != nil {
|
||||||
|
|
@ -66,7 +66,7 @@ func prepareWithFilters(
|
||||||
params, offset = append(params, v), offset+1
|
params, offset = append(params, v), offset+1
|
||||||
}
|
}
|
||||||
} else {
|
} else {
|
||||||
query += ` AND type NOT = ""`
|
query += ` AND type != ""`
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
if containsURL != nil {
|
if containsURL != nil {
|
||||||
|
|
|
||||||
|
|
@ -548,6 +548,13 @@ func testHistoryVisibility(t *testing.T, dbType test.DBType) {
|
||||||
DisplayName: "BOB",
|
DisplayName: "BOB",
|
||||||
}
|
}
|
||||||
|
|
||||||
|
filters := []string{
|
||||||
|
// check that lazy loading doesn't break history visibility
|
||||||
|
`{"lazy_load_members":true}`,
|
||||||
|
// Test that using "not" filters does not break in SQLite
|
||||||
|
`{"lazy_load_members":true,"types":null,"not_types":[],"rooms":null,"not_rooms":[],"senders":null,"not_senders":[],"contains_url":null,"io.element.relation_senders":[],"io.element.relation_types":["io.element.thread"]}`,
|
||||||
|
}
|
||||||
|
|
||||||
ctx := context.Background()
|
ctx := context.Background()
|
||||||
// check guest and normal user accounts
|
// check guest and normal user accounts
|
||||||
for _, accType := range []userapi.AccountType{userapi.AccountTypeGuest, userapi.AccountTypeUser} {
|
for _, accType := range []userapi.AccountType{userapi.AccountTypeGuest, userapi.AccountTypeUser} {
|
||||||
|
|
@ -614,79 +621,82 @@ func testHistoryVisibility(t *testing.T, dbType test.DBType) {
|
||||||
for _, tc := range testCases {
|
for _, tc := range testCases {
|
||||||
testname := fmt.Sprintf("%s - %s", tc.historyVisibility, userType)
|
testname := fmt.Sprintf("%s - %s", tc.historyVisibility, userType)
|
||||||
t.Run(testname, func(t *testing.T) {
|
t.Run(testname, func(t *testing.T) {
|
||||||
// create a room with the given visibility
|
for _, filter := range filters {
|
||||||
room := test.NewRoom(t, alice, test.RoomHistoryVisibility(tc.historyVisibility))
|
t.Logf("Using filter: %s", filter)
|
||||||
|
// create a room with the given visibility
|
||||||
|
room := test.NewRoom(t, alice, test.RoomHistoryVisibility(tc.historyVisibility))
|
||||||
|
|
||||||
// send the events/messages to NATS to create the rooms
|
// send the events/messages to NATS to create the rooms
|
||||||
beforeJoinBody := fmt.Sprintf("Before invite in a %s room", tc.historyVisibility)
|
beforeJoinBody := fmt.Sprintf("Before invite in a %s room", tc.historyVisibility)
|
||||||
beforeJoinEv := room.CreateAndInsert(t, alice, "m.room.message", map[string]interface{}{"body": beforeJoinBody})
|
beforeJoinEv := room.CreateAndInsert(t, alice, "m.room.message", map[string]interface{}{"body": beforeJoinBody})
|
||||||
eventsToSend := append(room.Events(), beforeJoinEv)
|
eventsToSend := append(room.Events(), beforeJoinEv)
|
||||||
if err := api.SendEvents(ctx, rsAPI, api.KindNew, eventsToSend, "test", "test", "test", nil, false); err != nil {
|
if err := api.SendEvents(ctx, rsAPI, api.KindNew, eventsToSend, "test", "test", "test", nil, false); err != nil {
|
||||||
t.Fatalf("failed to send events: %v", err)
|
t.Fatalf("failed to send events: %v", err)
|
||||||
}
|
}
|
||||||
syncUntil(t, routers, aliceDev.AccessToken, false,
|
syncUntil(t, routers, aliceDev.AccessToken, false,
|
||||||
func(syncBody string) bool {
|
func(syncBody string) bool {
|
||||||
path := fmt.Sprintf(`rooms.join.%s.timeline.events.#(content.body=="%s")`, room.ID, beforeJoinBody)
|
path := fmt.Sprintf(`rooms.join.%s.timeline.events.#(content.body=="%s")`, room.ID, beforeJoinBody)
|
||||||
return gjson.Get(syncBody, path).Exists()
|
return gjson.Get(syncBody, path).Exists()
|
||||||
},
|
},
|
||||||
)
|
)
|
||||||
|
|
||||||
// There is only one event, we expect only to be able to see this, if the room is world_readable
|
// There is only one event, we expect only to be able to see this, if the room is world_readable
|
||||||
w := httptest.NewRecorder()
|
w := httptest.NewRecorder()
|
||||||
routers.Client.ServeHTTP(w, test.NewRequest(t, "GET", fmt.Sprintf("/_matrix/client/v3/rooms/%s/messages", room.ID), test.WithQueryParams(map[string]string{
|
routers.Client.ServeHTTP(w, test.NewRequest(t, "GET", fmt.Sprintf("/_matrix/client/v3/rooms/%s/messages", room.ID), test.WithQueryParams(map[string]string{
|
||||||
"access_token": bobDev.AccessToken,
|
"access_token": bobDev.AccessToken,
|
||||||
"dir": "b",
|
"dir": "b",
|
||||||
"filter": `{"lazy_load_members":true}`, // check that lazy loading doesn't break history visibility
|
"filter": filter,
|
||||||
})))
|
})))
|
||||||
if w.Code != 200 {
|
if w.Code != 200 {
|
||||||
t.Logf("%s", w.Body.String())
|
t.Logf("%s", w.Body.String())
|
||||||
t.Fatalf("got HTTP %d want %d", w.Code, 200)
|
t.Fatalf("got HTTP %d want %d", w.Code, 200)
|
||||||
}
|
}
|
||||||
// We only care about the returned events at this point
|
// We only care about the returned events at this point
|
||||||
var res struct {
|
var res struct {
|
||||||
Chunk []synctypes.ClientEvent `json:"chunk"`
|
Chunk []synctypes.ClientEvent `json:"chunk"`
|
||||||
}
|
}
|
||||||
if err := json.NewDecoder(w.Body).Decode(&res); err != nil {
|
if err := json.NewDecoder(w.Body).Decode(&res); err != nil {
|
||||||
t.Errorf("failed to decode response body: %s", err)
|
t.Errorf("failed to decode response body: %s", err)
|
||||||
}
|
}
|
||||||
|
|
||||||
verifyEventVisible(t, tc.wantResult.seeWithoutJoin, beforeJoinEv, res.Chunk)
|
verifyEventVisible(t, tc.wantResult.seeWithoutJoin, beforeJoinEv, res.Chunk)
|
||||||
|
|
||||||
// Create invite, a message, join the room and create another message.
|
// Create invite, a message, join the room and create another message.
|
||||||
inviteEv := room.CreateAndInsert(t, alice, "m.room.member", map[string]interface{}{"membership": "invite"}, test.WithStateKey(bob.ID))
|
inviteEv := room.CreateAndInsert(t, alice, "m.room.member", map[string]interface{}{"membership": "invite"}, test.WithStateKey(bob.ID))
|
||||||
afterInviteEv := room.CreateAndInsert(t, alice, "m.room.message", map[string]interface{}{"body": fmt.Sprintf("After invite in a %s room", tc.historyVisibility)})
|
afterInviteEv := room.CreateAndInsert(t, alice, "m.room.message", map[string]interface{}{"body": fmt.Sprintf("After invite in a %s room", tc.historyVisibility)})
|
||||||
joinEv := room.CreateAndInsert(t, bob, "m.room.member", map[string]interface{}{"membership": "join"}, test.WithStateKey(bob.ID))
|
joinEv := room.CreateAndInsert(t, bob, "m.room.member", map[string]interface{}{"membership": "join"}, test.WithStateKey(bob.ID))
|
||||||
afterJoinBody := fmt.Sprintf("After join in a %s room", tc.historyVisibility)
|
afterJoinBody := fmt.Sprintf("After join in a %s room", tc.historyVisibility)
|
||||||
msgEv := room.CreateAndInsert(t, alice, "m.room.message", map[string]interface{}{"body": afterJoinBody})
|
msgEv := room.CreateAndInsert(t, alice, "m.room.message", map[string]interface{}{"body": afterJoinBody})
|
||||||
|
|
||||||
eventsToSend = append([]*rstypes.HeaderedEvent{}, inviteEv, afterInviteEv, joinEv, msgEv)
|
eventsToSend = append([]*rstypes.HeaderedEvent{}, inviteEv, afterInviteEv, joinEv, msgEv)
|
||||||
|
|
||||||
if err := api.SendEvents(ctx, rsAPI, api.KindNew, eventsToSend, "test", "test", "test", nil, false); err != nil {
|
if err := api.SendEvents(ctx, rsAPI, api.KindNew, eventsToSend, "test", "test", "test", nil, false); err != nil {
|
||||||
t.Fatalf("failed to send events: %v", err)
|
t.Fatalf("failed to send events: %v", err)
|
||||||
|
}
|
||||||
|
syncUntil(t, routers, aliceDev.AccessToken, false,
|
||||||
|
func(syncBody string) bool {
|
||||||
|
path := fmt.Sprintf(`rooms.join.%s.timeline.events.#(content.body=="%s")`, room.ID, afterJoinBody)
|
||||||
|
return gjson.Get(syncBody, path).Exists()
|
||||||
|
},
|
||||||
|
)
|
||||||
|
|
||||||
|
// Verify the messages after/before invite are visible or not
|
||||||
|
w = httptest.NewRecorder()
|
||||||
|
routers.Client.ServeHTTP(w, test.NewRequest(t, "GET", fmt.Sprintf("/_matrix/client/v3/rooms/%s/messages", room.ID), test.WithQueryParams(map[string]string{
|
||||||
|
"access_token": bobDev.AccessToken,
|
||||||
|
"dir": "b",
|
||||||
|
})))
|
||||||
|
if w.Code != 200 {
|
||||||
|
t.Logf("%s", w.Body.String())
|
||||||
|
t.Fatalf("got HTTP %d want %d", w.Code, 200)
|
||||||
|
}
|
||||||
|
if err := json.NewDecoder(w.Body).Decode(&res); err != nil {
|
||||||
|
t.Errorf("failed to decode response body: %s", err)
|
||||||
|
}
|
||||||
|
// verify results
|
||||||
|
verifyEventVisible(t, tc.wantResult.seeBeforeJoin, beforeJoinEv, res.Chunk)
|
||||||
|
verifyEventVisible(t, tc.wantResult.seeAfterInvite, afterInviteEv, res.Chunk)
|
||||||
}
|
}
|
||||||
syncUntil(t, routers, aliceDev.AccessToken, false,
|
|
||||||
func(syncBody string) bool {
|
|
||||||
path := fmt.Sprintf(`rooms.join.%s.timeline.events.#(content.body=="%s")`, room.ID, afterJoinBody)
|
|
||||||
return gjson.Get(syncBody, path).Exists()
|
|
||||||
},
|
|
||||||
)
|
|
||||||
|
|
||||||
// Verify the messages after/before invite are visible or not
|
|
||||||
w = httptest.NewRecorder()
|
|
||||||
routers.Client.ServeHTTP(w, test.NewRequest(t, "GET", fmt.Sprintf("/_matrix/client/v3/rooms/%s/messages", room.ID), test.WithQueryParams(map[string]string{
|
|
||||||
"access_token": bobDev.AccessToken,
|
|
||||||
"dir": "b",
|
|
||||||
})))
|
|
||||||
if w.Code != 200 {
|
|
||||||
t.Logf("%s", w.Body.String())
|
|
||||||
t.Fatalf("got HTTP %d want %d", w.Code, 200)
|
|
||||||
}
|
|
||||||
if err := json.NewDecoder(w.Body).Decode(&res); err != nil {
|
|
||||||
t.Errorf("failed to decode response body: %s", err)
|
|
||||||
}
|
|
||||||
// verify results
|
|
||||||
verifyEventVisible(t, tc.wantResult.seeBeforeJoin, beforeJoinEv, res.Chunk)
|
|
||||||
verifyEventVisible(t, tc.wantResult.seeAfterInvite, afterInviteEv, res.Chunk)
|
|
||||||
})
|
})
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
|
||||||
Loading…
Add table
Add a link
Reference in a new issue