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

Fix local room check

Browse source
This commit is contained in:
Neil Alexander 2020-09-09 18:00:42 +01:00
parent 82062d9b53
commit 20dd71ebea
No known key found for this signature in database
GPG key ID: A02A2019A2BB0944
1 changed files with 12 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

14
roomserver/internal/perform/perform_join.go
View file

@ -335,8 +335,18 @@ func buildEvent(
return nil, nil, fmt.Errorf("QueryLatestEventsAndState: %w", err) return nil, nil, fmt.Errorf("QueryLatestEventsAndState: %w", err)
} }
if !auth.IsAnyUserOnServerWithMembership(cfg.ServerName, gomatrixserverlib.UnwrapEventHeaders(queryRes.StateEvents), "join") { // If we know about any membership events in this room, check and see
return nil, nil, eventutil.ErrRoomNoExists // if we still believe any of our users to be in the room. If not, then
// returning that the room doesn't exist will kick the room join over
// to a federated join. If we don't know about any of the membership
// events then it's probably a new local room so do nothing.
for _, ev := range queryRes.StateEvents {
if ev.Type() == gomatrixserverlib.MRoomMember {
if !auth.IsAnyUserOnServerWithMembership(cfg.ServerName, gomatrixserverlib.UnwrapEventHeaders(queryRes.StateEvents), "join") {
return nil, nil, eventutil.ErrRoomNoExists
}
break
}
} }
ev, err := eventutil.BuildEvent(ctx, builder, cfg, time.Now(), &eventsNeeded, &queryRes) ev, err := eventutil.BuildEvent(ctx, builder, cfg, time.Now(), &eventsNeeded, &queryRes)