From dbf736ba66fe6b530bfe3d9d503caa2e24ee8f01 Mon Sep 17 00:00:00 2001 From: Will Hunt Date: Sun, 9 Dec 2018 13:27:22 +0000 Subject: [PATCH 1/4] Make /config more CORS-y --- synapse/rest/media/v1/config_resource.py | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/synapse/rest/media/v1/config_resource.py b/synapse/rest/media/v1/config_resource.py index d6605b602..8c3adf6c6 100644 --- a/synapse/rest/media/v1/config_resource.py +++ b/synapse/rest/media/v1/config_resource.py @@ -18,7 +18,7 @@ from twisted.internet import defer from twisted.web.resource import Resource from twisted.web.server import NOT_DONE_YET -from synapse.http.server import respond_with_json, wrap_json_request_handler +from synapse.http.server import respond_with_json, wrap_json_request_handler, set_cors_headers class MediaConfigResource(Resource): @@ -40,9 +40,11 @@ class MediaConfigResource(Resource): @wrap_json_request_handler @defer.inlineCallbacks def _async_render_GET(self, request): + set_cors_headers(request) yield self.auth.get_user_by_req(request) respond_with_json(request, 200, self.limits_dict) def render_OPTIONS(self, request): + set_cors_headers(request) respond_with_json(request, 200, {}, send_cors=True) return NOT_DONE_YET From 91206e09f2831d2cbc499189ad5ee8f4bc9dcaac Mon Sep 17 00:00:00 2001 From: Will Hunt Date: Sun, 9 Dec 2018 17:39:22 +0000 Subject: [PATCH 2/4] changelog & isort --- changelog.d/4279.bugfix | 1 + synapse/rest/media/v1/config_resource.py | 6 +++++- 2 files changed, 6 insertions(+), 1 deletion(-) create mode 100644 changelog.d/4279.bugfix diff --git a/changelog.d/4279.bugfix b/changelog.d/4279.bugfix new file mode 100644 index 000000000..12de4f44c --- /dev/null +++ b/changelog.d/4279.bugfix @@ -0,0 +1 @@ +Send CORS headers for /media/config diff --git a/synapse/rest/media/v1/config_resource.py b/synapse/rest/media/v1/config_resource.py index 8c3adf6c6..9b97da213 100644 --- a/synapse/rest/media/v1/config_resource.py +++ b/synapse/rest/media/v1/config_resource.py @@ -18,7 +18,11 @@ from twisted.internet import defer from twisted.web.resource import Resource from twisted.web.server import NOT_DONE_YET -from synapse.http.server import respond_with_json, wrap_json_request_handler, set_cors_headers +from synapse.http.server import ( + respond_with_json, + set_cors_headers, + wrap_json_request_handler, +) class MediaConfigResource(Resource): From 466c1f3e010c35ecdf1ec6dba181c42cfb94e899 Mon Sep 17 00:00:00 2001 From: Will Hunt Date: Mon, 10 Dec 2018 13:11:37 +0000 Subject: [PATCH 3/4] Use `send_cors` --- synapse/rest/media/v1/config_resource.py | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) diff --git a/synapse/rest/media/v1/config_resource.py b/synapse/rest/media/v1/config_resource.py index 9b97da213..502d1761d 100644 --- a/synapse/rest/media/v1/config_resource.py +++ b/synapse/rest/media/v1/config_resource.py @@ -20,7 +20,6 @@ from twisted.web.server import NOT_DONE_YET from synapse.http.server import ( respond_with_json, - set_cors_headers, wrap_json_request_handler, ) @@ -44,11 +43,9 @@ class MediaConfigResource(Resource): @wrap_json_request_handler @defer.inlineCallbacks def _async_render_GET(self, request): - set_cors_headers(request) yield self.auth.get_user_by_req(request) - respond_with_json(request, 200, self.limits_dict) + respond_with_json(request, 200, self.limits_dict, send_cors=True) def render_OPTIONS(self, request): - set_cors_headers(request) respond_with_json(request, 200, {}, send_cors=True) return NOT_DONE_YET From fee831c040f19c30a433f99b1c80a61ea2798c72 Mon Sep 17 00:00:00 2001 From: Will Hunt Date: Mon, 10 Dec 2018 13:52:33 +0000 Subject: [PATCH 4/4] Move imports to one line --- synapse/rest/media/v1/config_resource.py | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) diff --git a/synapse/rest/media/v1/config_resource.py b/synapse/rest/media/v1/config_resource.py index 502d1761d..77316033f 100644 --- a/synapse/rest/media/v1/config_resource.py +++ b/synapse/rest/media/v1/config_resource.py @@ -18,10 +18,7 @@ from twisted.internet import defer from twisted.web.resource import Resource from twisted.web.server import NOT_DONE_YET -from synapse.http.server import ( - respond_with_json, - wrap_json_request_handler, -) +from synapse.http.server import respond_with_json, wrap_json_request_handler class MediaConfigResource(Resource):