Add support for MSC4155 Invite filtering #18288

Half-Shot · 2025-03-27T14:08:14Z

This implements matrix-org/matrix-spec-proposals#4155, which adds support for a new account data type that blocks an invite based on some conditions in the event contents.

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)

…filtering

anoadragon453

This is a good start! Apologies for the long turn-around time on reviews.

Could you also write some Complement tests for this? Given it's related to an MSC, it'd be good to have homeserver-level integration tests for it, assuming it eventually passes FCP.

changelog.d/18288.feature

synapse/api/constants.py

synapse/config/experimental.py

synapse/handlers/federation.py

synapse/handlers/room_member.py

synapse/storage/databases/main/account_data.py

anoadragon453 · 2025-05-13T17:26:02Z

synapse/storage/databases/main/account_data.py

+        """
+        Get the invite configuration for the current user.
+
+        If experimental MSC3391 support is enabled, any entries with an empty
+        content body are excluded; as this means they have been deleted.
+
+        Args:
+            user_id: The user to get the account_data for.
+
+        Returns:
+            The global account_data.
+        """


This docstring needs to be updated.

How strict are we on providing args and returns here. Both are fairly self explanatory?

Currently we do it even for self-explanatory arguments, though we'll write:

Args: user_id:

whether that's necessary is another conversation, but that's the current convention.

Done and done for public APIs

synapse/storage/databases/main/user_directory.py

tests/handlers/test_room_member.py

tests/storage/test_account_data.py

…filtering

Co-authored-by: Andrew Morgan <[email protected]>

turt2live

drive-by SCT review of the implementation

synapse/storage/invite_rule.py

synapse/handlers/room_member.py

synapse/handlers/federation.py

synapse/config/experimental.py

anoadragon453

A few more things, but we're getting close now! Thanks for being persistent with this one.

synapse/handlers/federation.py

synapse/handlers/room_member.py

synapse/storage/databases/main/account_data.py

synapse/storage/invite_rule.py

synapse/rest/client/capabilities.py

synapse/storage/invite_rule.py

synapse/storage/databases/main/user_directory.py

synapse/push/bulk_push_rule_evaluator.py

Co-authored-by: Andrew Morgan <[email protected]>

anoadragon453

This LGTM now, thanks!

Edit: Sytest failures appear to be unrelated to this PR.

synapse/handlers/federation.py

Half-Shot · 2025-06-04T12:31:51Z

@anoadragon453 just FYI you'll be clicking merge because I lack perms :)

Half-Shot · 2025-06-05T07:58:51Z

synapse/api/errors.py

@@ -137,6 +137,9 @@ class Codes(str, Enum):
    PROFILE_TOO_LARGE = "M_PROFILE_TOO_LARGE"
    KEY_TOO_LARGE = "M_KEY_TOO_LARGE"

+    # Part of MSC4155
+    INVITE_BLOCKED = "ORG.MATRIX.MSC4155.M_INVITE_BLOCKED"


Noting last minute introduction of error code as per spec change. https://github.com/matrix-org/matrix-spec-proposals/pull/4155/files#diff-fc221ff9830147ac4cac04ecf91ccdde962f4706c40cbd700fb99859b28afc54R62

Half-Shot added 2 commits March 27, 2025 12:56

Initial implementation of MSC4155

2eccb4c

Add a versions flag.

c7f6f30

Half-Shot changed the title ~~Implementation of MSC4155~~ Add support for MSC4155 Invite filtering Mar 27, 2025

Half-Shot mentioned this pull request Mar 27, 2025

MSC4155: Invite filtering matrix-org/matrix-spec-proposals#4155

Open

Half-Shot added 2 commits March 27, 2025 14:10

changelog

b033b1a

tweaks

9edc201

Half-Shot mentioned this pull request Mar 27, 2025

Implement MSC4155: Invite filtering element-hq/element-web#29603

Merged

4 tasks

Half-Shot added 5 commits March 31, 2025 09:38

tweak comments / block apply order

79ca4f9

Buildup tests.

eb116af

Add mixed rules.

5a9b62e

Finish writing tests

bf1302d

Merge remote-tracking branch 'origin/develop' into hs/msc4155-invite-…

501796c

…filtering

Half-Shot marked this pull request as ready for review March 31, 2025 12:56

Half-Shot requested a review from a team as a code owner March 31, 2025 12:56

anoadragon453 requested changes May 13, 2025

View reviewed changes

Merge remote-tracking branch 'origin/develop' into hs/msc4155-invite-…

