diff options
author | Erik Johnston <erik@matrix.org> | 2014-11-10 13:37:24 +0000 |
---|---|---|
committer | Erik Johnston <erik@matrix.org> | 2014-11-10 13:37:24 +0000 |
commit | 003668cfaadc2e96fab0127d7c563eb4b17e0619 (patch) | |
tree | c7719ec91cda7b516f835ff96fad47199edd5055 /synapse/federation/replication.py | |
parent | Fix backfill to work. Add auth to backfill request (diff) | |
download | synapse-003668cfaadc2e96fab0127d7c563eb4b17e0619.tar.xz |
Add auth to the various server-server APIs
Diffstat (limited to 'synapse/federation/replication.py')
-rw-r--r-- | synapse/federation/replication.py | 14 |
1 files changed, 8 insertions, 6 deletions
diff --git a/synapse/federation/replication.py b/synapse/federation/replication.py index 7837f1c252..dd8124dbb9 100644 --- a/synapse/federation/replication.py +++ b/synapse/federation/replication.py @@ -347,10 +347,12 @@ class ReplicationLayer(object): @defer.inlineCallbacks @log_function - def on_context_state_request(self, context, event_id): + def on_context_state_request(self, origin, context, event_id): if event_id: pdus = yield self.handler.get_state_for_pdu( - event_id + origin, + context, + event_id, ) else: raise NotImplementedError("Specify an event") @@ -365,8 +367,8 @@ class ReplicationLayer(object): @defer.inlineCallbacks @log_function - def on_pdu_request(self, event_id): - pdu = yield self._get_persisted_pdu(event_id) + def on_pdu_request(self, origin, event_id): + pdu = yield self._get_persisted_pdu(origin, event_id) if pdu: defer.returnValue( @@ -499,13 +501,13 @@ class ReplicationLayer(object): defer.returnValue(Pdu(**pdu_dict)) @log_function - def _get_persisted_pdu(self, event_id): + def _get_persisted_pdu(self, origin, event_id): """ Get a PDU from the database with given origin and id. Returns: Deferred: Results in a `Pdu`. """ - return self.handler.get_persisted_pdu(event_id) + return self.handler.get_persisted_pdu(origin, event_id) def _transaction_from_pdus(self, pdu_list): """Returns a new Transaction containing the given PDUs suitable for |