Skip to content
This repository has been archived by the owner on Apr 26, 2024. It is now read-only.

Do not treat display names as globs for push rules. #7271

Merged
merged 6 commits into from
Apr 16, 2020

Conversation

clokep
Copy link
Contributor

@clokep clokep commented Apr 14, 2020

This fixes #6641 by treating display names as normal strings, not globs.

Questions

  • Do we want to use the regex_cache here?
    • I added an additional commit which expands the cache to handle non-globbed content.
  • How do we test this?
    • I tested this usually notifications in Riot.

@clokep clokep marked this pull request as ready for review April 14, 2020 13:44
@clokep clokep requested a review from a team April 14, 2020 13:46
Copy link
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.

Looks good, I'm happy this is getting fixed!

I know you tested it manually, but I think it would be worth having a unit test for _contains_display_name that checks for the bad behaviour to ensure no regressions happen?

@clokep clokep merged commit 01294e6 into develop Apr 16, 2020
@clokep clokep deleted the clokep/no-glob-display-names branch April 16, 2020 14:52
@richvdh
Copy link
Member

richvdh commented Apr 22, 2020

this was backported into release-v1.12.4 by 51f358e.

richvdh added a commit that referenced this pull request Apr 22, 2020
Synapse 1.12.4rc1 (2020-04-22)
==============================

Features
--------

- Always send users their own device updates. ([\#7160](#7160))
- Add support for handling GET requests for `account_data` on a worker. ([\#7311](#7311))

Bugfixes
--------

- Fix a bug that prevented cross-signing with users on worker-mode synapses. ([\#7255](#7255))
- Do not treat display names as globs in push rules. ([\#7271](#7271))
- Fix a bug with cross-signing devices belonging to remote users who did not share a room with any user on the local homeserver. ([\#7289](#7289))
clokep added a commit that referenced this pull request Apr 23, 2020
Synapse v1.12.4

Features:

* Always send users their own device updates. (#7160)
* Add support for handling GET requests for account_data on a worker. (#7311)

Bugfixes:

* Fix a bug that prevented cross-signing with users on worker-mode synapses. (#7255)
* Do not treat display names as globs in push rules. (#7271)
* Fix a bug with cross-signing devices belonging to remote users who did not share a
  room with any user on the local homeserver. (#7289)
anoadragon453 added a commit that referenced this pull request Apr 24, 2020
…anoa/temp_working_cache_config

* 'release-v1.12.4' of github.com:matrix-org/synapse: (123 commits)
  1.12.4
  formatting for the changelog
  1.12.4rc1
  1.12.4rc1
  Do not treat display names as globs for push rules. (#7271)
  Query missing cross-signing keys on local sig upload (#7289)
  Fix changelog file
  Support GET account_data requests on a worker (#7311)
  Revert "Query missing cross-signing keys on local sig upload"
  Always send the user updates to their own device list (#7160)
  Query missing cross-signing keys on local sig upload
  Only register devices edu handler on the master process (#7255)
  tweak changelog
  1.12.3
  Fix the debian build in a better way. (#7212)
  Fix changelog wording
  1.12.2
  Pin Pillow>=4.3.0,<7.1.0 to fix dep issue
  1.12.1
  Note where bugs were introduced
  ...
anoadragon453 added a commit that referenced this pull request Apr 24, 2020
…cache-config-without-synctl

* 'develop' of github.com:matrix-org/synapse: (76 commits)
  1.12.4
  Revert "Revert "Merge pull request #7315 from matrix-org/babolivier/request_token""
  Revert "Merge pull request #7315 from matrix-org/babolivier/request_token"
  Stop the master relaying USER_SYNC for other workers (#7318)
  Config option to inhibit 3PID errors on /requestToken
  Fix replication metrics when using redis (#7325)
  formatting for the changelog
  Another go at fixing one-word commands (#7326)
  1.12.4rc1
  1.12.4rc1
  fix changelog name
  Extend StreamChangeCache to support multiple entities per stream ID (#7303)
  Extend room admin api with additional attributes (#7225)
  Add ability to run replication protocol over redis. (#7040)
  Do not treat display names as globs for push rules. (#7271)
  Reduce logging verbosity of URL cache cleanup. (#7295)
  Query missing cross-signing keys on local sig upload (#7289)
  import urllib.parse when using urllib.parse.quote (#7319)
  Reduce federation logging on success (#7321)
  Fix changelog file
  ...
phil-flex pushed a commit to phil-flex/synapse that referenced this pull request May 15, 2020
Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

3 participants