Merge branch 'develop'

Author: Villagers654

backend/src/main/java/net/modtale/service/security/validation/FileValidationService.java

@@ -81,7 +81,7 @@ public void validateGalleryImage(MultipartFile file) {
         if (file == null || file.isEmpty()) {
             return;
         }
-        projectImageValidationService.validateImage(file, 16.0 / 9.0, "Gallery", "16:9");
+        projectImageValidationService.validateImage(file, "Gallery");
     }
 
     public static class ManifestInspection {

backend/src/main/java/net/modtale/service/security/validation/ProjectImageValidationService.java

@@ -25,7 +25,15 @@ public class ProjectImageValidationService {
     private static final Pattern SVG_WIDTH_PATTERN = Pattern.compile("width\\s*=\\s*['\"]([^'\"]+)['\"]", Pattern.CASE_INSENSITIVE);
     private static final Pattern SVG_HEIGHT_PATTERN = Pattern.compile("height\\s*=\\s*['\"]([^'\"]+)['\"]", Pattern.CASE_INSENSITIVE);
 
+    public void validateImage(MultipartFile file, String type) {
+        validateImage(file, null, type, null);
+    }
+
     public void validateImage(MultipartFile file, double targetRatio, String type, String ratioLabel) {
+        validateImage(file, Double.valueOf(targetRatio), type, ratioLabel);
+    }
+
+    private void validateImage(MultipartFile file, Double targetRatio, String type, String ratioLabel) {
         if (file.getSize() > MAX_IMAGE_FILE_SIZE) {
             throw new InvalidProjectRequestException(type + " image size must not exceed 10MB.");
         }
@@ -61,7 +69,7 @@ public void validateImage(MultipartFile file, double targetRatio, String type, S
             }
 
             double actualRatio = (double) image.getWidth() / image.getHeight();
-            if (Math.abs(actualRatio - targetRatio) > 0.05) {
+            if (targetRatio != null && Math.abs(actualRatio - targetRatio) > 0.05) {
                 throw new InvalidProjectRequestException(
                         String.format("%s image must have an aspect ratio of %s (Uploaded: %.2f).", type, ratioLabel, actualRatio)
                 );
@@ -88,7 +96,7 @@ private boolean isLikelySvg(MultipartFile file, byte[] bytes) {
         return sample.startsWith("<?xml") || sample.contains("<svg");
     }
 
-    private void validateSvgAspectRatio(byte[] bytes, String type, String ratioLabel, double targetRatio) {
+    private void validateSvgAspectRatio(byte[] bytes, String type, String ratioLabel, Double targetRatio) {
         String svgText = new String(bytes, StandardCharsets.UTF_8);
         Matcher svgTagMatcher = SVG_TAG_PATTERN.matcher(svgText);
         if (!svgTagMatcher.find()) {
@@ -122,7 +130,7 @@ private void validateSvgAspectRatio(byte[] bytes, String type, String ratioLabel
         }
 
         double actualRatio = width / height;
-        if (Math.abs(actualRatio - targetRatio) > 0.05) {
+        if (targetRatio != null && Math.abs(actualRatio - targetRatio) > 0.05) {
             throw new InvalidProjectRequestException(
                     String.format("%s image must have an aspect ratio of %s (Uploaded: %.2f).", type, ratioLabel, actualRatio)
             );

backend/src/test/java/net/modtale/service/security/validation/FileValidationServiceTest.java

@@ -1,5 +1,6 @@
 package net.modtale.service.security.validation;
 
+import java.awt.image.BufferedImage;
 import java.io.ByteArrayOutputStream;
 import java.io.IOException;
 import java.nio.charset.StandardCharsets;
@@ -8,6 +9,7 @@
 import java.util.Map;
 import java.util.zip.ZipEntry;
 import java.util.zip.ZipOutputStream;
+import javax.imageio.ImageIO;
 import org.junit.jupiter.api.Test;
 import org.springframework.mock.web.MockMultipartFile;
 import tools.jackson.databind.ObjectMapper;
@@ -149,6 +151,16 @@ void validateProjectFileRejectsNestedArchivesForArtProjects() throws IOException
         assertEquals("Security Violation: Nested archives (.zip) are not allowed in ART", error.getMessage());
     }
 
+    @Test
+    void validateGalleryImageAllowsNonSixteenByNineImages() throws IOException {
+        BufferedImage image = new BufferedImage(800, 500, BufferedImage.TYPE_INT_RGB);
+        ByteArrayOutputStream out = new ByteArrayOutputStream();
+        ImageIO.write(image, "png", out);
+        MockMultipartFile file = new MockMultipartFile("file", "gallery.png", "image/png", out.toByteArray());
+
+        fileValidationService.validateGalleryImage(file);
+    }
+
     private static String validManifest() {
         return """
                 {