diff options
| author | Matthew Hodgson <matthew@matrix.org> | 2016-04-14 14:39:24 +0100 |
|---|---|---|
| committer | Matthew Hodgson <matthew@matrix.org> | 2016-04-14 14:39:24 +0100 |
| commit | bd77216d06518ace2ec6213aa0ac0c834e923456 (patch) | |
| tree | 6ac277432142f2a0f8f00e7850a32eb07249bbfd /synapse/rest/media/v1/thumbnail_resource.py | |
| parent | Merge pull request #726 from matrix-org/erikj/push_metric (diff) | |
| download | synapse-bd77216d06518ace2ec6213aa0ac0c834e923456.tar.xz | |
comment out 2c838f6459db35ad9812a83184d85a06ca5d940a due to risk of https://en.wikipedia.org/wiki/Billion_laughs attacks - thanks @torhve
Diffstat (limited to 'synapse/rest/media/v1/thumbnail_resource.py')
| -rw-r--r-- | synapse/rest/media/v1/thumbnail_resource.py | 32 |
1 files changed, 16 insertions, 16 deletions
diff --git a/synapse/rest/media/v1/thumbnail_resource.py b/synapse/rest/media/v1/thumbnail_resource.py index 513b445688..40ef22459c 100644 --- a/synapse/rest/media/v1/thumbnail_resource.py +++ b/synapse/rest/media/v1/thumbnail_resource.py @@ -72,10 +72,10 @@ class ThumbnailResource(BaseMediaResource): self._respond_404(request) return - if media_info["media_type"] == "image/svg+xml": - file_path = self.filepaths.local_media_filepath(media_id) - yield self._respond_with_file(request, media_info["media_type"], file_path) - return + # if media_info["media_type"] == "image/svg+xml": + # file_path = self.filepaths.local_media_filepath(media_id) + # yield self._respond_with_file(request, media_info["media_type"], file_path) + # return thumbnail_infos = yield self.store.get_local_media_thumbnails(media_id) @@ -108,10 +108,10 @@ class ThumbnailResource(BaseMediaResource): self._respond_404(request) return - if media_info["media_type"] == "image/svg+xml": - file_path = self.filepaths.local_media_filepath(media_id) - yield self._respond_with_file(request, media_info["media_type"], file_path) - return + # if media_info["media_type"] == "image/svg+xml": + # file_path = self.filepaths.local_media_filepath(media_id) + # yield self._respond_with_file(request, media_info["media_type"], file_path) + # return thumbnail_infos = yield self.store.get_local_media_thumbnails(media_id) for info in thumbnail_infos: @@ -148,10 +148,10 @@ class ThumbnailResource(BaseMediaResource): desired_method, desired_type): media_info = yield self._get_remote_media(server_name, media_id) - if media_info["media_type"] == "image/svg+xml": - file_path = self.filepaths.remote_media_filepath(server_name, media_id) - yield self._respond_with_file(request, media_info["media_type"], file_path) - return + # if media_info["media_type"] == "image/svg+xml": + # file_path = self.filepaths.remote_media_filepath(server_name, media_id) + # yield self._respond_with_file(request, media_info["media_type"], file_path) + # return thumbnail_infos = yield self.store.get_remote_media_thumbnails( server_name, media_id, @@ -196,10 +196,10 @@ class ThumbnailResource(BaseMediaResource): # We should proxy the thumbnail from the remote server instead. media_info = yield self._get_remote_media(server_name, media_id) - if media_info["media_type"] == "image/svg+xml": - file_path = self.filepaths.remote_media_filepath(server_name, media_id) - yield self._respond_with_file(request, media_info["media_type"], file_path) - return + # if media_info["media_type"] == "image/svg+xml": + # file_path = self.filepaths.remote_media_filepath(server_name, media_id) + # yield self._respond_with_file(request, media_info["media_type"], file_path) + # return thumbnail_infos = yield self.store.get_remote_media_thumbnails( server_name, media_id, |