Support MSC3667 in a new room version #11885

turt2live · 2022-02-02T03:26:09Z

~~Includes MSC3604's representation for testing.~~

MSC: matrix-org/matrix-spec-proposals#3667

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.
Pull request includes a sign off
Code style is correct
(run the linters)

turt2live · 2022-02-02T03:26:44Z

synapse/event_auth.py

@@ -137,6 +137,22 @@ def check_auth_rules_for_event(
    Raises:
        AuthError if the checks fail
    """
+    # Before we get too far into event auth, validate that the event is even
+    # valid enough to be used
+    if event.type == EventTypes.PowerLevels:


this might be in the wrong place, but it's highly convenient to put it here

It seems like for similar code we usually do it in EventValidator.validate_new + event_from_pdu_json, but I'm unsure if that makes sense or not. (I was looking at where we call validate_canonicaljson)

We should really add a function to the Validator for inbound federation events, I guess

Includes MSC3604's representation for testing.

erikjohnston

Seems sane enough to convince me the MSC is implementable

erikjohnston · 2022-02-08T08:55:25Z

synapse/event_auth.py

+        if room_version_obj.msc3667_int_only_power_levels:
+            for k, v in event.content.items():
+                if k in ["events", "notifications", "users"]:
+                    if type(v) is not dict:


One usually does isinstance(v, dict), but it doesn't really matter in this case (isinstance correctly handles subclasses and the like)

synapse/event_auth.py

erikjohnston · 2022-02-08T08:56:47Z

synapse/event_auth.py

@@ -137,6 +137,22 @@ def check_auth_rules_for_event(
    Raises:
        AuthError if the checks fail
    """
+    # Before we get too far into event auth, validate that the event is even
+    # valid enough to be used
+    if event.type == EventTypes.PowerLevels:


We should really add a function to the Validator for inbound federation events, I guess

erikjohnston · 2022-02-08T08:58:54Z

synapse/event_auth.py

+        # If applicable, validate that the known power levels are integers
+        if room_version_obj.msc3667_int_only_power_levels:
+            for k, v in event.content.items():
+                if k in ["events", "notifications", "users"]:


I am somewhat tempted to just recursively check that all values are either dicts or ints? That way we don't need to remember to update this set for new fields. That would break experimental non-int fields, so maybe we could only do that on the redacted form of the power level?

I'm a little bit worried that'd treat ban: {} as valid :(

turt2live · 2022-05-04T02:56:15Z

~~This is now formally blocked behind #12623 as it needs to pull in those changes to properly support the MSC.~~

Edit: wrong PR :|

richvdh · 2022-05-04T15:08:18Z

@turt2live what is the state of this PR?

turt2live · 2022-05-04T15:09:44Z

Needs someone who isn't me to take it to merge. I can probably address some of the code quality issues, but tests are well beyond my capability.

turt2live · 2022-05-20T01:04:29Z

Have modernized this to present day, though it still needs someone to take a proper crack at it.

turt2live · 2022-05-30T20:28:33Z

synapse/event_auth.py

+                if k in ["events", "notifications", "users"]:
+                    if type(v) is not dict:
+                        raise AuthError(403, "Not a valid object: %s" % (k,))
+                    for v2 in v.values():


this check won't work because of how the auth rules are written: we have to check the keys explicitly.

squahtx · 2022-07-11T18:08:05Z

superseded by #13220

turt2live commented Feb 2, 2022

View reviewed changes

turt2live added 2 commits February 1, 2022 20:27

Support MSC3667 in a new room version

0f6ab42

Includes MSC3604's representation for testing.

Changelog

0e55160

turt2live force-pushed the travis/msc3667 branch from 4a36426 to 0e55160 Compare February 2, 2022 03:27

turt2live mentioned this pull request Feb 2, 2022

MSC3667: Enforce integer power levels matrix-org/matrix-spec-proposals#3667

Merged

turt2live added 2 commits February 1, 2022 20:31

lint

f1d5890

more lint

f5e2cde

turt2live marked this pull request as ready for review February 2, 2022 20:04

turt2live requested a review from a team as a code owner February 2, 2022 20:04

erikjohnston reviewed Feb 8, 2022

View reviewed changes

erikjohnston added X-Awaiting-Changes A contributed PR which needs changes and re-review before it can be merged z-blocked (Deprecated Label) labels Feb 23, 2022

This was referenced May 4, 2022

Add MSC3604 opt3 + prior #12625

Closed

MSC3604: Room Version 10 matrix-org/matrix-spec-proposals#3604

Merged

turt2live added 4 commits May 19, 2022 19:01

Merge branch 'develop' into travis/msc3667

72b19cb

Remove defunct opt2 room version

99ef23d

Populate missing room version fields (post-merge)

cf72994

Address the easy parts of code review

3f310c9

turt2live mentioned this pull request May 20, 2022

Add room version for MSC3604 opt4 #12805

Closed

turt2live commented May 30, 2022

View reviewed changes

turt2live mentioned this pull request May 30, 2022

Specify room version 10: knock_restricted and int power levels matrix-org/matrix-spec#1099

Merged

clokep mentioned this pull request Jun 16, 2022

Support room version 10 #13084

Closed

2 tasks

squahtx closed this Jul 11, 2022

turt2live deleted the travis/msc3667 branch July 13, 2022 18:41

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Support MSC3667 in a new room version #11885

Support MSC3667 in a new room version #11885

turt2live commented Feb 2, 2022 •

edited

Loading

turt2live Feb 2, 2022

clokep Feb 3, 2022

erikjohnston Feb 8, 2022

erikjohnston left a comment

erikjohnston Feb 8, 2022

erikjohnston Feb 8, 2022

erikjohnston Feb 8, 2022

turt2live Feb 8, 2022

turt2live commented May 4, 2022 •

edited

Loading

richvdh commented May 4, 2022

turt2live commented May 4, 2022

turt2live commented May 20, 2022

turt2live May 30, 2022

squahtx commented Jul 11, 2022

Support MSC3667 in a new room version #11885

Support MSC3667 in a new room version #11885

Conversation

turt2live commented Feb 2, 2022 • edited Loading

Pull Request Checklist

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

erikjohnston left a comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

turt2live commented May 4, 2022 • edited Loading

richvdh commented May 4, 2022

turt2live commented May 4, 2022

turt2live commented May 20, 2022

Choose a reason for hiding this comment

squahtx commented Jul 11, 2022

turt2live commented Feb 2, 2022 •

edited

Loading

turt2live commented May 4, 2022 •

edited

Loading