mirror of
https://mau.dev/maunium/synapse.git
synced 2024-08-26 20:22:22 +00:00
Merge branch 'hotfixes-v0.5.4a' of github.com:matrix-org/synapse into release-v0.6.0
This commit is contained in:
commit
2215faa361
@ -173,6 +173,7 @@ class FederationHandler(BaseHandler):
|
|||||||
context=event.room_id,
|
context=event.room_id,
|
||||||
event_id=event.event_id,
|
event_id=event.event_id,
|
||||||
)
|
)
|
||||||
|
# FIXME: Get auth chain for these state events
|
||||||
|
|
||||||
current_state = state
|
current_state = state
|
||||||
|
|
||||||
@ -288,7 +289,7 @@ class FederationHandler(BaseHandler):
|
|||||||
|
|
||||||
@defer.inlineCallbacks
|
@defer.inlineCallbacks
|
||||||
def on_event_auth(self, event_id):
|
def on_event_auth(self, event_id):
|
||||||
auth = yield self.store.get_auth_chain(event_id)
|
auth = yield self.store.get_auth_chain([event_id])
|
||||||
|
|
||||||
for event in auth:
|
for event in auth:
|
||||||
event.signatures.update(
|
event.signatures.update(
|
||||||
@ -528,7 +529,10 @@ class FederationHandler(BaseHandler):
|
|||||||
|
|
||||||
yield self.replication_layer.send_pdu(new_pdu, destinations)
|
yield self.replication_layer.send_pdu(new_pdu, destinations)
|
||||||
|
|
||||||
auth_chain = yield self.store.get_auth_chain(event.event_id)
|
state_ids = [e.event_id for e in event.state_events.values()]
|
||||||
|
auth_chain = yield self.store.get_auth_chain(set(
|
||||||
|
[event.event_id] + state_ids
|
||||||
|
))
|
||||||
|
|
||||||
defer.returnValue({
|
defer.returnValue({
|
||||||
"state": context.current_state.values(),
|
"state": context.current_state.values(),
|
||||||
|
@ -32,15 +32,15 @@ class EventFederationStore(SQLBaseStore):
|
|||||||
and backfilling from another server respectively.
|
and backfilling from another server respectively.
|
||||||
"""
|
"""
|
||||||
|
|
||||||
def get_auth_chain(self, event_id):
|
def get_auth_chain(self, event_ids):
|
||||||
return self.runInteraction(
|
return self.runInteraction(
|
||||||
"get_auth_chain",
|
"get_auth_chain",
|
||||||
self._get_auth_chain_txn,
|
self._get_auth_chain_txn,
|
||||||
event_id
|
event_ids
|
||||||
)
|
)
|
||||||
|
|
||||||
def _get_auth_chain_txn(self, txn, event_id):
|
def _get_auth_chain_txn(self, txn, event_ids):
|
||||||
results = self._get_auth_chain_ids_txn(txn, event_id)
|
results = self._get_auth_chain_ids_txn(txn, event_ids)
|
||||||
|
|
||||||
sql = "SELECT * FROM events WHERE event_id = ?"
|
sql = "SELECT * FROM events WHERE event_id = ?"
|
||||||
rows = []
|
rows = []
|
||||||
@ -50,21 +50,21 @@ class EventFederationStore(SQLBaseStore):
|
|||||||
|
|
||||||
return self._parse_events_txn(txn, rows)
|
return self._parse_events_txn(txn, rows)
|
||||||
|
|
||||||
def get_auth_chain_ids(self, event_id):
|
def get_auth_chain_ids(self, event_ids):
|
||||||
return self.runInteraction(
|
return self.runInteraction(
|
||||||
"get_auth_chain_ids",
|
"get_auth_chain_ids",
|
||||||
self._get_auth_chain_ids_txn,
|
self._get_auth_chain_ids_txn,
|
||||||
event_id
|
event_ids
|
||||||
)
|
)
|
||||||
|
|
||||||
def _get_auth_chain_ids_txn(self, txn, event_id):
|
def _get_auth_chain_ids_txn(self, txn, event_ids):
|
||||||
results = set()
|
results = set()
|
||||||
|
|
||||||
base_sql = (
|
base_sql = (
|
||||||
"SELECT auth_id FROM event_auth WHERE %s"
|
"SELECT auth_id FROM event_auth WHERE %s"
|
||||||
)
|
)
|
||||||
|
|
||||||
front = set([event_id])
|
front = set(event_ids)
|
||||||
while front:
|
while front:
|
||||||
sql = base_sql % (
|
sql = base_sql % (
|
||||||
" OR ".join(["event_id=?"] * len(front)),
|
" OR ".join(["event_id=?"] * len(front)),
|
||||||
|
Loading…
Reference in New Issue
Block a user