Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Fix missed rst->md numbered list syntax for m.room.server_acl #3681

Merged
merged 3 commits into from
Feb 6, 2022
Merged

Fix missed rst->md numbered list syntax for m.room.server_acl #3681

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
7410720
Fix missed rst->md numbered list syntax
anoadragon453 Jan 27, 2022
6fb2297
changelog
anoadragon453 Jan 27, 2022
a45d589
Don't use markdown number-list shortcuts
anoadragon453 Jan 28, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
1 change: 1 addition & 0 deletions changelogs/client_server/3681.clarification
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
Fix broken syntax in Server Access Control Lists definition.
8 changes: 4 additions & 4 deletions data/event-schemas/schema/m.room.server_acl.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,11 +16,11 @@ description: |-
the following order:

1. If there is no `m.room.server_acl` event in the room state, allow.
#. If the server name is an IP address (v4 or v6) literal, and `allow_ip_literals`
2. If the server name is an IP address (v4 or v6) literal, and `allow_ip_literals`
is present and `false`, deny.
#. If the server name matches an entry in the `deny` list, deny.
#. If the server name matches an entry in the `allow` list, allow.
#. Otherwise, deny.
3. If the server name matches an entry in the `deny` list, deny.
4. If the server name matches an entry in the `allow` list, allow.
5. Otherwise, deny.

**Note:**
Server ACLs do not restrict the events relative to the room DAG via authorisation
Expand Down