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

Add auth events as per spec. #6556

Merged
merged 4 commits into from
Dec 16, 2019
Merged

Conversation

erikjohnston
Copy link
Member

@erikjohnston erikjohnston commented Dec 16, 2019

Previously we tried to be clever and filter out some unnecessary event
IDs to keep the auth chain small, but that had some annoying
interactions with state res v2 so we stop doing that for now.

Fixes #6520

Previously we tried to be clever and filter out some unnecessary event
IDs to keep the auth chain small, but that had some annoying
interactions with state res v2 so we stop doing that for now.
@erikjohnston erikjohnston requested a review from a team December 16, 2019 14:55
Copy link
Member

@richvdh richvdh left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

seems plausible modulo the below.

needs to target the release branch?

@@ -513,69 +508,38 @@ def is_server_admin(self, user):
"""
return self.store.is_server_admin(user)

@defer.inlineCallbacks
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

turning this from a deferred-returning function to an immediate one without updating the call sites feels like it might bite us later? Better to return defer.suceed() or add a yield defer.succeed() ?

Not that bothered though. We'll probably catch it when we update the call sites...

@@ -0,0 +1 @@
Fix a cause of state resets in v5.
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

v5 of what?

Itym room version 2 and onwards.

@erikjohnston erikjohnston merged commit 3fbe5b7 into develop Dec 16, 2019
erikjohnston added a commit that referenced this pull request Dec 16, 2019
Previously we tried to be clever and filter out some unnecessary event
IDs to keep the auth chain small, but that had some annoying
interactions with state res v2 so we stop doing that for now.
richvdh added a commit that referenced this pull request Dec 18, 2019
Synapse 1.7.1 (2019-12-18)
==========================

This release includes several security fixes as well as a fix to a bug exposed by the security fixes. Administrators are encouraged to upgrade as soon as possible.

Security updates
----------------

- Fix a bug which could cause room events to be incorrectly authorized using events from a different room. ([\#6501](#6501), [\#6503](#6503), [\#6521](#6521), [\#6524](#6524), [\#6530](#6530), [\#6531](#6531))
- Fix a bug causing responses to the `/context` client endpoint to not use the pruned version of the event. ([\#6553](#6553))
- Fix a cause of state resets in room versions 2 onwards. ([\#6556](#6556), [\#6560](#6560))

Bugfixes
--------

- Fix a bug which could cause the federation server to incorrectly return errors when handling certain obscure event graphs. ([\#6526](#6526), [\#6527](#6527))
@erikjohnston erikjohnston deleted the erikj/fix_auth_event_selection branch January 9, 2020 15:47
babolivier pushed a commit that referenced this pull request Sep 1, 2021
* commit '3fbe5b7ec':
  Add auth events as per spec. (#6556)
babolivier pushed a commit that referenced this pull request Sep 1, 2021
* commit '5ca2cfadc':
  Add auth events as per spec. (#6556)
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.

2 participants