diff options
| author | Erik Johnston <erikj@jki.re> | 2016-07-15 11:38:33 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2016-07-15 11:38:33 +0100 |
| commit | bd7c51921d4cac3e435ed1b4cb35632141914004 (patch) | |
| tree | b133be1c9d80784a4b7fa52b17ef7526a99b22b8 /synapse/state.py | |
| parent | Merge pull request #921 from matrix-org/erikj/account_deactivate (diff) | |
| parent | Comment (diff) | |
| download | synapse-bd7c51921d4cac3e435ed1b4cb35632141914004.tar.xz | |
Merge pull request #919 from matrix-org/erikj/auth_fix
Various auth.py fixes.
Diffstat (limited to 'synapse/state.py')
| -rw-r--r-- | synapse/state.py | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/synapse/state.py b/synapse/state.py index d0f76dc4f5..ef1bc470be 100644 --- a/synapse/state.py +++ b/synapse/state.py @@ -379,7 +379,8 @@ class StateHandler(object): try: # FIXME: hs.get_auth() is bad style, but we need to do it to # get around circular deps. - self.hs.get_auth().check(event, auth_events) + # The signatures have already been checked at this point + self.hs.get_auth().check(event, auth_events, do_sig_check=False) prev_event = event except AuthError: return prev_event @@ -391,7 +392,8 @@ class StateHandler(object): try: # FIXME: hs.get_auth() is bad style, but we need to do it to # get around circular deps. - self.hs.get_auth().check(event, auth_events) + # The signatures have already been checked at this point + self.hs.get_auth().check(event, auth_events, do_sig_check=False) return event except AuthError: pass |