diff options
| author | Shay <hillerys@element.io> | 2024-06-05 05:43:36 -0700 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2024-06-05 13:43:36 +0100 |
| commit | fcbc79bb87d08147e86dafa0fee5a9aec4d3fc23 (patch) | |
| tree | 5d5efc029b3410f96ce9aa5dc49b55e7ef4755c5 /synapse/rest | |
| parent | Handle hyphens in user dir search porperly (#17254) (diff) | |
| download | synapse-fcbc79bb87d08147e86dafa0fee5a9aec4d3fc23.tar.xz | |
Ratelimiting of remote media downloads (#17256)
Diffstat (limited to 'synapse/rest')
| -rw-r--r-- | synapse/rest/client/media.py | 2 | ||||
| -rw-r--r-- | synapse/rest/media/download_resource.py | 8 | ||||
| -rw-r--r-- | synapse/rest/media/thumbnail_resource.py | 2 |
3 files changed, 11 insertions, 1 deletions
diff --git a/synapse/rest/client/media.py b/synapse/rest/client/media.py index 172d240783..0c089163c1 100644 --- a/synapse/rest/client/media.py +++ b/synapse/rest/client/media.py @@ -174,6 +174,7 @@ class UnstableThumbnailResource(RestServlet): respond_404(request) return + ip_address = request.getClientAddress().host remote_resp_function = ( self.thumbnailer.select_or_generate_remote_thumbnail if self.dynamic_thumbnails @@ -188,6 +189,7 @@ class UnstableThumbnailResource(RestServlet): method, m_type, max_timeout_ms, + ip_address, ) self.media_repo.mark_recently_accessed(server_name, media_id) diff --git a/synapse/rest/media/download_resource.py b/synapse/rest/media/download_resource.py index 8ba723c8d4..1628d58926 100644 --- a/synapse/rest/media/download_resource.py +++ b/synapse/rest/media/download_resource.py @@ -97,6 +97,12 @@ class DownloadResource(RestServlet): respond_404(request) return + ip_address = request.getClientAddress().host await self.media_repo.get_remote_media( - request, server_name, media_id, file_name, max_timeout_ms + request, + server_name, + media_id, + file_name, + max_timeout_ms, + ip_address, ) diff --git a/synapse/rest/media/thumbnail_resource.py b/synapse/rest/media/thumbnail_resource.py index fe8fbb06e4..ce511c6dce 100644 --- a/synapse/rest/media/thumbnail_resource.py +++ b/synapse/rest/media/thumbnail_resource.py @@ -104,6 +104,7 @@ class ThumbnailResource(RestServlet): respond_404(request) return + ip_address = request.getClientAddress().host remote_resp_function = ( self.thumbnail_provider.select_or_generate_remote_thumbnail if self.dynamic_thumbnails @@ -118,5 +119,6 @@ class ThumbnailResource(RestServlet): method, m_type, max_timeout_ms, + ip_address, ) self.media_repo.mark_recently_accessed(server_name, media_id) |