diff options
| author | Richard van der Hoff <1389908+richvdh@users.noreply.github.com> | 2018-07-18 12:46:27 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2018-07-18 12:46:27 +0100 |
| commit | dab00faa8362f4ce8369c18f9109f23cd4b8688b (patch) | |
| tree | b8f932721ffd442e80e3f520d728f6052df9bb0c | |
| parent | Merge pull request #3514 from matrix-org/dbkr/turn_dont_add_defaults (diff) | |
| parent | Add changelog (diff) | |
| download | synapse-dab00faa8362f4ce8369c18f9109f23cd4b8688b.tar.xz | |
Merge pull request #3367 from matrix-org/rav/drop_re_signing_hacks
Remove event re-signing hacks
| -rw-r--r-- | changelog.d/3367.misc | 1 | ||||
| -rw-r--r-- | synapse/handlers/federation.py | 43 |
2 files changed, 1 insertions, 43 deletions
diff --git a/changelog.d/3367.misc b/changelog.d/3367.misc new file mode 100644 index 0000000000..1f21ddea48 --- /dev/null +++ b/changelog.d/3367.misc @@ -0,0 +1 @@ +Remove unnecessary event re-signing hacks \ No newline at end of file diff --git a/synapse/handlers/federation.py b/synapse/handlers/federation.py index 20fb46fc89..65f6041b10 100644 --- a/synapse/handlers/federation.py +++ b/synapse/handlers/federation.py @@ -906,16 +906,6 @@ class FederationHandler(BaseHandler): [auth_id for auth_id, _ in event.auth_events], include_given=True ) - - for event in auth: - event.signatures.update( - compute_event_signature( - event, - self.hs.hostname, - self.hs.config.signing_key[0] - ) - ) - defer.returnValue([e for e in auth]) @log_function @@ -1371,18 +1361,6 @@ class FederationHandler(BaseHandler): del results[(event.type, event.state_key)] res = list(results.values()) - for event in res: - # We sign these again because there was a bug where we - # incorrectly signed things the first time round - if self.is_mine_id(event.event_id): - event.signatures.update( - compute_event_signature( - event, - self.hs.hostname, - self.hs.config.signing_key[0] - ) - ) - defer.returnValue(res) else: defer.returnValue([]) @@ -1454,18 +1432,6 @@ class FederationHandler(BaseHandler): ) if event: - if self.is_mine_id(event.event_id): - # FIXME: This is a temporary work around where we occasionally - # return events slightly differently than when they were - # originally signed - event.signatures.update( - compute_event_signature( - event, - self.hs.hostname, - self.hs.config.signing_key[0] - ) - ) - in_room = yield self.auth.check_host_in_room( event.room_id, origin @@ -1730,15 +1696,6 @@ class FederationHandler(BaseHandler): local_auth_chain, remote_auth_chain ) - for event in ret["auth_chain"]: - event.signatures.update( - compute_event_signature( - event, - self.hs.hostname, - self.hs.config.signing_key[0] - ) - ) - logger.debug("on_query_auth returning: %s", ret) defer.returnValue(ret) |