Matrix-Mirrors/anonymousland-synapse
1
0
Fork 0
mirror of https://git.anonymousland.org/anonymousland/synapse.git synced 2025-07-31 12:48:39 -04:00
Code Issues Projects Releases Packages Wiki Activity

Limit the size of images that are thumbnailed serverside. Limit the size of file that a server will download from a remote server

Browse source
This commit is contained in:
Mark Haines 2014-12-11 14:19:32 +00:00
parent ead8fc5e38
commit d80d505b1f
4 changed files with 43 additions and 6 deletions
Download patch file Download diff file Expand all files Collapse all files

18
synapse/media/v1/base_resource.py
View file

@ -43,6 +43,7 @@ class BaseMediaResource(Resource):
self.server_name = hs.hostname
self.store = hs.get_datastore()
self.max_upload_size = hs.config.max_upload_size
self.max_image_pixels = hs.config.max_image_pixels
self.filepaths = filepaths
@staticmethod
@ -143,6 +144,7 @@ class BaseMediaResource(Resource):
))
length, headers = yield self.client.get_file(
server_name, request_path, output_stream=f,
max_size=self.max_upload_size,
)
media_type = headers["Content-Type"][0]
time_now_ms = self.clock.time_msec()
@ -226,6 +228,14 @@ class BaseMediaResource(Resource):
thumbnailer = Thumbnailer(input_path)
m_width = thumbnailer.width
m_height = thumbnailer.height
if m_width * m_height >= self.max_image_pixels:
logger.info(
"Image too large to thumbnail %r x %r > %r"
m_width, m_height, self.max_image_pixels
)
return
scales = set()
crops = set()
for r_width, r_height, r_method, r_type in requirements:
@ -281,6 +291,14 @@ class BaseMediaResource(Resource):
thumbnailer = Thumbnailer(input_path)
m_width = thumbnailer.width
m_height = thumbnailer.height
if m_width * m_height >= self.max_image_pixels:
logger.info(
"Image too large to thumbnail %r x %r > %r"
m_width, m_height, self.max_image_pixels
)
return
scales = set()
crops = set()
for r_width, r_height, r_method, r_type in requirements: