From c127c8d0421f0228a46ebbe280c9537e8d8ea42b Mon Sep 17 00:00:00 2001
From: Richard van der Hoff <richard@matrix.org>
Date: Tue, 4 Sep 2018 01:23:18 +0100
Subject: Fix origin handling for pushed transactions

Use the actual origin for push transactions, rather than whatever the remote
server claimed.
---
 synapse/federation/transport/server.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'synapse/federation/transport')

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")
-- 
cgit 1.4.1