hoernschen/dendrite
1
0
Fork 0
mirror of https://github.com/hoernschen/dendrite.git synced 2024-12-27 23:48:27 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Update local restricted joins some more

Browse source
This commit is contained in:
Neil Alexander 2021-11-11 13:33:25 +00:00
parent b1c024c9c1
commit 43727e978d
No known key found for this signature in database
GPG key ID: A02A2019A2BB0944
1 changed files with 25 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -244,13 +244,24 @@ func (r *Joiner) performJoinRoomByID(
// Check if the room is a restricted room. If so, update the event // Check if the room is a restricted room. If so, update the event
// builder content. // builder content.
if restricted, roomIDs, rerr := r.checkIfRestrictedJoin(ctx, req); rerr != nil { if restricted, roomIDs, rerr := r.checkIfRestrictedJoin(ctx, req); rerr != nil {
return "", "", fmt.Errorf("r.performRestrictedJoinChecks: %w", rerr) return "", "", &rsAPI.PerformError{
Code: rsAPI.PerformErrorBadRequest,
Msg: rerr.Error(),
}
} else if restricted { } else if restricted {
found := false
for _, roomID := range roomIDs { for _, roomID := range roomIDs {
if err = r.attemptRestrictedJoinUsingRoomID(ctx, req, roomID, &eb); err == nil { if err = r.attemptRestrictedJoinUsingRoomID(ctx, req, roomID, &eb); err == nil {
found = true
break break
} }
} }
if !found {
return "", "", &rsAPI.PerformError{
Code: rsAPI.PerformErrorNotAllowed,
Msg: "You do not have permission to join this restricted room.",
}
}
} }
// Try to construct an actual join event from the template. // Try to construct an actual join event from the template.
@ -354,7 +365,7 @@ func (r *Joiner) checkIfRestrictedJoin(
} }
roomIDs = append(roomIDs, allowed.RoomID) roomIDs = append(roomIDs, allowed.RoomID)
} }
return joinRuleContent.JoinRule != gomatrixserverlib.Restricted, roomIDs, nil return joinRuleContent.JoinRule == gomatrixserverlib.Restricted, roomIDs, nil
} }
func (r *Joiner) attemptRestrictedJoinUsingRoomID( func (r *Joiner) attemptRestrictedJoinUsingRoomID(
@ -383,6 +394,17 @@ func (r *Joiner) attemptRestrictedJoinUsingRoomID(
if err != nil { if err != nil {
return fmt.Errorf("r.DB.Events: %w", err) return fmt.Errorf("r.DB.Events: %w", err)
} }
foundInAllowedRoom := false
for _, event := range events {
userID := *event.StateKey()
if userID == req.UserID {
foundInAllowedRoom = true
break
}
}
if !foundInAllowedRoom {
return fmt.Errorf("the user is not joined to this room")
}
for _, event := range events { for _, event := range events {
userID := *event.StateKey() userID := *event.StateKey()
if userID == req.UserID { if userID == req.UserID {
@ -403,7 +425,7 @@ func (r *Joiner) attemptRestrictedJoinUsingRoomID(
} }
return nil return nil
} }
return fmt.Errorf("no suitable users found in the room") return fmt.Errorf("no suitable power level users found in the room")
} }
func (r *Joiner) performFederatedJoinRoomByID( func (r *Joiner) performFederatedJoinRoomByID(