Make turn server endpoint return an empty object if no turn servers to

match the normal response. Don't break if the turn_uris option isn't
present.

2 files changed, 2 insertions, 2 deletions

diff --git a/synapse/config/voip.py b/synapse/config/voip.py

index 3a211ae6b6..c5131d9bcd 100644
--- a/synapse/config/voip.py
+++ b/synapse/config/voip.py
@@ -19,7 +19,7 @@ class VoipConfig(Config):
 
     def __init__(self, args):
         super(VoipConfig, self).__init__(args)
-        self.turn_uris = args.turn_uris.split(",")
+        self.turn_uris = args.turn_uris.split(",") if args.turn_uris else None
         self.turn_shared_secret = args.turn_shared_secret
         self.turn_user_lifetime = args.turn_user_lifetime
 
diff --git a/synapse/rest/voip.py b/synapse/rest/voip.py

index 7260ff0e8e..2e4627606f 100644
--- a/synapse/rest/voip.py
+++ b/synapse/rest/voip.py
@@ -34,7 +34,7 @@ class VoipRestServlet(RestServlet):
         turnSecret = self.hs.config.turn_shared_secret
         userLifetime = self.hs.config.turn_user_lifetime
         if not turnUris or not turnSecret or not userLifetime:
-            defer.returnValue( (200, {"uris": []}) )
+            defer.returnValue( (200, {}) )
 
         expiry = self.hs.get_clock().time_msec() + userLifetime
         username = "%d:%s" % (expiry, auth_user.to_string())