Merge pull request #4510 from matrix-org/erikj/fixup_compute_event_si…

…gnature Fixup calls to `comput_event_signature`
matrix-org · Jan 29, 2019 · 2562319 · 2562319
2 parents 5488cad + 0c55b77
commit 2562319
Show file tree

Hide file tree

Showing 3 changed files with 3 additions and 2 deletions.
diff --git a/changelog.d/4510.misc 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
@@ -322,7 +322,7 @@ def _on_context_state_request_compute(self, room_id, event_id):
             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
@@ -1300,7 +1300,7 @@ def on_invite_request(self, origin, pdu):
 
         event.signatures.update(
             compute_event_signature(
-                event,
+                event.get_pdu_json(),
                 self.hs.hostname,
                 self.hs.config.signing_key[0]
             )
Original file line number	Diff line number	Diff line change
		@@ -0,0 +1 @@
		Add infrastructure to support different event formats