Ignore received EDUs if origin server in room ACL #18475

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

Open

devonh wants to merge 4 commits into develop from devon/acl-edus

+48 −0

Member

devonh commented May 23, 2025 •

edited by sandhose

Loading

Implements: MSC4163: Make ACLs apply to EDUs

Part of #18118 to declare support for Matrix v1.13

Complement PR: matrix-org/complement#783

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)


          Ignore received EDUs if origin server in room ACL

7be240d

devonh requested a review from a team as a code owner

May 23, 2025 21:59


          Add changelog entry

e268468

devonh mentioned this pull request

Declare support for Matrix v1.12 and v1.13 #18118

Open

MadLittleMods reviewed

View reviewed changes

changelog.d/18475.feature Outdated

    
            @@ -0,0 +1 @@
          
              Make ACLs apply to EDUs.

Contributor

MadLittleMods May 23, 2025

Do we have any tests for ACLs on /send anywhere? I can't seem to find any and don't want to waste time reinventing the wheel trying to add tests for these 2 cases.

There is tests/federation_acl_test.go in Complement

Member

sandhose Jun 2, 2025

Complement PR: matrix-org/complement#783

Contributor

MadLittleMods Jul 3, 2025

The Complement PR is still in draft and has a piece of pending review

MadLittleMods reviewed

View reviewed changes

changelog.d/18475.feature Outdated Show resolved Hide resolved


          Update changelog.d/18475.feature

681987a

Co-authored-by: Eric Eastwood <[email protected]>

MadLittleMods reviewed

View reviewed changes

synapse/federation/federation_server.py Show resolved Hide resolved


          Only remove banned rooms from receipts, not the whole EDU

cfc03b1

sandhose mentioned this pull request

MSC4163: Apply server ACLs to receipt and typing EDUs matrix-org/complement#783

Draft

sandhose requested a review from a team

July 3, 2025 11:35

MadLittleMods added the A-Spec-Compliance label

MadLittleMods requested changes

View reviewed changes

synapse/federation/federation_server.py

    
                                  await self.check_server_matches_acl(origin_host, room_id)

                              except AuthError:

                                  logger.warning(

                                      "Ignoring typing EDU for room %s from banned server", room_id

Contributor

MadLittleMods Jul 3, 2025

Suggested change

      
                                    "Ignoring typing EDU for room %s from banned server", room_id
          
                                    "Ignoring typing EDU for room %s from banned server because of ACL's", room_id

synapse/federation/federation_server.py

    
                              if to_remove:

                                  logger.warning(

                                      "Ignoring receipts in EDU for rooms %s from banned server %s",

Contributor

MadLittleMods Jul 3, 2025

Suggested change

      
                                    "Ignoring receipts in EDU for rooms %s from banned server %s",
          
                                    "Ignoring receipts in EDU for rooms %s from banned server %s because of ACL's",

synapse/federation/federation_server.py

    
                          # > forbidden by the room's ACL.

                          if edu.edu_type == EduTypes.RECEIPT:

                              origin_host, _ = parse_server_name(origin)

                              to_remove = set()

Contributor

MadLittleMods Jul 3, 2025

Suggested change

      
                            to_remove = set()
          
                            to_remove_room_ids = set()

synapse/federation/federation_server.py

    
                              for room_id in edu.content.keys():

                                  try:

                                      await self.check_server_matches_acl(origin_host, room_id)

                                  except AuthError:

Contributor

MadLittleMods Jul 3, 2025

Feels like we should also have a general except Exception that logger.exception(...) like below.

Perhaps we should just nest everything under that single try

synapse/federation/federation_server.py

    
                                  )

                                  for room_id in to_remove:

                                      edu.content.pop(room_id)

Contributor

MadLittleMods Jul 3, 2025

Mutating the edu itself it fine because we're creating it in this scope. But mutating edu.content is sketchy because that comes directly from the edu_dict being passed in.

Maybe one day we can lint for this kind thing (python/mypy#11076)

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

A-Spec-Compliance