From 90b5b6bd8b299e53940247806eebe48a5a0e8fb2 Mon Sep 17 00:00:00 2001
From: CalDescent <caldescent@protonmail.com>
Date: Sat, 13 Nov 2021 12:54:14 +0000
Subject: [PATCH] Don't allow data to be fetched for viewing if the name is in
 the local blacklist.

We still allow it to be fetched even if it's outside of the storage policy, as the cleanup manager will delete the files very soon after, and they won't be allowed to be served to other peers due to other checks already in place.
---
 .../qortal/arbitrary/ArbitraryDataReader.java | 20 +++++++++++++------
 .../ArbitraryDataStorageManager.java          |  2 +-
 2 files changed, 15 insertions(+), 7 deletions(-)

diff --git a/src/main/java/org/qortal/arbitrary/ArbitraryDataReader.java b/src/main/java/org/qortal/arbitrary/ArbitraryDataReader.java
index 142a8016..9c59626e 100644
--- a/src/main/java/org/qortal/arbitrary/ArbitraryDataReader.java
+++ b/src/main/java/org/qortal/arbitrary/ArbitraryDataReader.java
@@ -7,6 +7,7 @@ import org.apache.logging.log4j.Logger;
 import org.qortal.arbitrary.exception.MissingDataException;
 import org.qortal.controller.arbitrary.ArbitraryDataBuildManager;
 import org.qortal.controller.arbitrary.ArbitraryDataManager;
+import org.qortal.controller.arbitrary.ArbitraryDataStorageManager;
 import org.qortal.crypto.AES;
 import org.qortal.data.transaction.ArbitraryTransactionData;
 import org.qortal.data.transaction.ArbitraryTransactionData.*;
@@ -308,15 +309,22 @@ public class ArbitraryDataReader {
         ArbitraryDataFile arbitraryDataFile = ArbitraryDataFile.fromHash(digest);
         if (!arbitraryDataFile.exists()) {
             if (!arbitraryDataFile.allChunksExist(chunkHashes) || chunkHashes == null) {
+                if (ArbitraryDataStorageManager.getInstance().isNameInBlacklist(transactionData.getName())) {
+                    throw new IllegalStateException(
+                            String.format("Unable to request missing data for file %s due to blacklist", arbitraryDataFile));
+                }
+                else {
+                    // Ask the arbitrary data manager to fetch data for this transaction
+                    ArbitraryDataManager.getInstance().fetchDataForSignature(transactionData.getSignature());
 
-                // Ask the arbitrary data manager to fetch data for this transaction
-                ArbitraryDataManager.getInstance().fetchDataForSignature(transactionData.getSignature());
+                    // Throw a missing data exception, which allows subsequent layers to fetch data
+                    String message = String.format("Requested missing data for file %s", arbitraryDataFile);
+                    LOGGER.info(message);
+                    throw new MissingDataException(message);
+                }
 
-                // Throw a missing data exception, which allows subsequent layers to fetch data
-                String message = String.format("Requested missing data for file %s", arbitraryDataFile);
-                LOGGER.info(message);
-                throw new MissingDataException(message);
             }
+
             // We have all the chunks but not the complete file, so join them
             arbitraryDataFile.addChunkHashes(chunkHashes);
             arbitraryDataFile.join();
diff --git a/src/main/java/org/qortal/controller/arbitrary/ArbitraryDataStorageManager.java b/src/main/java/org/qortal/controller/arbitrary/ArbitraryDataStorageManager.java
index 358ebd79..fa7f59b5 100644
--- a/src/main/java/org/qortal/controller/arbitrary/ArbitraryDataStorageManager.java
+++ b/src/main/java/org/qortal/controller/arbitrary/ArbitraryDataStorageManager.java
@@ -45,7 +45,7 @@ public class ArbitraryDataStorageManager {
         }
     }
 
-    private boolean isNameInBlacklist(String name) {
+    public boolean isNameInBlacklist(String name) {
         return ResourceListManager.getInstance().listContains("blacklist", "names", name);
     }