MirrorHub/dendrite
0
0
Fork 0
mirror of https://github.com/matrix-org/dendrite synced 2024-12-13 18:13:09 +01:00
Code Issues Releases Wiki Activity

Make same membership transitions 403, add sytests (#1161)

Browse source 
* Make same membership transitions 403, add sytests

* Update blacklist
This commit is contained in:
Kegsay 2020-06-24 18:19:14 +01:00 committed by GitHub
parent 002fe05a20
commit a06d0921c9
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
3 changed files with 10 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
roomserver/api/perform.go
View file

@ -38,6 +38,11 @@ func (p *PerformError) JSONResponse() util.JSONResponse {
Code: http.StatusForbidden, Code: http.StatusForbidden,
JSON: jsonerror.Forbidden(p.Msg), JSON: jsonerror.Forbidden(p.Msg),
} }
case PerformErrorNoOperation:
return util.JSONResponse{
Code: http.StatusForbidden,
JSON: jsonerror.Forbidden(p.Msg),
}
default: default:
return util.ErrorResponse(p) return util.ErrorResponse(p)
} }

3
sytest-blacklist
View file

@ -45,6 +45,9 @@ Can recv device messages over federation
Device messages over federation wake up /sync Device messages over federation wake up /sync
Wildcard device messages over federation wake up /sync Wildcard device messages over federation wake up /sync
# See https://github.com/matrix-org/sytest/pull/901
Remote invited user can see room metadata
# We don't implement soft-failed events yet, but because the /send response is vague, # We don't implement soft-failed events yet, but because the /send response is vague,
# this test thinks it's all fine... # this test thinks it's all fine...
Inbound federation accepts a second soft-failed event Inbound federation accepts a second soft-failed event

2
sytest-whitelist
View file

@ -357,6 +357,8 @@ Getting state checks the events requested belong to the room
Getting state IDs checks the events requested belong to the room Getting state IDs checks the events requested belong to the room
Can invite users to invite-only rooms Can invite users to invite-only rooms
Uninvited users cannot join the room Uninvited users cannot join the room
Users cannot invite themselves to a room
Users cannot invite a user that is already in the room
Invited user can reject invite Invited user can reject invite
Invited user can reject invite for empty room Invited user can reject invite for empty room
Invited user can reject local invite after originator leaves Invited user can reject local invite after originator leaves