Skip to content

Commit 355f92f

Browse files
authored
Add spec for MSC4163: Make ACLs apply to EDUs (#2004)
Signed-off-by: Johannes Marbach <[email protected]>
1 parent 96b32f6 commit 355f92f

File tree

2 files changed

+17
-1
lines changed

2 files changed

+17
-1
lines changed
Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
Make ACLs apply to EDUs as per [MSC4163](https://github.com/matrix-org/matrix-spec-proposals/pull/4163).

content/server-server-api.md

Lines changed: 16 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1228,7 +1228,6 @@ of `M_FORBIDDEN`.
12281228

12291229
The following endpoint prefixes MUST be protected:
12301230

1231-
- `/_matrix/federation/v1/send` (on a per-PDU basis)
12321231
- `/_matrix/federation/v1/make_join`
12331232
- `/_matrix/federation/v1/make_leave`
12341233
- `/_matrix/federation/v1/send_join`
@@ -1245,6 +1244,22 @@ The following endpoint prefixes MUST be protected:
12451244
- `/_matrix/federation/v1/event_auth`
12461245
- `/_matrix/federation/v1/get_missing_events`
12471246

1247+
Additionally the [`/_matrix/federation/v1/send/{txnId}`](#put_matrixfederationv1sendtxnid)
1248+
endpoint MUST be protected as follows:
1249+
1250+
- ACLs MUST be applied to all PDUs on a per-PDU basis. If the sending
1251+
server is denied access to the room identified by `room_id`, the PDU
1252+
MUST be ignored with an appropriate error included in the response
1253+
for the respective event ID.
1254+
- ACLs MUST be applied to all EDUs that are local to a specific room:
1255+
1256+
- For [typing notifications (`m.typing`)](#typing-notifications), if
1257+
the sending server is denied access to the room identified by
1258+
`room_id`, the EDU MUST be ignored.
1259+
- For [receipts (`m.receipt`)](#receipts), all receipts for a particular
1260+
room ID MUST be ignored if the sending server is denied access to
1261+
the room identified by that ID.
1262+
12481263
## Signing Events
12491264

12501265
Signing events is complicated by the fact that servers can choose to

0 commit comments

Comments
 (0)