diff options
| author | Michael Telatynski <7t3chguy@gmail.com> | 2021-05-21 17:31:59 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2021-05-21 18:31:59 +0200 |
| commit | e8ac9ac8ca18fe3456bfeba7a5883be1c991b2a6 (patch) | |
| tree | cca5f1b743efe6963679018cf940a3985631b1cf /synapse/rest/media/v1/thumbnailer.py | |
| parent | Add a test for update_presence (#10033) (diff) | |
| download | synapse-e8ac9ac8ca18fe3456bfeba7a5883be1c991b2a6.tar.xz | |
Fix /upload 500'ing when presented a very large image (#10029)
* Fix /upload 500'ing when presented a very large image Catch DecompressionBombError and re-raise as ThumbnailErrors * Set PIL's MAX_IMAGE_PIXELS to match homeserver.yaml to get it to bomb out quicker, to load less into memory in the case of super large images * Add changelog entry for 10029
Diffstat (limited to 'synapse/rest/media/v1/thumbnailer.py')
| -rw-r--r-- | synapse/rest/media/v1/thumbnailer.py | 9 |
1 files changed, 9 insertions, 0 deletions
diff --git a/synapse/rest/media/v1/thumbnailer.py b/synapse/rest/media/v1/thumbnailer.py index 37fe582390..a65e9e1802 100644 --- a/synapse/rest/media/v1/thumbnailer.py +++ b/synapse/rest/media/v1/thumbnailer.py @@ -40,6 +40,10 @@ class Thumbnailer: FORMATS = {"image/jpeg": "JPEG", "image/png": "PNG"} + @staticmethod + def set_limits(max_image_pixels: int): + Image.MAX_IMAGE_PIXELS = max_image_pixels + def __init__(self, input_path: str): try: self.image = Image.open(input_path) @@ -47,6 +51,11 @@ class Thumbnailer: # If an error occurs opening the image, a thumbnail won't be able to # be generated. raise ThumbnailError from e + except Image.DecompressionBombError as e: + # If an image decompression bomb error occurs opening the image, + # then the image exceeds the pixel limit and a thumbnail won't + # be able to be generated. + raise ThumbnailError from e self.width, self.height = self.image.size self.transpose_method = None |