summary refs log tree commit diff
path: root/synapse/rest/client/v1
diff options
context:
space:
mode:
authorErik Johnston <erikj@jki.re>2017-03-31 14:37:09 +0100
committerGitHub <noreply@github.com>2017-03-31 14:37:09 +0100
commit142b6b4abf30dc3499f167fc140a94506d6dd653 (patch)
treeeb76b513bf57c83174ce211f73407d6f0590cfee /synapse/rest/client/v1
parentMerge pull request #1986 from matrix-org/matthew/enable_guest_3p (diff)
parenttypo (diff)
downloadsynapse-142b6b4abf30dc3499f167fc140a94506d6dd653.tar.xz
Merge pull request #2011 from matrix-org/matthew/turn_allow_guests
add setting (on by default) to support TURN for guests
Diffstat (limited to 'synapse/rest/client/v1')
-rw-r--r--synapse/rest/client/v1/voip.py5
1 files changed, 4 insertions, 1 deletions
diff --git a/synapse/rest/client/v1/voip.py b/synapse/rest/client/v1/voip.py
index 03141c623c..c43b30b73a 100644
--- a/synapse/rest/client/v1/voip.py
+++ b/synapse/rest/client/v1/voip.py
@@ -28,7 +28,10 @@ class VoipRestServlet(ClientV1RestServlet):
 
     @defer.inlineCallbacks
     def on_GET(self, request):
-        requester = yield self.auth.get_user_by_req(request)
+        requester = yield self.auth.get_user_by_req(
+            request,
+            self.hs.config.turn_allow_guests
+        )
 
         turnUris = self.hs.config.turn_uris
         turnSecret = self.hs.config.turn_shared_secret