tileradotorg/synapse
1
0
Fork 0
forked from MirrorHub/synapse
Code Pull requests Activity

Reject malformed 3PE query metadata results earlier in AS API handling code

Browse source
This commit is contained in:
Paul "LeoNerd" Evans 2016-09-09 15:07:04 +01:00
parent f25d74f69c
commit ed44c475d8
2 changed files with 15 additions and 11 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

12
synapse/appservice/api.py
View file

@ -162,11 +162,19 @@ class ApplicationServiceApi(SimpleHttpClient):
urllib.quote(protocol) urllib.quote(protocol)
) )
try: try:
defer.returnValue((yield self.get_json(uri, {}))) info = yield self.get_json(uri, {})
# Ignore any result that doesn't contain an "instances" list
if "instances" not in info:
defer.returnValue(None)
if not isinstance(info["instances"], list):
defer.returnValue(None)
defer.returnValue(info)
except Exception as ex: except Exception as ex:
logger.warning("query_3pe_protocol to %s threw exception %s", logger.warning("query_3pe_protocol to %s threw exception %s",
uri, ex) uri, ex)
defer.returnValue({}) defer.returnValue(None)
key = (service.id, protocol) key = (service.id, protocol)
return self.protocol_meta_cache.get(key) or ( return self.protocol_meta_cache.get(key) or (

14
synapse/handlers/appservice.py
View file

@ -186,17 +186,13 @@ class ApplicationServicesHandler(object):
if only_protocol is not None and p != only_protocol: if only_protocol is not None and p != only_protocol:
continue continue
info = yield self.appservice_api.get_3pe_protocol(s, p)
# Ignore any result that doesn't contain an "instances" list
if "instances" not in info:
continue
if not isinstance(info["instances"], list):
continue
if p not in protocols: if p not in protocols:
protocols[p] = [] protocols[p] = []
protocols[p].append(info)
info = yield self.appservice_api.get_3pe_protocol(s, p)
if info is not None:
protocols[p].append(info)
def _merge_instances(infos): def _merge_instances(infos):
if not infos: if not infos: