1077 Set 4MB size limit for images

src/main/java/ai/elimu/util/ImageHelper.java

@@ -13,7 +13,9 @@
 public class ImageHelper {
 
     public static final int MINIMUM_WIDTH = 640;
-
+
+    public static final int MAX_BYTE_SIZE = 4194304; // 4MB
+
     private static Logger logger = LogManager.getLogger();
 
     /** 

src/main/java/ai/elimu/web/content/multimedia/image/ImageComponent.java

@@ -0,0 +1,76 @@
+package ai.elimu.web.content.multimedia.image;
+
+import ai.elimu.model.content.multimedia.Image;
+import ai.elimu.model.v2.enums.content.ImageFormat;
+import ai.elimu.util.ImageHelper;
+import org.apache.logging.log4j.LogManager;
+import org.apache.logging.log4j.Logger;
+import org.springframework.stereotype.Component;
+import org.springframework.validation.BindingResult;
+import org.springframework.web.multipart.MultipartFile;
+
+import java.io.IOException;
+import java.util.Arrays;
+
+import static ai.elimu.util.ImageHelper.MAX_BYTE_SIZE;
+
+@Component
+public class ImageComponent {
+
+    private final Logger logger = LogManager.getLogger();
+
+    public void validImageTypeAndSize(MultipartFile multipartFile, BindingResult result, Image image) {
+        try {
+            byte[] bytes = multipartFile.getBytes();
+            if (multipartFile.isEmpty() || (bytes == null) || (bytes.length == 0)) {
+                result.rejectValue("bytes", "NotNull");
+            } else {
+                String originalFileName = multipartFile.getOriginalFilename();
+                logger.info("originalFileName: " + originalFileName);
+
+                byte[] headerBytes = Arrays.copyOfRange(bytes, 0, 6);
+                byte[] gifHeader87a = {71, 73, 70, 56, 55, 97}; // "GIF87a"
+                byte[] gifHeader89a = {71, 73, 70, 56, 57, 97}; // "GIF89a"
+                if (Arrays.equals(gifHeader87a, headerBytes) || Arrays.equals(gifHeader89a, headerBytes)) {
+                    image.setImageFormat(ImageFormat.GIF);
+                } else if (originalFileName.toLowerCase().endsWith(".png")) {
+                    image.setImageFormat(ImageFormat.PNG);
+                } else if (originalFileName.toLowerCase().endsWith(".jpg") || originalFileName.toLowerCase().endsWith(".jpeg")) {
+                    image.setImageFormat(ImageFormat.JPG);
+                } else if (originalFileName.toLowerCase().endsWith(".gif")) {
+                    image.setImageFormat(ImageFormat.GIF);
+                } else {
+                    result.rejectValue("bytes", "typeMismatch");
+                }
+
+                if (image.getImageFormat() != null) {
+                    String contentType = multipartFile.getContentType();
+                    logger.info("contentType: " + contentType);
+                    image.setContentType(contentType);
+
+                    image.setBytes(bytes);
+
+                    if (image.getImageFormat() != ImageFormat.GIF) {
+                        int width = ImageHelper.getWidth(bytes);
+                        logger.info("width: " + width + "px");
+
+                        if (width < ImageHelper.MINIMUM_WIDTH) {
+                            result.rejectValue("bytes", "image.too.small");
+                            image.setBytes(null);
+                        } else if (width > ImageHelper.MINIMUM_WIDTH){
+                            bytes = ImageHelper.scaleImage(bytes, ImageHelper.MINIMUM_WIDTH);
+                            image.setBytes(bytes);
+                        }
+                    }
+                }
+
+                if (bytes.length > MAX_BYTE_SIZE) {
+                    result.rejectValue("bytes", "file.size.too.big");
+                }
+            }
+        } catch (IOException e) {
+            logger.error(e);
+        }
+    }
+
+}

src/main/java/ai/elimu/web/content/multimedia/image/ImageCreateController.java

@@ -1,7 +1,7 @@
 package ai.elimu.web.content.multimedia.image;
 
 import ai.elimu.dao.ImageContributionEventDao;
-import java.io.IOException;
+
 import java.util.Calendar;
 import java.util.HashSet;
 import java.util.Set;
@@ -18,14 +18,12 @@
 import ai.elimu.model.contributor.ImageContributionEvent;
 import ai.elimu.model.enums.ContentLicense;
 import ai.elimu.model.enums.Platform;
-import ai.elimu.model.v2.enums.content.ImageFormat;
 import ai.elimu.model.v2.enums.content.LiteracySkill;
 import ai.elimu.model.v2.enums.content.NumeracySkill;
 import ai.elimu.util.DiscordHelper;
 import ai.elimu.util.ImageColorHelper;
-import ai.elimu.util.ImageHelper;
 import ai.elimu.web.context.EnvironmentContextLoaderListener;
-import java.util.Arrays;
+
 import javax.servlet.http.HttpSession;
 import org.apache.logging.log4j.LogManager;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -55,6 +53,9 @@
     @Autowired
     private WordDao wordDao;
 
+    @Autowired
+    private ImageComponent imageComponent;
+
     @RequestMapping(method = RequestMethod.GET)
     public String handleRequest(Model model) {
     	logger.info("handleRequest");
@@ -87,57 +88,9 @@
                 result.rejectValue("title", "NonUnique");
             }
         }
-
-        try {
-            byte[] bytes = multipartFile.getBytes();
-            if (multipartFile.isEmpty() || (bytes == null) || (bytes.length == 0)) {
-                result.rejectValue("bytes", "NotNull");
-            } else {
-                String originalFileName = multipartFile.getOriginalFilename();
-                logger.info("originalFileName: " + originalFileName);
-
-                byte[] headerBytes = Arrays.copyOfRange(bytes, 0, 6);
-                byte[] gifHeader87a = {71, 73, 70, 56, 55, 97}; // "GIF87a"
-                byte[] gifHeader89a = {71, 73, 70, 56, 57, 97}; // "GIF89a"
-                if (Arrays.equals(gifHeader87a, headerBytes) || Arrays.equals(gifHeader89a, headerBytes)) {
-                    image.setImageFormat(ImageFormat.GIF);
-                } else if (originalFileName.toLowerCase().endsWith(".png")) {
-                    image.setImageFormat(ImageFormat.PNG);
-                } else if (originalFileName.toLowerCase().endsWith(".jpg") || originalFileName.toLowerCase().endsWith(".jpeg")) {
-                    image.setImageFormat(ImageFormat.JPG);
-                } else if (originalFileName.toLowerCase().endsWith(".gif")) {
-                    image.setImageFormat(ImageFormat.GIF);
-                } else {
-                    result.rejectValue("bytes", "typeMismatch");
-                }
 
-                if (image.getImageFormat() != null) {
-                    String contentType = multipartFile.getContentType();
-                    logger.info("contentType: " + contentType);
-                    image.setContentType(contentType);
+        imageComponent.validImageTypeAndSize(multipartFile, result, image);
 
-                    image.setBytes(bytes);
-
-                    if (image.getImageFormat() != ImageFormat.GIF) {
-                        int width = ImageHelper.getWidth(bytes);
-                        logger.info("width: " + width + "px");
-
-                        if (width < ImageHelper.MINIMUM_WIDTH) {
-                            result.rejectValue("bytes", "image.too.small");
-                            image.setBytes(null);
-                        } else {
-                            if (width > ImageHelper.MINIMUM_WIDTH) {
-                                bytes = ImageHelper.scaleImage(bytes, ImageHelper.MINIMUM_WIDTH);
-                                image.setBytes(bytes);
-                            }
-                        }
-                    }
-                }
-            }
-        } catch (IOException e) {
-            logger.error(e);
-        }
-
         if (result.hasErrors()) {
             model.addAttribute("contentLicenses", ContentLicense.values());
             model.addAttribute("literacySkills", LiteracySkill.values());

src/main/java/ai/elimu/web/content/multimedia/image/ImageEditController.java

@@ -1,6 +1,5 @@
 package ai.elimu.web.content.multimedia.image;
 
-import java.io.IOException;
 import java.util.Calendar;
 import java.util.Iterator;
 import java.util.Set;
@@ -26,13 +25,11 @@
 import ai.elimu.model.contributor.ImageContributionEvent;
 import ai.elimu.model.enums.ContentLicense;
 import ai.elimu.model.enums.Platform;
-import ai.elimu.model.v2.enums.content.ImageFormat;
 import ai.elimu.model.v2.enums.content.LiteracySkill;
 import ai.elimu.model.v2.enums.content.NumeracySkill;
 import ai.elimu.util.DiscordHelper;
-import ai.elimu.util.ImageHelper;
 import ai.elimu.web.context.EnvironmentContextLoaderListener;
-import java.util.Arrays;
+
 import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
@@ -79,6 +76,9 @@
     @Autowired
     private AudioDao audioDao;
 
+    @Autowired
+    private ImageComponent imageComponent;
+
     @RequestMapping(value = "/{id}", method = RequestMethod.GET)
     public String handleRequest(
             Model model, 
@@ -123,57 +123,9 @@
                 result.rejectValue("title", "NonUnique");
             }
         }
-
-        try {
-            byte[] bytes = multipartFile.getBytes();
-            if (multipartFile.isEmpty() || (bytes == null) || (bytes.length == 0)) {
-                result.rejectValue("bytes", "NotNull");
-            } else {
-                String originalFileName = multipartFile.getOriginalFilename();
-                logger.info("originalFileName: " + originalFileName);
-
-                byte[] headerBytes = Arrays.copyOfRange(bytes, 0, 6);
-                byte[] gifHeader87a = {71, 73, 70, 56, 55, 97}; // "GIF87a"
-                byte[] gifHeader89a = {71, 73, 70, 56, 57, 97}; // "GIF89a"
-                if (Arrays.equals(gifHeader87a, headerBytes) || Arrays.equals(gifHeader89a, headerBytes)) {
-                    image.setImageFormat(ImageFormat.GIF);
-                } else if (originalFileName.toLowerCase().endsWith(".png")) {
-                    image.setImageFormat(ImageFormat.PNG);
-                } else if (originalFileName.toLowerCase().endsWith(".jpg") || originalFileName.toLowerCase().endsWith(".jpeg")) {
-                    image.setImageFormat(ImageFormat.JPG);
-                } else if (originalFileName.toLowerCase().endsWith(".gif")) {
-                    image.setImageFormat(ImageFormat.GIF);
-                } else {
-                    result.rejectValue("bytes", "typeMismatch");
-                }
-
-                if (image.getImageFormat() != null) {
-                    String contentType = multipartFile.getContentType();
-                    logger.info("contentType: " + contentType);
-                    image.setContentType(contentType);
 
-                    image.setBytes(bytes);
+        imageComponent.validImageTypeAndSize(multipartFile, result, image);
 
-                    if (image.getImageFormat() != ImageFormat.GIF) {
-                        int width = ImageHelper.getWidth(bytes);
-                        logger.info("width: " + width + "px");
-
-                        if (width < ImageHelper.MINIMUM_WIDTH) {
-                            result.rejectValue("bytes", "image.too.small");
-                            image.setBytes(null);
-                        } else {
-                            if (width > ImageHelper.MINIMUM_WIDTH) {
-                                bytes = ImageHelper.scaleImage(bytes, ImageHelper.MINIMUM_WIDTH);
-                                image.setBytes(bytes);
-                            }
-                        }
-                    }
-                }
-            }
-        } catch (IOException e) {
-            logger.error(e);
-        }
-
         if (result.hasErrors()) {
             model.addAttribute("image", image);
             model.addAttribute("contentLicenses", ContentLicense.values());

src/main/webapp/WEB-INF/i18n/errors_en.properties

@@ -30,5 +30,6 @@ typeMismatch.thumbnail=Valid thumbnail format: PNG
 typeMismatch.java.lang.Integer={0} must be a number
 formatHint.Integer=Number (e.g. "5000")
 image.too.small=The image width must be at least 640px
+file.size.too.big=The file size is too big (max 4MB)
 emoji.unicode.version=Only emojis up to Unicode version 9
 WordSpace=Spaces are not allowed