mirror of
https://github.com/element-hq/synapse
synced 2024-09-02 10:20:20 +00:00
Merge branch 'master' of github.com:matrix-org/synapse into develop
This commit is contained in:
commit
74626a8de4
3 changed files with 38 additions and 17 deletions
|
@ -97,8 +97,11 @@ def lookup(destination, path):
|
||||||
if ":" in destination:
|
if ":" in destination:
|
||||||
return "https://%s%s" % (destination, path)
|
return "https://%s%s" % (destination, path)
|
||||||
else:
|
else:
|
||||||
srv = srvlookup.lookup("matrix", "tcp", destination)[0]
|
try:
|
||||||
return "https://%s:%d%s" % (srv.host, srv.port, path)
|
srv = srvlookup.lookup("matrix", "tcp", destination)[0]
|
||||||
|
return "https://%s:%d%s" % (srv.host, srv.port, path)
|
||||||
|
except:
|
||||||
|
return "https://%s:%d%s" % (destination, 8448, path)
|
||||||
|
|
||||||
def get_json(origin_name, origin_key, destination, path):
|
def get_json(origin_name, origin_key, destination, path):
|
||||||
request_json = {
|
request_json = {
|
||||||
|
|
|
@ -50,8 +50,11 @@ class FederationBase(object):
|
||||||
Returns:
|
Returns:
|
||||||
Deferred : A list of PDUs that have valid signatures and hashes.
|
Deferred : A list of PDUs that have valid signatures and hashes.
|
||||||
"""
|
"""
|
||||||
|
|
||||||
signed_pdus = []
|
signed_pdus = []
|
||||||
for pdu in pdus:
|
|
||||||
|
@defer.inlineCallbacks
|
||||||
|
def do(pdu):
|
||||||
try:
|
try:
|
||||||
new_pdu = yield self._check_sigs_and_hash(pdu)
|
new_pdu = yield self._check_sigs_and_hash(pdu)
|
||||||
signed_pdus.append(new_pdu)
|
signed_pdus.append(new_pdu)
|
||||||
|
@ -61,25 +64,37 @@ class FederationBase(object):
|
||||||
# Check local db.
|
# Check local db.
|
||||||
new_pdu = yield self.store.get_event(
|
new_pdu = yield self.store.get_event(
|
||||||
pdu.event_id,
|
pdu.event_id,
|
||||||
allow_rejected=True
|
allow_rejected=True,
|
||||||
|
allow_none=True,
|
||||||
)
|
)
|
||||||
if new_pdu:
|
if new_pdu:
|
||||||
signed_pdus.append(new_pdu)
|
signed_pdus.append(new_pdu)
|
||||||
continue
|
return
|
||||||
|
|
||||||
# Check pdu.origin
|
# Check pdu.origin
|
||||||
if pdu.origin != origin:
|
if pdu.origin != origin:
|
||||||
new_pdu = yield self.get_pdu(
|
try:
|
||||||
destinations=[pdu.origin],
|
new_pdu = yield self.get_pdu(
|
||||||
event_id=pdu.event_id,
|
destinations=[pdu.origin],
|
||||||
outlier=outlier,
|
event_id=pdu.event_id,
|
||||||
)
|
outlier=outlier,
|
||||||
|
)
|
||||||
|
|
||||||
if new_pdu:
|
if new_pdu:
|
||||||
signed_pdus.append(new_pdu)
|
signed_pdus.append(new_pdu)
|
||||||
continue
|
return
|
||||||
|
except:
|
||||||
|
pass
|
||||||
|
|
||||||
logger.warn("Failed to find copy of %s with valid signature")
|
logger.warn(
|
||||||
|
"Failed to find copy of %s with valid signature",
|
||||||
|
pdu.event_id,
|
||||||
|
)
|
||||||
|
|
||||||
|
yield defer.gatherResults(
|
||||||
|
[do(pdu) for pdu in pdus],
|
||||||
|
consumeErrors=True
|
||||||
|
)
|
||||||
|
|
||||||
defer.returnValue(signed_pdus)
|
defer.returnValue(signed_pdus)
|
||||||
|
|
||||||
|
|
|
@ -411,9 +411,12 @@ class FederationServer(FederationBase):
|
||||||
"_handle_new_pdu getting state for %s",
|
"_handle_new_pdu getting state for %s",
|
||||||
pdu.room_id
|
pdu.room_id
|
||||||
)
|
)
|
||||||
state, auth_chain = yield self.get_state_for_room(
|
try:
|
||||||
origin, pdu.room_id, pdu.event_id,
|
state, auth_chain = yield self.get_state_for_room(
|
||||||
)
|
origin, pdu.room_id, pdu.event_id,
|
||||||
|
)
|
||||||
|
except:
|
||||||
|
logger.warn("Failed to get state for event: %s", pdu.event_id)
|
||||||
|
|
||||||
ret = yield self.handler.on_receive_pdu(
|
ret = yield self.handler.on_receive_pdu(
|
||||||
origin,
|
origin,
|
||||||
|
|
Loading…
Reference in a new issue