From c06b1cb0714a0d82d8e3540d4622700f7829685a Mon Sep 17 00:00:00 2001 From: Will Hunt Date: Wed, 20 Jun 2018 17:25:51 +0100 Subject: Update and rename limits_resource.py to config_resource.py --- synapse/rest/media/v1/config_resource.py | 37 ++++++++++++++++++++++++++++++++ 1 file changed, 37 insertions(+) create mode 100644 synapse/rest/media/v1/config_resource.py (limited to 'synapse/rest/media/v1/config_resource.py') diff --git a/synapse/rest/media/v1/config_resource.py b/synapse/rest/media/v1/config_resource.py new file mode 100644 index 0000000000..5b1e534823 --- /dev/null +++ b/synapse/rest/media/v1/config_resource.py @@ -0,0 +1,37 @@ +# -*- coding: utf-8 -*- +# Copyright 2018 Will Hunt +# +# Licensed under the Apache License, Version 2.0 (the "License"); +# you may not use this file except in compliance with the License. +# You may obtain a copy of the License at +# +# http://www.apache.org/licenses/LICENSE-2.0 +# +# Unless required by applicable law or agreed to in writing, software +# distributed under the License is distributed on an "AS IS" BASIS, +# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +# See the License for the specific language governing permissions and +# limitations under the License. +# +from twisted.web.server import NOT_DONE_YET +from twisted.web.resource import Resource +from synapse.http.server import respond_with_json, respond_with_json_bytes + + +class MediaConfigResource(Resource): + isLeaf = True + + def __init__(self, hs): + Resource.__init__(self) + config = hs.get_config() + self.limits_dict = { + "upload_size": config.max_upload_size, + } + + def render_GET(self, request): + respond_with_json(request, 200, self.limits_dict, send_cors=True) + return NOT_DONE_YET + + def render_OPTIONS(self, request): + respond_with_json_bytes(request, 200, {}, send_cors=True) + return NOT_DONE_YET -- cgit 1.5.1 From 1d53129fa3525a59c231f2de50b9e12cc5ce60ad Mon Sep 17 00:00:00 2001 From: Will Hunt Date: Thu, 21 Jun 2018 11:05:05 +0100 Subject: upload_size => m.upload.size --- synapse/rest/media/v1/config_resource.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'synapse/rest/media/v1/config_resource.py') diff --git a/synapse/rest/media/v1/config_resource.py b/synapse/rest/media/v1/config_resource.py index 5b1e534823..3fd0288425 100644 --- a/synapse/rest/media/v1/config_resource.py +++ b/synapse/rest/media/v1/config_resource.py @@ -25,7 +25,7 @@ class MediaConfigResource(Resource): Resource.__init__(self) config = hs.get_config() self.limits_dict = { - "upload_size": config.max_upload_size, + "m.upload.size": config.max_upload_size, } def render_GET(self, request): -- cgit 1.5.1 From 3f520b20bd8fb22d82fc9249344fece8b5e314ad Mon Sep 17 00:00:00 2001 From: Will Hunt Date: Wed, 18 Jul 2018 14:22:21 +0100 Subject: wrapped --- synapse/rest/media/v1/config_resource.py | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) (limited to 'synapse/rest/media/v1/config_resource.py') diff --git a/synapse/rest/media/v1/config_resource.py b/synapse/rest/media/v1/config_resource.py index 3fd0288425..2272e35b0c 100644 --- a/synapse/rest/media/v1/config_resource.py +++ b/synapse/rest/media/v1/config_resource.py @@ -15,7 +15,7 @@ # from twisted.web.server import NOT_DONE_YET from twisted.web.resource import Resource -from synapse.http.server import respond_with_json, respond_with_json_bytes +from synapse.http.server import respond_with_json, respond_with_json_bytes, wrap_json_request_handler class MediaConfigResource(Resource): @@ -28,6 +28,7 @@ class MediaConfigResource(Resource): "m.upload.size": config.max_upload_size, } + @wrap_json_request_handler def render_GET(self, request): respond_with_json(request, 200, self.limits_dict, send_cors=True) return NOT_DONE_YET -- cgit 1.5.1 From 8cc46ed4a6ec2fe82678f94fd908b9a711372d76 Mon Sep 17 00:00:00 2001 From: Will Hunt Date: Fri, 27 Jul 2018 12:01:13 +0100 Subject: wrap_json_request_handlering --- synapse/rest/media/v1/config_resource.py | 18 ++++++++++++------ 1 file changed, 12 insertions(+), 6 deletions(-) (limited to 'synapse/rest/media/v1/config_resource.py') diff --git a/synapse/rest/media/v1/config_resource.py b/synapse/rest/media/v1/config_resource.py index 2272e35b0c..c53ba28540 100644 --- a/synapse/rest/media/v1/config_resource.py +++ b/synapse/rest/media/v1/config_resource.py @@ -13,9 +13,11 @@ # See the License for the specific language governing permissions and # limitations under the License. # -from twisted.web.server import NOT_DONE_YET + +from twisted.internet import defer from twisted.web.resource import Resource -from synapse.http.server import respond_with_json, respond_with_json_bytes, wrap_json_request_handler +from twisted.web.server import NOT_DONE_YET +from synapse.http.server import respond_with_json, wrap_json_request_handler class MediaConfigResource(Resource): @@ -24,15 +26,19 @@ class MediaConfigResource(Resource): def __init__(self, hs): Resource.__init__(self) config = hs.get_config() + self.clock = hs.get_clock() self.limits_dict = { "m.upload.size": config.max_upload_size, } - @wrap_json_request_handler def render_GET(self, request): - respond_with_json(request, 200, self.limits_dict, send_cors=True) + self._async_render_GET(request) return NOT_DONE_YET + @wrap_json_request_handler + def _async_render_GET(self, request): + return respond_with_json(request, 200, self.limits_dict) + def render_OPTIONS(self, request): - respond_with_json_bytes(request, 200, {}, send_cors=True) - return NOT_DONE_YET + respond_with_json(request, 200, {}, send_cors=True) + return NOT_DONE_YET \ No newline at end of file -- cgit 1.5.1 From bf13c184cdb8e44f9d5644c31d8b17b7c83dc321 Mon Sep 17 00:00:00 2001 From: Will Hunt Date: Fri, 27 Jul 2018 12:03:34 +0100 Subject: linting --- synapse/rest/media/v1/config_resource.py | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) (limited to 'synapse/rest/media/v1/config_resource.py') diff --git a/synapse/rest/media/v1/config_resource.py b/synapse/rest/media/v1/config_resource.py index c53ba28540..b1018e7067 100644 --- a/synapse/rest/media/v1/config_resource.py +++ b/synapse/rest/media/v1/config_resource.py @@ -14,7 +14,6 @@ # limitations under the License. # -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 @@ -41,4 +40,4 @@ class MediaConfigResource(Resource): def render_OPTIONS(self, request): respond_with_json(request, 200, {}, send_cors=True) - return NOT_DONE_YET \ No newline at end of file + return NOT_DONE_YET -- cgit 1.5.1 From bf30fd834229cebb547c7b09510b8990b638afea Mon Sep 17 00:00:00 2001 From: Will Hunt Date: Fri, 27 Jul 2018 12:17:40 +0100 Subject: Auth media/r0/config --- synapse/rest/media/v1/config_resource.py | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) (limited to 'synapse/rest/media/v1/config_resource.py') diff --git a/synapse/rest/media/v1/config_resource.py b/synapse/rest/media/v1/config_resource.py index b1018e7067..44d3d567aa 100644 --- a/synapse/rest/media/v1/config_resource.py +++ b/synapse/rest/media/v1/config_resource.py @@ -14,6 +14,7 @@ # limitations under the License. # +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 @@ -26,6 +27,7 @@ class MediaConfigResource(Resource): Resource.__init__(self) config = hs.get_config() self.clock = hs.get_clock() + self.auth = hs.get_auth() self.limits_dict = { "m.upload.size": config.max_upload_size, } @@ -35,8 +37,10 @@ class MediaConfigResource(Resource): return NOT_DONE_YET @wrap_json_request_handler + @defer.inlineCallbacks def _async_render_GET(self, request): - return respond_with_json(request, 200, self.limits_dict) + yield self.auth.get_user_by_req(request) + respond_with_json(request, 200, self.limits_dict) def render_OPTIONS(self, request): respond_with_json(request, 200, {}, send_cors=True) -- cgit 1.5.1 From 0f6e583e6ff598deab41976d16f7ca9eaa97fbd3 Mon Sep 17 00:00:00 2001 From: Will Hunt Date: Fri, 27 Jul 2018 12:28:08 +0100 Subject: isorted this mess --- synapse/rest/media/v1/config_resource.py | 1 + synapse/rest/media/v1/media_repository.py | 2 +- 2 files changed, 2 insertions(+), 1 deletion(-) (limited to 'synapse/rest/media/v1/config_resource.py') diff --git a/synapse/rest/media/v1/config_resource.py b/synapse/rest/media/v1/config_resource.py index 44d3d567aa..d6605b6027 100644 --- a/synapse/rest/media/v1/config_resource.py +++ b/synapse/rest/media/v1/config_resource.py @@ -17,6 +17,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 diff --git a/synapse/rest/media/v1/media_repository.py b/synapse/rest/media/v1/media_repository.py index 6a16f9043c..6b08f76e97 100644 --- a/synapse/rest/media/v1/media_repository.py +++ b/synapse/rest/media/v1/media_repository.py @@ -42,6 +42,7 @@ from synapse.util.retryutils import NotRetryingDestination from synapse.util.stringutils import is_ascii, random_string from ._base import FileInfo, respond_404, respond_with_responder +from .config_resource import MediaConfigResource from .download_resource import DownloadResource from .filepath import MediaFilePaths from .identicon_resource import IdenticonResource @@ -51,7 +52,6 @@ from .storage_provider import StorageProviderWrapper from .thumbnail_resource import ThumbnailResource from .thumbnailer import Thumbnailer from .upload_resource import UploadResource -from .config_resource import MediaConfigResource logger = logging.getLogger(__name__) -- cgit 1.5.1