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

Pass room version object into event_auth.check and check_redaction #6788

Merged
merged 3 commits into from
Jan 28, 2020
Merged

Pass room version object into event_auth.check and check_redaction #6788

merged 3 commits into from
Jan 28, 2020

Conversation

richvdh
Copy link
Member

@richvdh richvdh commented Jan 27, 2020

These are easier to work with than the strings and we normally have one around.

This fixes FederationHander._persist_auth_tree which was passing a
RoomVersion object into event_auth.check instead of a string.

@richvdh
Pass room version object into event_auth.check and check_redaction
14493b4 
These are easier to work with than the strings and we normally have one around.

This fixes `FederationHander._persist_auth_tree` which was passing a
RoomVersion object into event_auth.check instead of a string.
@richvdh richvdh requested a review from a team January 27, 2020 16:53
@richvdh richvdh mentioned this pull request Jan 27, 2020
Merged
@anoadragon453
Copy link
Member

This fixes FederationHander._persist_auth_tree which was passing a
RoomVersion object into event_auth.check instead of a string.

You mean the other way around, right?

anoadragon453
anoadragon453 approved these changes Jan 28, 2020
View reviewed changes
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.

There's a couple other instances here:

synapse/synapse/handlers/federation.py

Line 1915 in 14493b4

event_auth.check(room_version, e, auth_events=auth_for_e)
and

synapse/synapse/event_auth.py

Line 171 in 14493b4

check_redaction(room_version, event, auth_events)

You may want to keep the _obj naming convention.

@richvdh
Copy link
Member Author

richvdh commented Jan 28, 2020

This fixes FederationHander._persist_auth_tree which was passing a
RoomVersion object into event_auth.check instead of a string.

You mean the other way around, right?

I don't think so. It was passing in a RoomVersion when it should have been passing a string. It's now fixed because event_auth.check now expects a string.

@anoadragon453
Copy link
Member

@richvdh It doesn't look like it's expecting a string?

https://github.com/matrix-org/synapse/pull/6788/files#diff-a9f594f3677833c150b6c2c8a40b39f7R38

@richvdh
Copy link
Member Author

richvdh commented Jan 28, 2020

@richvdh It doesn't look like it's expecting a string?

sorry, my bad. What I meant was:

It's now fixed because event_auth.check now expects a RoomVersion.

anoadragon453
anoadragon453 approved these changes Jan 28, 2020
View reviewed changes
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.

LGTM

@richvdh richvdh merged commit a8ce7ae into develop Jan 28, 2020
richvdh added a commit that referenced this pull request Jan 31, 2020
@richvdh
Fix room_version in _persist_auth_tree
54437f6 
Fixes a confusion about whether room_version is a string or an object.

This was introduced in #6729 and half-fixed in #6788.
This was referenced Jan 31, 2020
Closed
Merged
babolivier added a commit that referenced this pull request Feb 12, 2020
@babolivier
Merge tag 'v1.10.0'
d9239b5 
Synapse 1.10.0 (2020-02-12)
===========================

**WARNING to client developers**: As of this release Synapse validates `client_secret` parameters in the Client-Server API as per the spec. See [\#6766](#6766) for details.

Updates to the Docker image
---------------------------

- Update the docker images to Alpine Linux 3.11. ([\#6897](#6897))

Synapse 1.10.0rc5 (2020-02-11)
==============================

Bugfixes
--------

- Fix the filtering introduced in 1.10.0rc3 to also apply to the state blocks returned by `/sync`. ([\#6884](#6884))

Synapse 1.10.0rc4 (2020-02-11)
==============================

This release candidate was built incorrectly and is superceded by 1.10.0rc5.

Synapse 1.10.0rc3 (2020-02-10)
==============================

Features
--------

- Filter out `m.room.aliases` from the CS API to mitigate abuse while a better solution is specced. ([\#6878](#6878))

Internal Changes
----------------

- Fix continuous integration failures with old versions of `pip`, which were introduced by a release of the `zipp` library. ([\#6880](#6880))

Synapse 1.10.0rc2 (2020-02-06)
==============================

Bugfixes
--------

- Fix an issue with cross-signing where device signatures were not sent to remote servers. ([\#6844](#6844))
- Fix to the unknown remote device detection which was introduced in 1.10.rc1. ([\#6848](#6848))

Internal Changes
----------------

- Detect unexpected sender keys on remote encrypted events and resync device lists. ([\#6850](#6850))

Synapse 1.10.0rc1 (2020-01-31)
==============================

Features
--------

- Add experimental support for updated authorization rules for aliases events, from [MSC2260](matrix-org/matrix-spec-proposals#2260). ([\#6787](#6787), [\#6790](#6790), [\#6794](#6794))

Bugfixes
--------

- Warn if postgres database has a non-C locale, as that can cause issues when upgrading locales (e.g. due to upgrading OS). ([\#6734](#6734))
- Minor fixes to `PUT /_synapse/admin/v2/users` admin api. ([\#6761](#6761))
- Validate `client_secret` parameter using the regex provided by the Client-Server API, temporarily allowing `:` characters for older clients. The `:` character will be removed in a future release. ([\#6767](#6767))
- Fix persisting redaction events that have been redacted (or otherwise don't have a redacts key). ([\#6771](#6771))
- Fix outbound federation request metrics. ([\#6795](#6795))
- Fix bug where querying a remote user's device keys that weren't cached resulted in only returning a single device. ([\#6796](#6796))
- Fix race in federation sender worker that delayed sending of device updates. ([\#6799](#6799), [\#6800](#6800))
- Fix bug where Synapse didn't invalidate cache of remote users' devices when Synapse left a room. ([\#6801](#6801))
- Fix waking up other workers when remote server is detected to have come back online. ([\#6811](#6811))

Improved Documentation
----------------------

- Clarify documentation related to `user_dir` and `federation_reader` workers. ([\#6775](#6775))

Internal Changes
----------------

- Record room versions in the `rooms` table. ([\#6729](#6729), [\#6788](#6788), [\#6810](#6810))
- Propagate cache invalidates from workers to other workers. ([\#6748](#6748))
- Remove some unnecessary admin handler abstraction methods. ([\#6751](#6751))
- Add some debugging for media storage providers. ([\#6757](#6757))
- Detect unknown remote devices and mark cache as stale. ([\#6776](#6776), [\#6819](#6819))
- Attempt to resync remote users' devices when detected as stale. ([\#6786](#6786))
- Delete current state from the database when server leaves a room. ([\#6792](#6792))
- When a client asks for a remote user's device keys check if the local cache for that user has been marked as potentially stale. ([\#6797](#6797))
- Add background update to clean out left rooms from current state. ([\#6802](#6802), [\#6816](#6816))
- Refactoring work in preparation for changing the event redaction algorithm. ([\#6803](#6803), [\#6805](#6805), [\#6806](#6806), [\#6807](#6807), [\#6820](#6820))
@richvdh richvdh deleted the rav/event_auth_room_version branch December 1, 2020 12:34
babolivier pushed a commit that referenced this pull request Sep 1, 2021
@anoadragon453
Pass room version object into event_auth.check and check_redaction (#…
45e098e 
…6788)

* commit 'a8ce7aeb4':
  Pass room version object into event_auth.check and check_redaction (#6788)
Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.
Reviewers

@anoadragon453 anoadragon453 anoadragon453 approved these changes

Assignees
No one assigned
Labels
None yet
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
2 participants
@richvdh @anoadragon453