summary refs log tree commit diff
path: root/synapse/federation/persistence.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/persistence.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/persistence.py')
-rw-r--r--synapse/federation/persistence.py8
1 files changed, 4 insertions, 4 deletions
diff --git a/synapse/federation/persistence.py b/synapse/federation/persistence.py
index 9146215c21..74ffd13b4f 100644
--- a/synapse/federation/persistence.py
+++ b/synapse/federation/persistence.py
@@ -36,7 +36,7 @@ class TransactionActions(object):
         self.store = datastore
 
     @log_function
-    def have_responded(self, transaction):
+    def have_responded(self, origin, transaction):
         """ Have we already responded to a transaction with the same id and
         origin?
 
@@ -50,11 +50,11 @@ class TransactionActions(object):
                                "transaction_id")
 
         return self.store.get_received_txn_response(
-            transaction.transaction_id, transaction.origin
+            transaction.transaction_id, origin
         )
 
     @log_function
-    def set_response(self, transaction, code, response):
+    def set_response(self, origin, transaction, code, response):
         """ Persist how we responded to a transaction.
 
         Returns:
@@ -66,7 +66,7 @@ class TransactionActions(object):
 
         return self.store.set_received_txn_response(
             transaction.transaction_id,
-            transaction.origin,
+            origin,
             code,
             response,
         )