729567f

…filtering

Half-Shot force-pushed the hs/msc4155-invite-filtering branch from a248274 to 729567f Compare May 22, 2025 05:57

Half-Shot and others added 4 commits May 29, 2025 12:32

Rewrite for new MSC contents

055a3d4

Merge branch 'develop' into hs/msc4155-invite-filtering

0bd92ec

lint

5a07938

Update changelog.d/18288.feature

58dfba5

Co-authored-by: Andrew Morgan <[email protected]>

Half-Shot mentioned this pull request May 29, 2025

Add tests for MSC4155 matrix-org/complement#782

Merged

1 task

Half-Shot added 8 commits May 29, 2025 15:27

review bits

cd5d797

Rewrite so that the server notices exception applies inside room_member

0b87642

remove cached because it requires true immutability

5d5cbf9

Users can also match globs

cebeaba

Add experimental config to complement

dcdf812

Revert accidental user directory change

38ae50d

everything is globs /o\

e6ad1c3

cleanup error handling

d72a884

turt2live reviewed May 29, 2025

View reviewed changes

synapse/storage/invite_rule.py Outdated Show resolved Hide resolved

Half-Shot added 2 commits May 30, 2025 08:32

Refactor so that rules are processed in the correct order

de55ace

Cleanup

e967227

Half-Shot commented Jun 2, 2025

View reviewed changes

synapse/handlers/room_member.py Outdated Show resolved Hide resolved

Half-Shot commented Jun 2, 2025

View reviewed changes

synapse/handlers/federation.py Outdated Show resolved Hide resolved

Half-Shot added 2 commits June 3, 2025 10:24

Improve ignore behaviour

268c53e

Merge branch 'develop' into hs/msc4155-invite-filtering

5b696be

Half-Shot commented Jun 3, 2025

View reviewed changes

synapse/config/experimental.py Show resolved Hide resolved

anoadragon453 requested changes Jun 4, 2025

View reviewed changes

Half-Shot and others added 5 commits June 4, 2025 11:58

Apply suggestions from code review

2f33aab

Co-authored-by: Andrew Morgan <[email protected]>

revert user directory faffage

cb5207b

Review changes

6e77fac

Remove capabilites as it was removed from the MSC.

72452b4

lint

56cd377

Half-Shot requested a review from anoadragon453 June 4, 2025 11:09

Half-Shot added 5 commits June 4, 2025 12:10

Merge branch 'develop' into hs/msc4155-invite-filtering

de1392b

Add pydoc

0a6ffc7

cleanup

8063cc6

is state

f810aa9

lint

9815587

anoadragon453 approved these changes Jun 4, 2025

View reviewed changes

synapse/handlers/federation.py Outdated Show resolved Hide resolved

Fix log line

6d72827

Half-Shot added 2 commits June 4, 2025 13:46

Merge branch 'develop' into hs/msc4155-invite-filtering

1facef6

Add INVITE_BLOCKED error.

d9defd8

Half-Shot commented Jun 5, 2025

View reviewed changes

Half-Shot added 2 commits June 5, 2025 09:52

correct error

ca76d7b

correct error code in tests

78a69ca

reivilibre approved these changes Jun 5, 2025

View reviewed changes

reivilibre merged commit 8010377 into element-hq:develop Jun 5, 2025
39 checks passed

Add support for MSC4155 Invite filtering #18288

Add support for MSC4155 Invite filtering #18288

Uh oh!

Conversation

Half-Shot commented Mar 27, 2025 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Pull Request Checklist

Uh oh!

anoadragon453 left a comment

Choose a reason for hiding this comment

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

anoadragon453 May 13, 2025

Choose a reason for hiding this comment

Uh oh!

Half-Shot May 29, 2025

Choose a reason for hiding this comment

Uh oh!

anoadragon453 Jun 4, 2025

Choose a reason for hiding this comment

Uh oh!

Half-Shot Jun 4, 2025

Choose a reason for hiding this comment

Uh oh!

Uh oh!

Uh oh!

Uh oh!

turt2live left a comment

Choose a reason for hiding this comment

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

anoadragon453 left a comment

Choose a reason for hiding this comment

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

anoadragon453 left a comment • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Uh oh!

Half-Shot commented Jun 4, 2025

Uh oh!

Half-Shot Jun 5, 2025

Choose a reason for hiding this comment

Uh oh!

Uh oh!

Uh oh!

Half-Shot commented Mar 27, 2025 •

edited

Loading

anoadragon453 left a comment •

edited

Loading