summary refs log tree commit diff
path: root/synapse
diff options
context:
space:
mode:
authorErik Johnston <erikj@jki.re>2019-02-18 16:38:11 +0000
committerGitHub <noreply@github.com>2019-02-18 16:38:11 +0000
commitd08bac413672ed485774e1532c3900fb23d42c41 (patch)
tree2f9cb096347bf9d5badf017302004dba564e0f0d /synapse
parentMerge pull request #4667 from matrix-org/erikj/fix_revoke_guest_access_workers (diff)
parentFixup (diff)
downloadsynapse-d08bac413672ed485774e1532c3900fb23d42c41.tar.xz
Merge pull request #4651 from matrix-org/matthew/well-known-cors
 set CORS on .well-known URI to unbreak modular
Diffstat (limited to 'synapse')
-rw-r--r--synapse/rest/well_known.py3
1 files changed, 3 insertions, 0 deletions
diff --git a/synapse/rest/well_known.py b/synapse/rest/well_known.py
index 6e043d6162..c0a4ae93e5 100644
--- a/synapse/rest/well_known.py
+++ b/synapse/rest/well_known.py
@@ -18,6 +18,8 @@ import logging
 
 from twisted.web.resource import Resource
 
+from synapse.http.server import set_cors_headers
+
 logger = logging.getLogger(__name__)
 
 
@@ -59,6 +61,7 @@ class WellKnownResource(Resource):
         self._well_known_builder = WellKnownBuilder(hs)
 
     def render_GET(self, request):
+        set_cors_headers(request)
         r = self._well_known_builder.get_well_known()
         if not r:
             request.setResponseCode(404)