mirrors/synapse
1
0
Fork 0
mirror of https://github.com/element-hq/synapse.git synced 2024-11-22 01:25:44 +03:00
Code Issues Projects Releases Packages Wiki Activity

Correctly handle all the places that can throw exceptions

Browse source
This commit is contained in:
Erik Johnston 2015-02-12 18:17:11 +00:00
parent 92d850fc87
commit 963256638d
4 changed files with 36 additions and 14 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
scripts/federation_client.py
View file

@ -97,8 +97,11 @@ def lookup(destination, path):
if ":" in destination:
return "https://%s%s" % (destination, path)
else:
srv = srvlookup.lookup("matrix", "tcp", destination)[0]
return "https://%s:%d%s" % (srv.host, srv.port, path)
try:
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):
request_json = {

22
synapse/federation/federation_base.py
View file

@ -61,7 +61,8 @@ class FederationBase(object):
# Check local db.
new_pdu = yield self.store.get_event(
pdu.event_id,
allow_rejected=True
allow_rejected=True,
allow_none=True,
)
if new_pdu:
signed_pdus.append(new_pdu)
@ -69,15 +70,18 @@ class FederationBase(object):
# Check pdu.origin
if pdu.origin != origin:
new_pdu = yield self.get_pdu(
destinations=[pdu.origin],
event_id=pdu.event_id,
outlier=outlier,
)
try:
new_pdu = yield self.get_pdu(
destinations=[pdu.origin],
event_id=pdu.event_id,
outlier=outlier,
)
if new_pdu:
signed_pdus.append(new_pdu)
continue
if new_pdu:
signed_pdus.append(new_pdu)
continue
except:
pass
logger.warn("Failed to find copy of %s with valid signature")

9
synapse/federation/federation_server.py
View file

@ -411,9 +411,12 @@ class FederationServer(FederationBase):
"_handle_new_pdu getting state for %s",
pdu.room_id
)
state, auth_chain = yield self.get_state_for_room(
origin, pdu.room_id, pdu.event_id,
)
try:
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(
origin,

12
synapse/handlers/federation.py
View file

@ -788,6 +788,18 @@ class FederationHandler(BaseHandler):
defer.returnValue(ret)
@defer.inlineCallbacks
def trigger_query_auth(self, destination, event_id):
local_auth_chain = yield self.store.get_auth_chain([event_id])
result = yield self.replication_layer.query_auth(
destination,
event.room_id,
event.event_id,
local_auth_chain,
)
@defer.inlineCallbacks
@log_function
def do_auth(self, origin, event, context, auth_events):