From 2630c35f8cfe23b911fa57b02f35ecbb46c8c907 Mon Sep 17 00:00:00 2001 From: CalDescent Date: Sun, 6 Mar 2022 11:43:28 +0000 Subject: [PATCH] Chunk validation now uses MAX_CHUNK_SIZE rather than CHUNK_SIZE, to allow for a smaller CHUNK_SIZE value to be optionally used, without failing the validation of existing resources. --- src/main/java/org/qortal/arbitrary/ArbitraryDataFile.java | 1 + .../java/org/qortal/arbitrary/ArbitraryDataFileChunk.java | 4 ++-- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/src/main/java/org/qortal/arbitrary/ArbitraryDataFile.java b/src/main/java/org/qortal/arbitrary/ArbitraryDataFile.java index 575f103b..4c806648 100644 --- a/src/main/java/org/qortal/arbitrary/ArbitraryDataFile.java +++ b/src/main/java/org/qortal/arbitrary/ArbitraryDataFile.java @@ -53,6 +53,7 @@ public class ArbitraryDataFile { private static final Logger LOGGER = LogManager.getLogger(ArbitraryDataFile.class); public static final long MAX_FILE_SIZE = 500 * 1024 * 1024; // 500MiB + protected static final int MAX_CHUNK_SIZE = 1 * 1024 * 1024; // 1MiB public static final int CHUNK_SIZE = 1 * 1024 * 1024; // 1MiB public static int SHORT_DIGEST_LENGTH = 8; diff --git a/src/main/java/org/qortal/arbitrary/ArbitraryDataFileChunk.java b/src/main/java/org/qortal/arbitrary/ArbitraryDataFileChunk.java index b113fbba..5f6695df 100644 --- a/src/main/java/org/qortal/arbitrary/ArbitraryDataFileChunk.java +++ b/src/main/java/org/qortal/arbitrary/ArbitraryDataFileChunk.java @@ -40,8 +40,8 @@ public class ArbitraryDataFileChunk extends ArbitraryDataFile { try { // Validate the file size (chunks have stricter limits) long fileSize = Files.size(this.filePath); - if (fileSize > CHUNK_SIZE) { - LOGGER.error(String.format("DataFileChunk is too large: %d bytes (max chunk size: %d bytes)", fileSize, CHUNK_SIZE)); + if (fileSize > MAX_CHUNK_SIZE) { + LOGGER.error(String.format("DataFileChunk is too large: %d bytes (max chunk size: %d bytes)", fileSize, MAX_CHUNK_SIZE)); return ValidationResult.FILE_TOO_LARGE; }