mirrors/dendrite
1
0
Fork 0
mirror of https://github.com/matrix-org/dendrite.git synced 2026-01-06 13:43:09 -06:00
Code Issues Packages Projects Releases Wiki Activity

Use invite helper in QueryRestrictedJoinAllowed

Browse source
This commit is contained in:
Neil Alexander 2022-05-24 13:44:15 +01:00
parent 02d1149ba6
commit de69fbfd02
No known key found for this signature in database
GPG key ID: A02A2019A2BB0944
1 changed files with 10 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
roomserver/internal/query/query.go
View file

@ -759,6 +759,7 @@ func (r *Queryer) QueryAuthChain(ctx context.Context, req *api.QueryAuthChainReq
return nil return nil
} }
// nolint:gocyclo
func (r *Queryer) QueryRestrictedJoinAllowed(ctx context.Context, req *api.QueryRestrictedJoinAllowedRequest, res *api.QueryRestrictedJoinAllowedResponse) error { func (r *Queryer) QueryRestrictedJoinAllowed(ctx context.Context, req *api.QueryRestrictedJoinAllowedRequest, res *api.QueryRestrictedJoinAllowedResponse) error {
// Look up if we know anything about the room. If it doesn't exist // Look up if we know anything about the room. If it doesn't exist
// or is a stub entry then we can't do anything. // or is a stub entry then we can't do anything.
@ -795,6 +796,15 @@ func (r *Queryer) QueryRestrictedJoinAllowed(ctx context.Context, req *api.Query
// come across any rooms in the request that are missing, we will unset // come across any rooms in the request that are missing, we will unset
// the flag. // the flag.
res.Resident = true res.Resident = true
// If the user is already invited to the room then the join is allowed
// but we don't specify an authorised via user, since the event auth
// will allow the join anyway.
if pending, _, _, err := helpers.IsInvitePending(ctx, r.DB, req.RoomID, req.UserID); err != nil {
return fmt.Errorf("helpers.IsInvitePending: %w", err)
} else if pending {
res.Allowed = true
return nil
}
// Step through the join rules and see if the user matches any of them. // Step through the join rules and see if the user matches any of them.
for _, rule := range joinRules.Allow { for _, rule := range joinRules.Allow {
// We only understand "m.room_membership" rules at this point in // We only understand "m.room_membership" rules at this point in