OpenCloud
/
MatrixSynapse
mirror of https://github.com/matrix-org/synapse
1
0
Fork 0
Code Issues Releases Wiki Activity

Merge branch 'matthew/well-known-cors' of github.com:matrix-org/synapse into matrix-org-hotfixes

pull/4692/head
Erik Johnston 2019-02-18 18:38:49 +00:00
parent 26f524872f 092b541401
commit 2fcb51e703
2 changed files with 4 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
changelog.d/4651.bugfix Normal file
View File

@ -0,0 +1 @@
Set CORS headers on .well-known requests

3
synapse/rest/well_known.py
View File

@ -18,6 +18,8 @@ import logging
from twisted.web.resource import Resource from twisted.web.resource import Resource
from synapse.http.server import set_cors_headers
logger = logging.getLogger(__name__) logger = logging.getLogger(__name__)
@ -59,6 +61,7 @@ class WellKnownResource(Resource):
self._well_known_builder = WellKnownBuilder(hs) self._well_known_builder = WellKnownBuilder(hs)
def render_GET(self, request): def render_GET(self, request):
set_cors_headers(request)
r = self._well_known_builder.get_well_known() r = self._well_known_builder.get_well_known()
if not r: if not r:
request.setResponseCode(404) request.setResponseCode(404)