From b8dd5b1a2d76f0426c600ae19ea9d9612e5327dc Mon Sep 17 00:00:00 2001
From: Daniel Wagner-Hall <daniel@matrix.org>
Date: Fri, 16 Oct 2015 14:54:54 +0100
Subject: Verify third party ID server certificates
---
synapse/util/third_party_invites.py | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
(limited to 'synapse/util')
diff --git a/synapse/util/third_party_invites.py b/synapse/util/third_party_invites.py
index 41e597d5b9..335a9755b2 100644
--- a/synapse/util/third_party_invites.py
+++ b/synapse/util/third_party_invites.py
@@ -63,7 +63,7 @@ def check_key_valid(http_client, event):
event.content["third_party_invite"]["key_validity_url"],
{"public_key": event.content["third_party_invite"]["public_key"]}
)
- if not response["valid"]:
- raise AuthError(403, "Third party certificate was invalid")
- except IOError:
+ except Exception:
raise AuthError(502, "Third party certificate could not be checked")
+ if "valid" not in response or not response["valid"]:
+ raise AuthError(403, "Third party certificate was invalid")
--
cgit 1.5.1