Limit the svg generation by detecting svg by content

taigaio · Mar 28, 2017 · 3b61794 · 3b61794
1 parent 84dfbbd
commit 3b61794
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 5 deletions.
diff --git a/requirements.txt b/requirements.txt
@@ -37,6 +37,7 @@ netaddr==0.7.19
 serpy==0.1.1
 psd-tools==1.4
 CairoSVG==2.0.1
+python-magic==0.4.13
 cryptography==1.7.1
 PyJWT==1.4.2
 asana==0.6.2
diff --git a/taiga/base/utils/thumbnails.py b/taiga/base/utils/thumbnails.py
@@ -33,17 +33,20 @@
 # SVG thumbnail generator
 try:
     from cairosvg.surface import PNGSurface
+    import magic
 
-    def _accept(prefix):
-        return "svg" in str(prefix.lower())
+    def svg_image_factory(fp, filename):
+        mime_type = magic.from_buffer(fp.read(1024), mime=True)
+        if mime_type != "image/svg+xml":
+            raise TypeError
 
-    def svg_image_factory(data, *args):
-        png_data = PNGSurface.convert(data.read())
+        fp.seek(0)
+        png_data = PNGSurface.convert(fp.read())
         return PngImageFile(BytesIO(png_data))
 
     Image.register_mime("SVG", "image/svg+xml")
     Image.register_extension("SVG", ".svg")
-    Image.register_open("SVG", svg_image_factory, _accept)
+    Image.register_open("SVG", svg_image_factory)
 except Exception:
     pass