stiag
/
matrix-org.dendrite
mirror of https://github.com/matrix-org/dendrite.git
1
0
Fork 0
Code Releases Wiki Activity

Remote banned user is kicked and may not rejoin until unbanned (#2216) 

* Remote banned user is kicked and may not rejoin until unbanned

* Use gmsl constant
This commit is contained in:
S7evinK 2022-02-22 16:50:04 +01:00 committed by GitHub
parent c7811e9d71
commit cfff1b0aaa
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 3 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
clientapi/routing/state.go
View File

@ -235,7 +235,7 @@ func OnIncomingStateTypeRequest(
}
// If the user has never been in the room then stop at this point.
// We won't tell the user about a room they have never joined.
if !membershipRes.HasBeenInRoom {
if !membershipRes.HasBeenInRoom || membershipRes.Membership == gomatrixserverlib.Ban {
return util.JSONResponse{
Code: http.StatusForbidden,
JSON: jsonerror.Forbidden(fmt.Sprintf("Unknown room %q or user %q has never joined this room", roomID, device.UserID)),

3
sytest-whitelist
View File

@ -596,4 +596,5 @@ Device list doesn't change if remote server is down
/context/ on joined room works
/context/ on non world readable room does not work
/context/ returns correct number of events
/context/ with lazy_load_members filter works
/context/ with lazy_load_members filter works
Remote banned user is kicked and may not rejoin until unbanned