diff options
| author | Erik Johnston <erikj@jki.re> | 2019-01-29 13:35:19 +0000 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2019-01-29 13:35:19 +0000 |
| commit | 2562319821dff2acd3048bdab12f823c49e8a33d (patch) | |
| tree | 5ee7c3d23a36000c6171d4e48e9275d2a7e57ccc | |
| parent | Enable configuring test log level via env var (#4506) (diff) | |
| parent | Newsfile (diff) | |
| download | synapse-2562319821dff2acd3048bdab12f823c49e8a33d.tar.xz | |
Merge pull request #4510 from matrix-org/erikj/fixup_compute_event_signature
Fixup calls to `comput_event_signature`
| -rw-r--r-- | changelog.d/4510.misc | 1 | ||||
| -rw-r--r-- | synapse/federation/federation_server.py | 2 | ||||
| -rw-r--r-- | synapse/handlers/federation.py | 2 |
3 files changed, 3 insertions, 2 deletions
diff --git a/changelog.d/4510.misc b/changelog.d/4510.misc new file mode 100644 index 0000000000..43f8963614 --- /dev/null +++ b/changelog.d/4510.misc @@ -0,0 +1 @@ +Add infrastructure to support different event formats diff --git a/synapse/federation/federation_server.py b/synapse/federation/federation_server.py index 4aa04b9588..6681614232 100644 --- a/synapse/federation/federation_server.py +++ b/synapse/federation/federation_server.py @@ -322,7 +322,7 @@ class FederationServer(FederationBase): if self.hs.is_mine_id(event.event_id): event.signatures.update( compute_event_signature( - event, + event.get_pdu_json(), self.hs.hostname, self.hs.config.signing_key[0] ) diff --git a/synapse/handlers/federation.py b/synapse/handlers/federation.py index adf59db7a8..fcaf7530b0 100644 --- a/synapse/handlers/federation.py +++ b/synapse/handlers/federation.py @@ -1300,7 +1300,7 @@ class FederationHandler(BaseHandler): event.signatures.update( compute_event_signature( - event, + event.get_pdu_json(), self.hs.hostname, self.hs.config.signing_key[0] ) |