Skip to content

MSC4163: Make ACLs apply to EDUs#4163

Merged
anoadragon453 merged 13 commits intomatrix-org:mainfrom
Kladki:acls-for-edus
Aug 5, 2024
Merged

MSC4163: Make ACLs apply to EDUs#4163
anoadragon453 merged 13 commits intomatrix-org:mainfrom
Kladki:acls-for-edus

Conversation

@Kladki
Copy link
Copy Markdown
Contributor

@Kladki Kladki commented Jul 6, 2024 •
edited
Loading

Rendered

Implementations:

Signed-off-by: Matthias Ahouansou [email protected]

FCP tickyboxes

@tulir tulir added proposal A matrix spec change proposal s2s Server-to-Server API (federation) kind:maintenance MSC which clarifies/updates existing spec needs-implementation This MSC does not have a qualifying implementation for the SCT to review. The MSC cannot enter FCP. labels Jul 7, 2024
x86pup
x86pup reviewed Jul 7, 2024
View reviewed changes
Comment thread proposals/4163-make-acls-apply-to-edus.md
tulir
tulir reviewed Jul 7, 2024
View reviewed changes
Comment thread proposals/4163-make-acls-apply-to-edus.md
Copy link
Copy Markdown
Member

@tulir tulir Jul 7, 2024 •
edited by clokep
Loading

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Implementation requirements:

  • Server

Copy link
Copy Markdown
Member

@clokep clokep Jul 10, 2024

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

See server implementations in thread @ https://github.com/matrix-org/matrix-spec-proposals/pull/4163/files#r1667727322

Kladki added 2 commits July 7, 2024 17:52
@Kladki
make behaviour more closely align with current ACL conventions, by in…
a55cab1 
…stead considering the origin to the event

in practice this doesn't make a significant difference, due to the fact that servers should already be rejecting EDUs from servers which are not the same as the server of the user ID to prevent impersonation
@Kladki
simplify recipt logic, making it apply to all possible recipts
e30a503
TheArcaneBrony

This comment was marked as outdated.

Sign in to view

TheArcaneBrony
TheArcaneBrony reviewed Jul 7, 2024
View reviewed changes
Comment thread proposals/4163-make-acls-apply-to-edus.md
@clokep
Copy link
Copy Markdown
Member

clokep commented Jul 10, 2024

I think this is pretty straightforward, has an implementation in conduwuit and makes sense from what ACLs are meant to do.

@mscbot fcp merge

@mscbot
Copy link
Copy Markdown
Collaborator

mscbot commented Jul 10, 2024 •
edited
Loading

Team member @mscbot has proposed to merge this. The next step is review by the rest of the tagged people:

Concerns:

  • general clarity

Once at least 75% of reviewers approve (and there are no outstanding concerns), this will enter its final comment period. If you spot a major issue that hasn't been raised at any point in this process, please speak up!

See this document for information about what commands tagged team members can give me.

@mscbot mscbot added proposed-final-comment-period Currently awaiting signoff of a majority of team members in order to enter the final comment period. disposition-merge labels Jul 10, 2024
turt2live
turt2live approved these changes Jul 10, 2024
View reviewed changes
Copy link
Copy Markdown
Member

@turt2live turt2live left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

generally looks good to me, thank you!

Comment thread proposals/4163-make-acls-apply-to-edus.md Outdated
Comment thread proposals/4163-make-acls-apply-to-edus.md Outdated
Comment thread proposals/4163-make-acls-apply-to-edus.md Outdated
@turt2live
Copy link
Copy Markdown
Member

turt2live commented Jul 10, 2024

@mscbot concern general clarity

@mscbot mscbot added the unresolved-concerns This proposal has at least one outstanding concern label Jul 10, 2024
anoadragon453
anoadragon453 approved these changes Jul 17, 2024
View reviewed changes
Copy link
Copy Markdown
Member

@anoadragon453 anoadragon453 left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Small wording nits. But otherwise this lgtm, thanks!

Comment thread proposals/4163-make-acls-apply-to-edus.md Outdated
Comment thread proposals/4163-make-acls-apply-to-edus.md Outdated
@turt2live turt2live self-requested a review July 23, 2024 19:25
turt2live
turt2live reviewed Jul 23, 2024
View reviewed changes
Comment thread proposals/4163-make-acls-apply-to-edus.md Outdated
@mscbot
Copy link
Copy Markdown
Collaborator

mscbot commented Jul 30, 2024

🔔 This is now entering its final comment period, as per the review above. 🔔

@mscbot mscbot added final-comment-period This MSC has entered a final comment period in interest to approval, postpone, or delete in 5 days. and removed proposed-final-comment-period Currently awaiting signoff of a majority of team members in order to enter the final comment period. unresolved-concerns This proposal has at least one outstanding concern labels Jul 30, 2024
@mscbot
Copy link
Copy Markdown
Collaborator

