summary refs log tree commit diff
path: root/synapse/federation/transport/server.py
diff options
context:
space:
mode:
authorRichard van der Hoff <richard@matrix.org>2018-09-04 01:23:18 +0100
committerRichard van der Hoff <richard@matrix.org>2018-09-05 13:08:07 +0100
commitc127c8d0421f0228a46ebbe280c9537e8d8ea42b (patch)
tree2ff022ac3ebbd4df9e12c3153875eb3b6c361b25 /synapse/federation/transport/server.py
parentCheck that signatures on events are valid (diff)
downloadsynapse-c127c8d0421f0228a46ebbe280c9537e8d8ea42b.tar.xz
Fix origin handling for pushed transactions
Use the actual origin for push transactions, rather than whatever the remote
server claimed.
Diffstat (limited to 'synapse/federation/transport/server.py')
-rw-r--r--synapse/federation/transport/server.py2
1 files changed, 1 insertions, 1 deletions
diff --git a/synapse/federation/transport/server.py b/synapse/federation/transport/server.py
index 77969a4f38..8cde9716ac 100644
--- a/synapse/federation/transport/server.py
+++ b/synapse/federation/transport/server.py
@@ -353,7 +353,7 @@ class FederationSendServlet(BaseFederationServlet):
 
         try:
             code, response = yield self.handler.on_incoming_transaction(
-                transaction_data
+                origin, transaction_data,
             )
         except Exception:
             logger.exception("on_incoming_transaction failed")