]> cat aescling's git repositories - mastodon.git/commitdiff
Fix image uploads being perfectly white when canvas read access is blocked (#11499)
authorThibG <thib@sitedethib.com>
Tue, 6 Aug 2019 10:08:19 +0000 (12:08 +0200)
committerEugen Rochko <eugen@zeonfederated.com>
Tue, 6 Aug 2019 10:08:19 +0000 (12:08 +0200)
Fixes #11496

app/javascript/mastodon/utils/resize_image.js

index bbdbc865e9ede08f8ff823c321beb18a7adb4ba1..a8ec5f3fa767286042c9da1084dca64e960584af 100644 (file)
@@ -67,6 +67,14 @@ const processImage = (img, { width, height, orientation, type = 'image/png' }) =
 
   context.drawImage(img, 0, 0, width, height);
 
+  // The Tor Browser and maybe other browsers may prevent reading from canvas
+  // and return an all-white image instead. Assume reading failed if the resized
+  // image is perfectly white.
+  const imageData = context.getImageData(0, 0, width, height);
+  if (imageData.every(value => value === 255)) {
+    throw 'Failed to read from canvas';
+  }
+
   canvas.toBlob(resolve, type);
 });