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

Don't fail hard, let roomserver reject event if it fails auth

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

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

@ -246,15 +246,10 @@ func (r *Joiner) performJoinRoomByID(
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 "", "", fmt.Errorf("r.performRestrictedJoinChecks: %w", rerr)
} else if restricted { } else if restricted {
success := 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 {
continue break
} }
success = true
}
if !success {
return "", "", fmt.Errorf("restricted join failed")
} }
} }