From e481a5926acd9f6e8a46b06cbfc4f6d62d470d17 Mon Sep 17 00:00:00 2001 From: CalDescent Date: Fri, 10 Dec 2021 11:34:10 +0000 Subject: [PATCH] Use "blocked" instead of "blacklisted", for consistency with the buttons and terminology in the UI --- .../api/gateway/resource/GatewayResource.java | 2 +- .../qortal/api/model/ArbitraryResourceSummary.java | 2 +- .../org/qortal/arbitrary/ArbitraryDataReader.java | 6 +++--- .../qortal/arbitrary/ArbitraryDataResource.java | 6 +++--- .../arbitrary/ArbitraryDataCleanupManager.java | 6 +++--- .../arbitrary/ArbitraryDataStorageManager.java | 14 +++++++------- src/main/java/org/qortal/list/ResourceList.java | 2 +- .../org/qortal/transaction/ChatTransaction.java | 12 ++++++------ .../java/org/qortal/transaction/Transaction.java | 4 ++-- .../i18n/TransactionValidity_en.properties | 4 ++-- .../i18n/TransactionValidity_fi.properties | 4 ++-- .../i18n/TransactionValidity_hu.properties | 4 ++-- .../i18n/TransactionValidity_it.properties | 4 ++-- .../i18n/TransactionValidity_nl.properties | 4 ++-- .../i18n/TransactionValidity_ru.properties | 6 ++++-- src/main/resources/loading/index.html | 4 ++-- 16 files changed, 43 insertions(+), 41 deletions(-) diff --git a/src/main/java/org/qortal/api/gateway/resource/GatewayResource.java b/src/main/java/org/qortal/api/gateway/resource/GatewayResource.java index d2fae757..61aa1aec 100644 --- a/src/main/java/org/qortal/api/gateway/resource/GatewayResource.java +++ b/src/main/java/org/qortal/api/gateway/resource/GatewayResource.java @@ -29,7 +29,7 @@ public class GatewayResource { /** * We need to allow resource status checking (and building) via the gateway, as the node's API port * may not be forwarded and will almost certainly not be authenticated. Since gateways allow for - * all resources to be loaded except those that are blacklisted, there is no need for authentication. + * all resources to be loaded except those that are blocked, there is no need for authentication. */ @GET @Path("/arbitrary/resource/status/{service}/{name}") diff --git a/src/main/java/org/qortal/api/model/ArbitraryResourceSummary.java b/src/main/java/org/qortal/api/model/ArbitraryResourceSummary.java index f4c10bb2..d8d531d0 100644 --- a/src/main/java/org/qortal/api/model/ArbitraryResourceSummary.java +++ b/src/main/java/org/qortal/api/model/ArbitraryResourceSummary.java @@ -14,7 +14,7 @@ public class ArbitraryResourceSummary { MISSING_DATA, BUILD_FAILED, UNSUPPORTED, - BLACKLISTED + BLOCKED } public ArbitraryResourceStatus status; diff --git a/src/main/java/org/qortal/arbitrary/ArbitraryDataReader.java b/src/main/java/org/qortal/arbitrary/ArbitraryDataReader.java index 337766e1..bee8db0c 100644 --- a/src/main/java/org/qortal/arbitrary/ArbitraryDataReader.java +++ b/src/main/java/org/qortal/arbitrary/ArbitraryDataReader.java @@ -318,9 +318,9 @@ public class ArbitraryDataReader { arbitraryDataFile.setMetadataHash(metadataHash); if (!arbitraryDataFile.allFilesExist()) { - if (ArbitraryDataStorageManager.getInstance().isNameInBlacklist(transactionData.getName())) { + if (ArbitraryDataStorageManager.getInstance().isNameBlocked(transactionData.getName())) { throw new DataException( - String.format("Unable to request missing data for file %s due to blacklist", arbitraryDataFile)); + String.format("Unable to request missing data for file %s because the name is blocked", arbitraryDataFile)); } else { // Ask the arbitrary data manager to fetch data for this transaction @@ -379,7 +379,7 @@ public class ArbitraryDataReader { } catch (NoSuchAlgorithmException | InvalidAlgorithmParameterException | NoSuchPaddingException | BadPaddingException | IllegalBlockSizeException | IOException | InvalidKeyException e) { - // TODO: delete files and blacklist this resource if privateDataEnabled is false + // TODO: delete files and block this resource if privateDataEnabled is false throw new DataException(String.format("Unable to decrypt file at path %s: %s", this.filePath, e.getMessage())); } } else { diff --git a/src/main/java/org/qortal/arbitrary/ArbitraryDataResource.java b/src/main/java/org/qortal/arbitrary/ArbitraryDataResource.java index 5922af56..1849b913 100644 --- a/src/main/java/org/qortal/arbitrary/ArbitraryDataResource.java +++ b/src/main/java/org/qortal/arbitrary/ArbitraryDataResource.java @@ -41,10 +41,10 @@ public class ArbitraryDataResource { return new ArbitraryResourceSummary(ArbitraryResourceStatus.UNSUPPORTED); } - // Check if the name is blacklisted + // Check if the name is blocked if (ResourceListManager.getInstance() - .listContains("blacklistedNames", this.resourceId, false)) { - return new ArbitraryResourceSummary(ArbitraryResourceStatus.BLACKLISTED); + .listContains("blockedNames", this.resourceId, false)) { + return new ArbitraryResourceSummary(ArbitraryResourceStatus.BLOCKED); } // Firstly check the cache to see if it's already built diff --git a/src/main/java/org/qortal/controller/arbitrary/ArbitraryDataCleanupManager.java b/src/main/java/org/qortal/controller/arbitrary/ArbitraryDataCleanupManager.java index 5e77e5c5..29ba7645 100644 --- a/src/main/java/org/qortal/controller/arbitrary/ArbitraryDataCleanupManager.java +++ b/src/main/java/org/qortal/controller/arbitrary/ArbitraryDataCleanupManager.java @@ -448,10 +448,10 @@ public class ArbitraryDataCleanupManager extends Thread { if (directories != null) { for (final File directory : directories) { - // Delete data relating to blacklisted names + // Delete data relating to blocked names String name = directory.getName(); - if (name != null && storageManager.isNameInBlacklist(name)) { - this.safeDeleteDirectory(directory, "blacklisted name"); + if (name != null && storageManager.isNameBlocked(name)) { + this.safeDeleteDirectory(directory, "blocked name"); } // Delete cached reader data that has reached its expiry diff --git a/src/main/java/org/qortal/controller/arbitrary/ArbitraryDataStorageManager.java b/src/main/java/org/qortal/controller/arbitrary/ArbitraryDataStorageManager.java index 9ec88045..4e349189 100644 --- a/src/main/java/org/qortal/controller/arbitrary/ArbitraryDataStorageManager.java +++ b/src/main/java/org/qortal/controller/arbitrary/ArbitraryDataStorageManager.java @@ -113,13 +113,13 @@ public class ArbitraryDataStorageManager extends Thread { // Don't check for storage limits here, as it can cause the cleanup manager to delete existing data - // Check if our storage policy and blacklist allows us to host data for this name + // Check if our storage policy and and lists allow us to host data for this name switch (Settings.getInstance().getStoragePolicy()) { case FOLLOWED_AND_VIEWED: case ALL: case VIEWED: - // If the policy includes viewed data, we can host it as long as it's not blacklisted - return !this.isNameInBlacklist(name); + // If the policy includes viewed data, we can host it as long as it's not blocked + return !this.isNameBlocked(name); case FOLLOWED: // If the policy is for followed data only, we have to be following it @@ -166,8 +166,8 @@ public class ArbitraryDataStorageManager extends Thread { return this.shouldPreFetchDataWithoutName(); } - // Never fetch data from blacklisted names, even if they are followed - if (this.isNameInBlacklist(name)) { + // Never fetch data from blocked names, even if they are followed + if (this.isNameBlocked(name)) { return false; } @@ -222,8 +222,8 @@ public class ArbitraryDataStorageManager extends Thread { return true; } - public boolean isNameInBlacklist(String name) { - return ResourceListManager.getInstance().listContains("blacklistedNames", name, false); + public boolean isNameBlocked(String name) { + return ResourceListManager.getInstance().listContains("blockedNames", name, false); } private boolean isFollowingName(String name) { diff --git a/src/main/java/org/qortal/list/ResourceList.java b/src/main/java/org/qortal/list/ResourceList.java index eb50957f..c9028615 100644 --- a/src/main/java/org/qortal/list/ResourceList.java +++ b/src/main/java/org/qortal/list/ResourceList.java @@ -28,7 +28,7 @@ public class ResourceList { * This can be used for local blocking, or even for curating and sharing content lists * Lists are backed off to JSON files (in the lists folder) to ease sharing between nodes and users * - * @param name - the name of the list, for instance "addressblacklist" + * @param name - the name of the list, for instance "blockedAddresses" * @throws IOException */ public ResourceList(String name) throws IOException { diff --git a/src/main/java/org/qortal/transaction/ChatTransaction.java b/src/main/java/org/qortal/transaction/ChatTransaction.java index 130e35f1..a486d408 100644 --- a/src/main/java/org/qortal/transaction/ChatTransaction.java +++ b/src/main/java/org/qortal/transaction/ChatTransaction.java @@ -145,19 +145,19 @@ public class ChatTransaction extends Transaction { public ValidationResult isValid() throws DataException { // Nonce checking is done via isSignatureValid() as that method is only called once per import - // Check for blacklisted author by address + // Check for blocked author by address ResourceListManager listManager = ResourceListManager.getInstance(); - if (listManager.listContains("blacklistedAddresses", this.chatTransactionData.getSender(), true)) { - return ValidationResult.ADDRESS_IN_BLACKLIST; + if (listManager.listContains("blockedAddresses", this.chatTransactionData.getSender(), true)) { + return ValidationResult.ADDRESS_BLOCKED; } - // Check for blacklisted author by registered name + // Check for blocked author by registered name List names = this.repository.getNameRepository().getNamesByOwner(this.chatTransactionData.getSender()); if (names != null && names.size() > 0) { for (NameData nameData : names) { if (nameData != null && nameData.getName() != null) { - if (listManager.listContains("blacklistedNames", nameData.getName(), false)) { - return ValidationResult.NAME_IN_BLACKLIST; + if (listManager.listContains("blockedNames", nameData.getName(), false)) { + return ValidationResult.NAME_BLOCKED; } } } diff --git a/src/main/java/org/qortal/transaction/Transaction.java b/src/main/java/org/qortal/transaction/Transaction.java index 279f5582..43591374 100644 --- a/src/main/java/org/qortal/transaction/Transaction.java +++ b/src/main/java/org/qortal/transaction/Transaction.java @@ -247,8 +247,8 @@ public abstract class Transaction { INVALID_GROUP_BLOCK_DELAY(93), INCORRECT_NONCE(94), INVALID_TIMESTAMP_SIGNATURE(95), - ADDRESS_IN_BLACKLIST(96), - NAME_IN_BLACKLIST(97), + ADDRESS_BLOCKED(96), + NAME_BLOCKED(97), INVALID_BUT_OK(999), NOT_YET_RELEASED(1000); diff --git a/src/main/resources/i18n/TransactionValidity_en.properties b/src/main/resources/i18n/TransactionValidity_en.properties index 8b30ca3b..7c4d18a1 100644 --- a/src/main/resources/i18n/TransactionValidity_en.properties +++ b/src/main/resources/i18n/TransactionValidity_en.properties @@ -180,9 +180,9 @@ INCORRECT_NONCE = incorrect PoW nonce INVALID_TIMESTAMP_SIGNATURE = invalid timestamp signature -ADDRESS_IN_BLACKLIST = this address is in your blacklist +ADDRESS_BLOCKED = this address is blocked -NAME_IN_BLACKLIST = this name is in your blacklist +NAME_BLOCKED = this name is blocked ADDRESS_ABOVE_RATE_LIMIT = address reached specified rate limit diff --git a/src/main/resources/i18n/TransactionValidity_fi.properties b/src/main/resources/i18n/TransactionValidity_fi.properties index 3db789e3..002ad560 100644 --- a/src/main/resources/i18n/TransactionValidity_fi.properties +++ b/src/main/resources/i18n/TransactionValidity_fi.properties @@ -180,9 +180,9 @@ TRANSACTION_UNKNOWN = tuntematon transaktio TX_GROUP_ID_MISMATCH = transaktion ryhmä-ID:n vastaavuusvirhe -ADDRESS_IN_BLACKLIST = this address is in your blacklist +ADDRESS_BLOCKED = this address is blocked -NAME_IN_BLACKLIST = this name is in your blacklist +NAME_BLOCKED = this name is blocked ADDRESS_ABOVE_RATE_LIMIT = address reached specified rate limit diff --git a/src/main/resources/i18n/TransactionValidity_hu.properties b/src/main/resources/i18n/TransactionValidity_hu.properties index 5d0ef0ec..bb43e18f 100644 --- a/src/main/resources/i18n/TransactionValidity_hu.properties +++ b/src/main/resources/i18n/TransactionValidity_hu.properties @@ -182,9 +182,9 @@ INCORRECT_NONCE = helytelen Proof-of-Work Nonce INVALID_TIMESTAMP_SIGNATURE = érvénytelen időbélyeg aláírás -ADDRESS_IN_BLACKLIST = ez a fiókcím a fekete listádon van +ADDRESS_BLOCKED = this address is blocked -NAME_IN_BLACKLIST = this name is in your blacklist +NAME_BLOCKED = this name is blocked ADDRESS_ABOVE_RATE_LIMIT = ez a cím elérte a megengedett mérték korlátot diff --git a/src/main/resources/i18n/TransactionValidity_it.properties b/src/main/resources/i18n/TransactionValidity_it.properties index 8bc38754..762f0865 100644 --- a/src/main/resources/i18n/TransactionValidity_it.properties +++ b/src/main/resources/i18n/TransactionValidity_it.properties @@ -182,9 +182,9 @@ TRANSACTION_UNKNOWN = transazione sconosciuta TX_GROUP_ID_MISMATCH = identificazione di gruppo della transazione non corrisponde -ADDRESS_IN_BLACKLIST = this address is in your blacklist +ADDRESS_BLOCKED = this address is blocked -NAME_IN_BLACKLIST = this name is in your blacklist +NAME_BLOCKED = this name is blocked ADDRESS_ABOVE_RATE_LIMIT = address reached specified rate limit diff --git a/src/main/resources/i18n/TransactionValidity_nl.properties b/src/main/resources/i18n/TransactionValidity_nl.properties index 78bfb5b9..726af0a9 100644 --- a/src/main/resources/i18n/TransactionValidity_nl.properties +++ b/src/main/resources/i18n/TransactionValidity_nl.properties @@ -180,9 +180,9 @@ TRANSACTION_UNKNOWN = transactie onbekend TX_GROUP_ID_MISMATCH = groep-ID van transactie matcht niet -ADDRESS_IN_BLACKLIST = this address is in your blacklist +ADDRESS_BLOCKED = this address is blocked -NAME_IN_BLACKLIST = this name is in your blacklist +NAME_BLOCKED = this name is blocked ADDRESS_ABOVE_RATE_LIMIT = address reached specified rate limit diff --git a/src/main/resources/i18n/TransactionValidity_ru.properties b/src/main/resources/i18n/TransactionValidity_ru.properties index e8761e7b..86e9d37a 100644 --- a/src/main/resources/i18n/TransactionValidity_ru.properties +++ b/src/main/resources/i18n/TransactionValidity_ru.properties @@ -174,7 +174,9 @@ TRANSACTION_UNKNOWN = неизвестная транзакция TX_GROUP_ID_MISMATCH = не соответствие идентификатора группы c хэш транзации -ADDRESS_IN_BLACKLIST = this address is in your blacklist +ADDRESS_BLOCKED = this address is blocked + +NAME_BLOCKED = this name is blocked ADDRESS_ABOVE_RATE_LIMIT = address reached specified rate limit @@ -182,4 +184,4 @@ DUPLICATE_MESSAGE = address sent duplicate message INVALID_TIMESTAMP_SIGNATURE = Invalid timestamp signature -INVALID_BUT_OK = Invalid but OK \ No newline at end of file +INVALID_BUT_OK = Invalid but OK diff --git a/src/main/resources/loading/index.html b/src/main/resources/loading/index.html index 648a2b60..eaa382a4 100644 --- a/src/main/resources/loading/index.html +++ b/src/main/resources/loading/index.html @@ -62,8 +62,8 @@ textStatus = "Unsupported request"; document.getElementById("status").style.color = "red"; } - else if (json.status == "BLACKLISTED") { - textStatus = name + " is blacklisted so content cannot be served"; + else if (json.status == "BLOCKED") { + textStatus = name + " is blocked so content cannot be served"; retryInterval = 5000; document.getElementById("status").style.color = "red"; }