mscbot commented Aug 4, 2024

The final comment period, with a disposition to merge, as per the review above, is now complete.

@mscbot mscbot added finished-final-comment-period and removed disposition-merge final-comment-period This MSC has entered a final comment period in interest to approval, postpone, or delete in 5 days. labels Aug 4, 2024
@anoadragon453 anoadragon453 merged commit cf4cdf2 into matrix-org:main Aug 5, 2024
@turt2live turt2live added spec-pr-missing Proposal has been implemented and is being used in the wild but hasn't yet been added to the spec and removed finished-final-comment-period labels Aug 5, 2024
@turt2live turt2live removed the needs-implementation This MSC does not have a qualifying implementation for the SCT to review. The MSC cannot enter FCP. label Oct 1, 2024
@turt2live
Copy link
Copy Markdown
Member

turt2live commented Oct 1, 2024

I haven't verified the implementation on this, but presumably someone has if it was accepted back in August.

@x86pup
Copy link
Copy Markdown

x86pup commented Oct 1, 2024

They do work, it was initially added to conduwuit as part of a moderation need and confirmed it stopped the problem since then.

@Johennes Johennes mentioned this pull request Nov 19, 2024
Merged
3 tasks
@Johennes
Copy link
Copy Markdown
Contributor

Johennes commented Nov 19, 2024

Spec PR: matrix-org/matrix-spec#2004

@tulir tulir added spec-pr-in-review A proposal which has been PR'd against the spec and is in review and removed spec-pr-missing Proposal has been implemented and is being used in the wild but hasn't yet been added to the spec labels Nov 19, 2024
@richvdh
Copy link
Copy Markdown
Member

richvdh commented Dec 11, 2024

merged!

@richvdh richvdh added merged A proposal whose PR has merged into the spec! and removed spec-pr-in-review A proposal which has been PR'd against the spec and is in review labels Dec 11, 2024
@zecakeh zecakeh mentioned this pull request Dec 12, 2024
Closed
26 tasks
@Johennes Johennes mentioned this pull request Jan 2, 2025
Closed
43 tasks
@Half-Shot Half-Shot mentioned this pull request Apr 16, 2025
Open
@MadLittleMods MadLittleMods mentioned this pull request May 23, 2025
Open
3 tasks
@MadLittleMods MadLittleMods mentioned this pull request Jul 3, 2025
Draft
@erooke erooke mentioned this pull request Aug 15, 2025
Merged
13 tasks
erooke added a commit to erooke/nixpkgs that referenced this pull request Aug 15, 2025
@erooke
dendrite: 0.14.1 -> 0.15.2
ebcdb9c 
Dendrite 0.15.0 is a security release supporting [room version 12](https://matrix.org/blog/2025/08/security-release/). It also added support for [MSC4163](matrix-org/matrix-spec-proposals#4163) and [MSC3967](matrix-org/matrix-spec-proposals#3967). Dendrite 0.15.1 and 2 are a bug fix releases on top of that. Full details can be found on dendrite's [changelog](https://github.com/element-hq/dendrite/blob/main/CHANGES.md).
nixpkgs-ci bot pushed a commit to NixOS/nixpkgs that referenced this pull request Aug 17, 2025
@erooke @github-actions
dendrite: 0.14.1 -> 0.15.2
f27601a 
Dendrite 0.15.0 is a security release supporting [room version 12](https://matrix.org/blog/2025/08/security-release/). It also added support for [MSC4163](matrix-org/matrix-spec-proposals#4163) and [MSC3967](matrix-org/matrix-spec-proposals#3967). Dendrite 0.15.1 and 2 are a bug fix releases on top of that. Full details can be found on dendrite's [changelog](https://github.com/element-hq/dendrite/blob/main/CHANGES.md).

(cherry picked from commit ebcdb9c)
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Reviewers

@clokep clokep clokep left review comments

@turt2live turt2live turt2live approved these changes

@richvdh richvdh richvdh left review comments

@tulir tulir tulir left review comments

@anoadragon453 anoadragon453 anoadragon453 approved these changes

+2 more reviewers

@TheArcaneBrony TheArcaneBrony TheArcaneBrony left review comments

@x86pup x86pup x86pup left review comments

Reviewers whose approvals may not affect merge requirements

Assignees

No one assigned

Labels

kind:maintenance MSC which clarifies/updates existing spec merged A proposal whose PR has merged into the spec! proposal A matrix spec change proposal s2s Server-to-Server API (federation)

Projects

Spec Core Team Workflow
Status: Merged/Done

Milestone

No milestone

Development

Successfully merging this pull request may close these issues.

10 participants

@Kladki @clokep @mscbot @turt2live @x86pup @Johennes @richvdh @anoadragon453 @tulir @TheArcaneBrony