From e31515b4a297283374dd026b61f085732729715b Mon Sep 17 00:00:00 2001
From: CalDescent <caldescent@protonmail.com>
Date: Fri, 20 Jan 2023 10:14:42 +0000
Subject: [PATCH] Fixed bugs preventing single file GIF repositories and QCHAT
 attachments from passing validation.

---
 .../org/qortal/arbitrary/misc/Service.java    |  8 +++++
 .../test/arbitrary/ArbitraryServiceTests.java | 36 +++++++++++++++++++
 2 files changed, 44 insertions(+)

diff --git a/src/main/java/org/qortal/arbitrary/misc/Service.java b/src/main/java/org/qortal/arbitrary/misc/Service.java
index dc2deaeb..96934de2 100644
--- a/src/main/java/org/qortal/arbitrary/misc/Service.java
+++ b/src/main/java/org/qortal/arbitrary/misc/Service.java
@@ -24,6 +24,10 @@ public enum Service {
             // Custom validation function to require a single file, with a whitelisted extension
             int fileCount = 0;
             File[] files = path.toFile().listFiles();
+            // If already a single file, replace the list with one that contains that file only
+            if (files == null && path.toFile().isFile()) {
+                files = new File[] { path.toFile() };
+            }
             if (files != null) {
                 for (File file : files) {
                     if (file.isDirectory()) {
@@ -80,6 +84,10 @@ public enum Service {
             // Custom validation function to require .gif files only, and at least 1
             int gifCount = 0;
             File[] files = path.toFile().listFiles();
+            // If already a single file, replace the list with one that contains that file only
+            if (files == null && path.toFile().isFile()) {
+                files = new File[] { path.toFile() };
+            }
             if (files != null) {
                 for (File file : files) {
                     if (file.isDirectory()) {
diff --git a/src/test/java/org/qortal/test/arbitrary/ArbitraryServiceTests.java b/src/test/java/org/qortal/test/arbitrary/ArbitraryServiceTests.java
index acd86eaa..bbd17ab7 100644
--- a/src/test/java/org/qortal/test/arbitrary/ArbitraryServiceTests.java
+++ b/src/test/java/org/qortal/test/arbitrary/ArbitraryServiceTests.java
@@ -120,6 +120,24 @@ public class ArbitraryServiceTests extends Common {
         assertEquals(ValidationResult.OK, service.validate(path));
     }
 
+    @Test
+    public void testValidateSingleFileGifRepository() throws IOException {
+        // Generate some random data
+        byte[] data = new byte[1024];
+        new Random().nextBytes(data);
+
+        // Write the data to a single file in a temp path
+        Path path = Files.createTempDirectory("testValidateSingleFileGifRepository");
+        path.toFile().deleteOnExit();
+        Path imagePath = Paths.get(path.toString(), "image1.gif");
+        Files.write(imagePath, data, StandardOpenOption.CREATE);
+
+        Service service = Service.GIF_REPOSITORY;
+        assertTrue(service.isValidationRequired());
+
+        assertEquals(ValidationResult.OK, service.validate(imagePath));
+    }
+
     @Test
     public void testValidateMultiLayerGifRepository() throws IOException {
         // Generate some random data
@@ -188,6 +206,24 @@ public class ArbitraryServiceTests extends Common {
         assertEquals(ValidationResult.OK, service.validate(path));
     }
 
+    @Test
+    public void testValidateSingleFileQChatAttachment() throws IOException {
+        // Generate some random data
+        byte[] data = new byte[1024];
+        new Random().nextBytes(data);
+
+        // Write the data a single file in a temp path
+        Path path = Files.createTempDirectory("testValidateSingleFileQChatAttachment");
+        path.toFile().deleteOnExit();
+        Path filePath = Paths.get(path.toString(), "document.pdf");
+        Files.write(filePath, data, StandardOpenOption.CREATE);
+
+        Service service = Service.QCHAT_ATTACHMENT;
+        assertTrue(service.isValidationRequired());
+
+        assertEquals(ValidationResult.OK, service.validate(filePath));
+    }
+
     @Test
     public void testValidateInvalidQChatAttachmentFileExtension() throws IOException {
         // Generate some random data