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

Server may still be nil

Browse source
This commit is contained in:
Till Faelligen 2024-03-25 20:23:59 +01:00
parent 52a441a2ef
commit d204c7a17c
No known key found for this signature in database
GPG key ID: 3DF82D8AB9211D4E
1 changed files with 4 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
roomserver/internal/query/query_room_hierarchy.go
View file

@ -199,9 +199,11 @@ func (querier *Queryer) QueryNextRoomHierarchyPage(ctx context.Context, walker r
func authorised(ctx context.Context, querier *Queryer, caller types.DeviceOrServerName, roomID spec.RoomID, parentRoomID *spec.RoomID) (authed, isJoinedOrInvited bool) {
if clientCaller := caller.Device(); clientCaller != nil {
return authorisedUser(ctx, querier, clientCaller, roomID, parentRoomID)
} else {
return authorisedServer(ctx, querier, roomID, *caller.ServerName()), false
}
if serverCaller := caller.ServerName(); serverCaller != nil {
return authorisedServer(ctx, querier, roomID, *serverCaller), false
}
return false, false
}
// authorisedServer returns true iff the server is joined this room or the room is world_readable, public, or knockable