diff options
| author | Mark Haines <mark.haines@matrix.org> | 2016-09-09 18:51:22 +0100 |
|---|---|---|
| committer | Mark Haines <mark.haines@matrix.org> | 2016-09-09 18:51:22 +0100 |
| commit | 3ddec016ffe5a624673b5c5d9573fb11851963b9 (patch) | |
| tree | 798cf69b1aeeffb673a0aaad2a2a869f1224ebd6 /synapse/appservice/api.py | |
| parent | Allow clients to supply access_tokens as headers (diff) | |
| parent | Merge pull request #1096 from matrix-org/markjh/get_access_token (diff) | |
| download | synapse-3ddec016ffe5a624673b5c5d9573fb11851963b9.tar.xz | |
Merge branch 'develop' into markjh/bearer_token
Diffstat (limited to 'synapse/appservice/api.py')
| -rw-r--r-- | synapse/appservice/api.py | 19 |
1 files changed, 17 insertions, 2 deletions
diff --git a/synapse/appservice/api.py b/synapse/appservice/api.py index cc4af23962..b0eb0c6d9d 100644 --- a/synapse/appservice/api.py +++ b/synapse/appservice/api.py @@ -32,6 +32,14 @@ HOUR_IN_MS = 60 * 60 * 1000 APP_SERVICE_PREFIX = "/_matrix/app/unstable" +def _is_valid_3pe_metadata(info): + if "instances" not in info: + return False + if not isinstance(info["instances"], list): + return False + return True + + def _is_valid_3pe_result(r, field): if not isinstance(r, dict): return False @@ -162,11 +170,18 @@ class ApplicationServiceApi(SimpleHttpClient): urllib.quote(protocol) ) try: - defer.returnValue((yield self.get_json(uri, {}))) + info = yield self.get_json(uri, {}) + + if not _is_valid_3pe_metadata(info): + logger.warning("query_3pe_protocol to %s did not return a" + " valid result", uri) + defer.returnValue(None) + + defer.returnValue(info) except Exception as ex: logger.warning("query_3pe_protocol to %s threw exception %s", uri, ex) - defer.returnValue({}) + defer.returnValue(None) key = (service.id, protocol) return self.protocol_meta_cache.get(key) or ( |