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.

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

Support MSC3757: Restricting who can overwrite a state event #17513

Merged
merged 29 commits into from
Sep 26, 2024

Conversation

AndrewFerr
Copy link
Member

@AndrewFerr AndrewFerr commented Aug 1, 2024

Link to the MSC

Pull Request Checklist

  • Pull request is based on the develop branch
  • Pull request includes a changelog file. The entry should:
    • Be a short description of your change which makes sense to users. "Fixed a bug that prevented receiving messages from other servers." instead of "Moved X method from EventStore to EventWorkerStore.".
    • Use markdown where necessary, mostly for code blocks.
    • End with either a period (.) or an exclamation mark (!).
    • Start with a capital letter.
    • Feel free to credit yourself, by adding a sentence "Contributed by @github_username." or "Contributed by [Your Name]." to the end of the entry.
  • Code style is correct
    (run the linters)

Restricting who can overwrite a state event
@AndrewFerr AndrewFerr requested a review from a team as a code owner August 1, 2024 03:16
@fkwp fkwp mentioned this pull request Aug 1, 2024
3 tasks
Support v9 because that is what the MSC says should be supported.
Keep supporting v10 because it is the current default room version.
Also support v11 because it is the latest room version.
@AndrewFerr
Copy link
Member Author

The new & edited unit tests cover the MSC's auth rules. Since they all pass, this PR is ready for review.

@clokep
Copy link
Contributor

clokep commented Aug 12, 2024

Can you expand the title of this PR? Each time I see a notification for it I wonder what MSC3757 is.

@AndrewFerr AndrewFerr changed the title Support MSC3757 Support MSC3757: Restricting who can overwrite a state event Aug 13, 2024
hughns
hughns previously requested changes Aug 13, 2024
Copy link
Member

@hughns hughns left a comment

Choose a reason for hiding this comment

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

@AndrewFerr as per conversation yesterday, I think the feature will need to be opt-in via configuration rather than enabled by default.

@AndrewFerr
Copy link
Member Author

I think the feature will need to be opt-in via configuration rather than enabled by default.

This is already opt-in by virtue of working only in rooms of a compatible version (org.matrix.msc3757.9 / .10 / .11).

synapse/event_auth.py Outdated Show resolved Hide resolved
tests/rest/client/test_power_levels.py Outdated Show resolved Hide resolved
synapse/event_auth.py Outdated Show resolved Hide resolved
Copy link
Member

@sandhose sandhose left a comment

Choose a reason for hiding this comment

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

Looks good overall, this is mainly about code style

synapse/api/room_versions.py Show resolved Hide resolved
synapse/api/room_versions.py Outdated Show resolved Hide resolved
synapse/event_auth.py Outdated Show resolved Hide resolved
synapse/event_auth.py Outdated Show resolved Hide resolved
tests/rest/client/test_power_levels.py Outdated Show resolved Hide resolved
tests/rest/client/test_power_levels.py Outdated Show resolved Hide resolved
Copy link
Member

@sandhose sandhose left a comment

Choose a reason for hiding this comment

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

Very minor nitpicks, otherwise looks good to me!

synapse/event_auth.py Show resolved Hide resolved
synapse/event_auth.py Show resolved Hide resolved
synapse/event_auth.py Outdated Show resolved Hide resolved
@sandhose sandhose dismissed hughns’s stale review September 11, 2024 13:59

This has been addressed

@AndrewFerr
Copy link
Member Author

Also note that this has Complement tests: matrix-org/complement#733

@AndrewFerr
Copy link
Member Author

(Complement CI is expected to fail until matrix-org/complement#733 is merged.)

@sandhose sandhose changed the base branch from develop to release-v1.116 September 26, 2024 13:22
@sandhose
Copy link
Member

Changed the base branch to release-v1.116 so that I can do another RC with it included

@sandhose sandhose merged commit 302534c into element-hq:release-v1.116 Sep 26, 2024
39 checks passed
@AndrewFerr AndrewFerr deleted the af/msc3757 branch September 26, 2024 18:02
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

6 participants