crowetic/qortal
1
0
Fork 0
forked from Qortal/qortal
Code Pull Requests Activity

Don't respond with a file list for a transaction that is outside of our storage policy, even if we do have a copy of the file at the time of the request.

Browse Source
This commit is contained in:
CalDescent 2021-11-03 21:44:31 +00:00
parent 5e82de667e
commit e50fd786da
1 changed files with 20 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
src/main/java/org/qortal/controller/arbitrary/ArbitraryDataManager.java
View File

@ -587,6 +587,9 @@ public class ArbitraryDataManager extends Thread {
ArbitraryTransactionData transactionData = (ArbitraryTransactionData)repository.getTransactionRepository().fromSignature(signature); ArbitraryTransactionData transactionData = (ArbitraryTransactionData)repository.getTransactionRepository().fromSignature(signature);
if (transactionData instanceof ArbitraryTransactionData) { if (transactionData instanceof ArbitraryTransactionData) {
// Check if we're even allowed to serve data for this transaction
if (ArbitraryDataStorageManager.getInstance().shouldStoreDataForName(transactionData.getName())) {
byte[] hash = transactionData.getData(); byte[] hash = transactionData.getData();
byte[] chunkHashes = transactionData.getChunkHashes(); byte[] chunkHashes = transactionData.getChunkHashes();
@ -598,19 +601,18 @@ public class ArbitraryDataManager extends Thread {
if (chunk.exists()) { if (chunk.exists()) {
hashes.add(chunk.getHash()); hashes.add(chunk.getHash());
//LOGGER.info("Added hash {}", chunk.getHash58()); //LOGGER.info("Added hash {}", chunk.getHash58());
} } else {
else {
LOGGER.info("Couldn't add hash {} because it doesn't exist", chunk.getHash58()); LOGGER.info("Couldn't add hash {} because it doesn't exist", chunk.getHash58());
} }
} }
} } else {
else {
// This transaction has no chunks, so include the complete file if we have it // This transaction has no chunks, so include the complete file if we have it
if (arbitraryDataFile.exists()) { if (arbitraryDataFile.exists()) {
hashes.add(arbitraryDataFile.getHash()); hashes.add(arbitraryDataFile.getHash());
} }
} }
} }
}
} catch (DataException e) { } catch (DataException e) {
LOGGER.error(String.format("Repository issue while fetching arbitrary file list for peer %s", peer), e); LOGGER.error(String.format("Repository issue while fetching arbitrary file list for peer %s", peer), e);