mraible commented on code in PR #315:
URL: https://github.com/apache/roller/pull/315#discussion_r4609097959


##########
app/src/main/java/org/apache/roller/weblogger/business/jpa/JPAMediaFileManagerImpl.java:
##########
@@ -252,20 +260,65 @@ public void createThemeMediaFile(Weblog weblog, MediaFile 
mediaFile,
         }
     }
 
+    /**
+     * Record the image's size and save a thumbnail of it. The size is read
+     * from the image header first; images with more pixels than
+     * uploads.thumbnail.maxPixels are left without a thumbnail rather than
+     * decoded, and the rest are decoded subsampled to near thumbnail size.
+     * Content that no image reader recognizes gets no thumbnail, whatever
+     * content type the client sent.
+     */
     private void updateThumbnail(MediaFile mediaFile) {
         try {
             FileContentManager cmgr = WebloggerFactory.getWeblogger()
                     .getFileContentManager();
             FileContent fc = cmgr.getFileContent(mediaFile.getWeblog(),
                     mediaFile.getId());
+            int maxPixels = WebloggerConfig.getIntProperty(
+                    THUMBNAIL_MAX_PIXELS_PROPERTY, 
DEFAULT_THUMBNAIL_MAX_PIXELS);
             BufferedImage img;
 
-            img = ImageIO.read(fc.getInputStream());
+            try (InputStream in = fc.getInputStream();
+                 ImageInputStream iis = ImageIO.createImageInputStream(in)) {
+                Iterator<ImageReader> readers = iis == null
+                        ? null : ImageIO.getImageReaders(iis);
+                if (readers == null || !readers.hasNext()) {
+                    log.debug("No image reader for media file "
+                            + mediaFile.getId() + ", not creating a 
thumbnail");
+                    return;
+                }
+                ImageReader reader = readers.next();
+                try {
+                    reader.setInput(iis, true, true);
+                    int width = reader.getWidth(0);
+                    int height = reader.getHeight(0);
+                    if (width <= 0 || height <= 0
+                            || (long) width * height > maxPixels) {
+                        log.info("Not creating a thumbnail for media file "
+                                + mediaFile.getId() + " (" + width + "x"
+                                + height + "), it is larger than "
+                                + THUMBNAIL_MAX_PIXELS_PROPERTY + "="
+                                + maxPixels + " pixels");
+                        return;

Review Comment:
   Fixed in 9754f6b4d: when new content gets no thumbnail (over the pixel 
limit, unreadable, or a decode error), any _sm file left from the previous 
content is now deleted. testReplacingWithHugeImageRemovesOldThumbnail uploads a 
normal image, replaces it with an over-limit PNG through updateMediaFile(), and 
checks after reload that no thumbnail is returned.



##########
app/src/main/java/org/apache/roller/weblogger/business/jpa/JPAMediaFileManagerImpl.java:
##########
@@ -252,20 +260,65 @@ public void createThemeMediaFile(Weblog weblog, MediaFile 
mediaFile,
         }
     }
 
+    /**
+     * Record the image's size and save a thumbnail of it. The size is read
+     * from the image header first; images with more pixels than
+     * uploads.thumbnail.maxPixels are left without a thumbnail rather than
+     * decoded, and the rest are decoded subsampled to near thumbnail size.
+     * Content that no image reader recognizes gets no thumbnail, whatever
+     * content type the client sent.
+     */
     private void updateThumbnail(MediaFile mediaFile) {
         try {
             FileContentManager cmgr = WebloggerFactory.getWeblogger()
                     .getFileContentManager();
             FileContent fc = cmgr.getFileContent(mediaFile.getWeblog(),
                     mediaFile.getId());
+            int maxPixels = WebloggerConfig.getIntProperty(
+                    THUMBNAIL_MAX_PIXELS_PROPERTY, 
DEFAULT_THUMBNAIL_MAX_PIXELS);
             BufferedImage img;
 
-            img = ImageIO.read(fc.getInputStream());
+            try (InputStream in = fc.getInputStream();
+                 ImageInputStream iis = ImageIO.createImageInputStream(in)) {
+                Iterator<ImageReader> readers = iis == null
+                        ? null : ImageIO.getImageReaders(iis);
+                if (readers == null || !readers.hasNext()) {
+                    log.debug("No image reader for media file "
+                            + mediaFile.getId() + ", not creating a 
thumbnail");
+                    return;
+                }
+                ImageReader reader = readers.next();
+                try {
+                    reader.setInput(iis, true, true);
+                    int width = reader.getWidth(0);
+                    int height = reader.getHeight(0);
+                    if (width <= 0 || height <= 0
+                            || (long) width * height > maxPixels) {
+                        log.info("Not creating a thumbnail for media file "
+                                + mediaFile.getId() + " (" + width + "x"
+                                + height + "), it is larger than "
+                                + THUMBNAIL_MAX_PIXELS_PROPERTY + "="
+                                + maxPixels + " pixels");
+                        return;
+                    }
 
-            // determine and save width and height
-            mediaFile.setWidth(img.getWidth());
-            mediaFile.setHeight(img.getHeight());
-            strategy.store(mediaFile);
+                    // determine and save width and height

Review Comment:
   Fixed in 9754f6b4d: the header's width and height are stored before the 
pixel-limit check, so an over-limit image keeps its real size. The tests now 
check 50000 x 50000 for a new huge upload and for a replacement, and 500 x 373 
when a lower configured limit skips the thumbnail.



##########
app/src/main/java/org/apache/roller/weblogger/business/jpa/JPAMediaFileManagerImpl.java:
##########
@@ -252,20 +260,65 @@ public void createThemeMediaFile(Weblog weblog, MediaFile 
mediaFile,
         }
     }
 
+    /**
+     * Record the image's size and save a thumbnail of it. The size is read
+     * from the image header first; images with more pixels than
+     * uploads.thumbnail.maxPixels are left without a thumbnail rather than
+     * decoded, and the rest are decoded subsampled to near thumbnail size.
+     * Content that no image reader recognizes gets no thumbnail, whatever
+     * content type the client sent.
+     */
     private void updateThumbnail(MediaFile mediaFile) {
         try {
             FileContentManager cmgr = WebloggerFactory.getWeblogger()
                     .getFileContentManager();
             FileContent fc = cmgr.getFileContent(mediaFile.getWeblog(),
                     mediaFile.getId());
+            int maxPixels = WebloggerConfig.getIntProperty(
+                    THUMBNAIL_MAX_PIXELS_PROPERTY, 
DEFAULT_THUMBNAIL_MAX_PIXELS);
             BufferedImage img;
 
-            img = ImageIO.read(fc.getInputStream());
+            try (InputStream in = fc.getInputStream();
+                 ImageInputStream iis = ImageIO.createImageInputStream(in)) {
+                Iterator<ImageReader> readers = iis == null
+                        ? null : ImageIO.getImageReaders(iis);
+                if (readers == null || !readers.hasNext()) {
+                    log.debug("No image reader for media file "
+                            + mediaFile.getId() + ", not creating a 
thumbnail");
+                    return;
+                }
+                ImageReader reader = readers.next();
+                try {
+                    reader.setInput(iis, true, true);
+                    int width = reader.getWidth(0);
+                    int height = reader.getHeight(0);
+                    if (width <= 0 || height <= 0

Review Comment:
   Fixed in 9754f6b4d: a t=true request for an image over 
uploads.thumbnail.maxPixels that has no _sm file now gets a 404 (checked before 
the 304 handling), so the media library and chooser cards fall back to their 
data-fallback-icon file icon. Other images without a thumbnail, such as formats 
ImageIO can't read, still get the original as before so existing entries aren't 
broken. The upload result page renders the file icon directly for these images, 
and inserting one into an entry uses its full URL instead of ?t=true. 
MediaResourceThumbnailTest covers the servlet path.



-- 
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.

To unsubscribe, e-mail: [email protected]

For queries about this service, please contact Infrastructure at:
[email protected]

Reply via email to