Repository navigation
Conversation
|
@renefloor could this be reviewed ? using magic bytes is preferred over a potentially missing extension |
settings.gradle and pubspec.yaml conflicted on lines main has since moved past (kotlin 2.3.20, build_runner ^2.14.0), so main's lines are kept. image_cache_manager.dart reformatted with dart format. Co-Authored-By: Claude <noreply@anthropic.com>
|
|
The resizer decided whether a file could be resized from the extension of the file on disk. That extension is derived from the url, so images served from extension-less urls, or from urls whose extension does not match the payload, were never resized. It also treated any zero-prefixed binary as an ico. - Detect jpeg, png, ico, cur and webp by their magic number, reading 12 bytes instead of 8 (webp needs the RIFF/WEBP marker at offset 8). - Keep an extension fallback for formats without a signature at the start of the file, like tga, which only stores a signature in its footer. - Read the header in a helper that always closes the file handle. - Restore the trailing newline in example/android/build.gradle, which was dropped by an earlier commit in this branch. - Bump to 3.4.6 with a dated changelog entry, as CONTRIBUTING now requires. Tests: cover an image served without an extension and a non-image payload served with an image extension.
|
Pushed a follow-up on top of your merge — thanks for resolving the What changed in
Tests in Also bumped to 3.4.6 with a dated changelog entry per CONTRIBUTING, and restored the trailing newline in
|
Flutter decodes bmp and wbmp as well, so they are resizable too. Bmp has a 'BM' signature and can be detected from the content. Wbmp starts with a two byte header that is too generic to match on, so it joins tga in the extension fallback.
|
Follow-up: added bmp ( Wbmp is in Flutter's list of decodable formats, but it cannot be detected from the content: its header is Gif is intentionally left out: it is decodable, but |
Two bytes (the SOI marker) are enough to tell jpeg apart from the other formats that are checked, which is what SDWebImage and most detectors do. A file that is detected as an image but fails to decode then errors out of getImageFile, as it already did for a mislabeled extension before this change.
The extension that was passed to putFile came from the cached file path. For a url without an extension that path ends in the key itself, so the extension contained a slash and putFile failed to create the file. This is what the new test for an extension-less url caught. The resized image is always encoded as png anyway, so name it png instead of copying the extension of the url.
The resizer always re-encodes the image to png, which keeps a single frame. Now that webp is recognized by its signature, an animated webp would enter the resizer and silently lose its animation. That is the same reason gif is not recognized at all. Read the flags of the VP8X chunk, which is where an extended webp marks itself as animated, and pass those files through untouched. A static webp, with or without a VP8X chunk, is still resized.
A tga without an id field and without a colour map starts with the same four bytes as an ico or a cur, so the signatures cannot be told apart. It does not affect the result, since all of them are resizable, but it looks like a mistake without the note.
rickdijk
left a comment
There was a problem hiding this comment.
Thanks for picking this up. Detecting the format from the content is the right direction. A few things to look at before this can land; details are inline.
Two points that don't fit on a diff line:
shouldResize ignores maxHeight when maxWidth is set (existing bug, _resizeImageFile). The ternary parses as maxWidth != null ? image.width > maxWidth : (...), so the height check only runs when maxWidth is null. getImageFile(url, maxWidth: 200, maxHeight: 100) on a 150x400 image returns the 400px-tall original. It predates this PR, but since the function is being reworked anyway it would be good to fix it here:
final shouldResize = (maxWidth != null && image.width > maxWidth) ||
(maxHeight != null && image.height > maxHeight);PR description. Could you update it to the current PR template? The checklist is missing the 'Version bumped and dated CHANGELOG entry added' item and still mentions develop. main is the only branch now.
| const _imageSignatures = <List<int>>[ | ||
| [0xFF, 0xD8], // jpeg | ||
| [0x89, 0x50, 0x4E, 0x47, 0x0D, 0x0A, 0x1A, 0x0A], // png | ||
| [0x42, 0x4D], // bmp |
There was a problem hiding this comment.
The two-byte signatures (BM for bmp, FF D8 for jpeg) and 00 00 01/02 00 for ico/cur will also match files that aren't images. Such a file then goes into _decodeImage, and its error propagates out of getImageFile. Before, a file like that was returned untouched because its extension wasn't in the list. Whatever detection ends up being used, a decode failure should fall back to returning originalFile rather than erroring the stream.
| /// are resizable, and only the answer to "is this an image" is used. | ||
| const _imageSignatures = <List<int>>[ | ||
| [0xFF, 0xD8], // jpeg | ||
| [0x89, 0x50, 0x4E, 0x47, 0x0D, 0x0A, 0x1A, 0x0A], // png |
There was a problem hiding this comment.
An animated PNG (APNG) matches this signature too, so it gets resized to a single static frame. That goes against the doc on _isImage saying animated images are passed through. Only webp has an animation check.
| /// file, so the only way to recognize them is by their extension. Tga only | ||
| /// stores a signature in its footer, and wbmp starts with a two byte header | ||
| /// (`00 00`) that is too generic to match on. | ||
| const _extensionOnlyFormats = ['tga', 'wbmp']; |
There was a problem hiding this comment.
Flutter's image codecs can't decode TGA, so a .tga file (or a TGA that matches the ico/cur signature) will make _decodeImage throw instead of being resized. I'd drop tga here. The ico/cur comment above should also stop calling TGA resizable.
| /// Images that would lose something when they are re-encoded as png, such as | ||
| /// an animated gif or an animated webp, are not considered an image here, so | ||
| /// they are passed through untouched. | ||
| Future<bool> _isImage(File file) async { |
There was a problem hiding this comment.
Rather than keeping a table of magic numbers plus a webp-only animation check, could we let the engine decide? For example, ui.ImmutableBuffer.fromUint8List + ui.ImageDescriptor.encoded, or ui.instantiateImageCodec: return the original when decoding fails or frameCount > 1, and resize otherwise. That covers every format the engine supports (including platform ones like HEIF) and every animated format (gif, APNG, animated webp), with no list to maintain.
| maxAge: maxAge, | ||
| fileExtension: fileExtension, | ||
| // The resized image is always encoded as png. The extension of the | ||
| // original file cannot be used: it is derived from the url, so it can |
There was a problem hiding this comment.
The stored file's extension doesn't come from the url. WebHelper._setDataFromHeaders builds the path from the response's Content-Type (response.fileExtension). The real failure case is a non-image Content-Type, e.g. application/octet-stream -> .bin. Could you fix this comment and the CHANGELOG wording to match? Storing as .png is correct, since the output is png-encoded.
| @@ -7,6 +7,32 @@ import 'package:flutter/widgets.dart'; | |||
| import 'package:flutter_cache_manager/flutter_cache_manager.dart'; | |||
|
|
|||
| const supportedFileNames = ['jpg', 'jpeg', 'png', 'tga', 'cur', 'ico']; | |||
There was a problem hiding this comment.
supportedFileNames is exported publicly, but nothing uses it anymore and it no longer reflects what gets resized (no webp or bmp). Removing it would be breaking, so maybe mark it @Deprecated with a note that detection is now content-based?
| }); | ||
| }); | ||
|
|
||
| group('Test image detection', () { |
There was a problem hiding this comment.
Could you add tests for the new formats too: resizing a static webp and a bmp, checking that the resized file is stored with a .png extension, and that a file that fails to decode is returned untouched? Also note that the 'without file extension' case sets the file name directly, so it doesn't go through the Content-Type path where the real issue occurs.
✨ What kind of change does this PR introduce? (Bug fix, feature, docs update...)
Bug fix.
When the http response's Content-Type is not image and the _resizeimage is not work.
🆕 What is the new behavior (if this is a feature change)?
The new method is get files extension with the file's binary data.
💥 Does this PR introduce a breaking change?
No.
🐛 Recommendations for testing
📝 Links to relevant issues/docs
🤔 Checklist before submitting