From c3f19ea0c1c52507dbaa0872de506c3d408cabd9 Mon Sep 17 00:00:00 2001
From: CalDescent <caldescent@protonmail.com>
Date: Fri, 20 Jan 2023 10:21:05 +0000
Subject: [PATCH] Don't allow the custom validation methods to evade superclass
 validation.

---
 .../org/qortal/arbitrary/misc/Service.java    | 21 ++++++++++++++++---
 1 file changed, 18 insertions(+), 3 deletions(-)

diff --git a/src/main/java/org/qortal/arbitrary/misc/Service.java b/src/main/java/org/qortal/arbitrary/misc/Service.java
index 96934de2..0aeb99ed 100644
--- a/src/main/java/org/qortal/arbitrary/misc/Service.java
+++ b/src/main/java/org/qortal/arbitrary/misc/Service.java
@@ -20,7 +20,12 @@ public enum Service {
     ARBITRARY_DATA(100, false, null, null),
     QCHAT_ATTACHMENT(120, true, 1024*1024L, null) {
         @Override
-        public ValidationResult validate(Path path) {
+        public ValidationResult validate(Path path) throws IOException {
+            ValidationResult superclassResult = super.validate(path);
+            if (superclassResult != ValidationResult.OK) {
+                return superclassResult;
+            }
+
             // Custom validation function to require a single file, with a whitelisted extension
             int fileCount = 0;
             File[] files = path.toFile().listFiles();
@@ -49,7 +54,12 @@ public enum Service {
     },
     WEBSITE(200, true, null, null) {
         @Override
-        public ValidationResult validate(Path path) {
+        public ValidationResult validate(Path path) throws IOException {
+            ValidationResult superclassResult = super.validate(path);
+            if (superclassResult != ValidationResult.OK) {
+                return superclassResult;
+            }
+
             // Custom validation function to require an index HTML file in the root directory
             List<String> fileNames = ArbitraryDataRenderer.indexFiles();
             String[] files = path.toFile().list();
@@ -80,7 +90,12 @@ public enum Service {
     METADATA(1100, false, null, null),
     GIF_REPOSITORY(1200, true, 25*1024*1024L, null) {
         @Override
-        public ValidationResult validate(Path path) {
+        public ValidationResult validate(Path path) throws IOException {
+            ValidationResult superclassResult = super.validate(path);
+            if (superclassResult != ValidationResult.OK) {
+                return superclassResult;
+            }
+
             // Custom validation function to require .gif files only, and at least 1
             int gifCount = 0;
             File[] files = path.toFile().listFiles();