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

Removed unused, buggy code in HSQLDBArbitraryRepository.save()

Browse Source 
It's safer to throw an exception and point the user towards ArbitraryDataWriter, rather than maintaining unused code.
This commit is contained in:
CalDescent 2021-08-20 13:01:55 +01:00
parent 6730683919
commit 190f70f332
1 changed files with 3 additions and 39 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

40
src/main/java/org/qortal/repository/hsqldb/HSQLDBArbitraryRepository.java
View File

@ -16,6 +16,7 @@ import org.qortal.transaction.Transaction.ApprovalStatus;
import java.sql.ResultSet; import java.sql.ResultSet;
import java.sql.SQLException; import java.sql.SQLException;
import java.util.ArrayList; import java.util.ArrayList;
import java.util.Arrays;
import java.util.List; import java.util.List;
public class HSQLDBArbitraryRepository implements ArbitraryRepository { public class HSQLDBArbitraryRepository implements ArbitraryRepository {
@ -24,8 +25,6 @@ public class HSQLDBArbitraryRepository implements ArbitraryRepository {
protected HSQLDBRepository repository; protected HSQLDBRepository repository;
private static final Logger LOGGER = LogManager.getLogger(ArbitraryRepository.class);
public HSQLDBArbitraryRepository(HSQLDBRepository repository) { public HSQLDBArbitraryRepository(HSQLDBRepository repository) {
this.repository = repository; this.repository = repository;
} }
@ -130,42 +129,7 @@ public class HSQLDBArbitraryRepository implements ArbitraryRepository {
return; return;
} }
// Store non-trivial payloads in filesystem and convert transaction's data to hash form throw new IllegalStateException(String.format("Supplied data is larger than maximum size (%i bytes). Please use ArbitraryDataWriter.", MAX_RAW_DATA_SIZE));
byte[] rawData = arbitraryTransactionData.getData();
// Calculate hash of data and update our transaction to use that
byte[] dataHash = Crypto.digest(rawData);
arbitraryTransactionData.setData(dataHash);
arbitraryTransactionData.setDataType(DataType.DATA_HASH);
// Create ArbitraryDataFile
ArbitraryDataFile arbitraryDataFile = new ArbitraryDataFile(rawData);
// Verify that the data file is valid, and that it matches the expected hash
ArbitraryDataFile.ValidationResult validationResult = arbitraryDataFile.isValid();
if (validationResult != ArbitraryDataFile.ValidationResult.OK) {
arbitraryDataFile.deleteAll();
throw new DataException("Invalid data file when attempting to store arbitrary transaction data");
}
if (!dataHash.equals(arbitraryDataFile.digest())) {
arbitraryDataFile.deleteAll();
throw new DataException("Could not verify hash when attempting to store arbitrary transaction data");
}
// Now create chunks if needed
int chunkCount = arbitraryDataFile.split(ArbitraryDataFile.CHUNK_SIZE);
if (chunkCount > 0) {
LOGGER.info(String.format("Successfully split into %d chunk%s:", chunkCount, (chunkCount == 1 ? "" : "s")));
LOGGER.info("{}", arbitraryDataFile.printChunks());
// Verify that the chunk hashes match those in the transaction
byte[] chunkHashes = arbitraryDataFile.chunkHashes();
if (!chunkHashes.equals(arbitraryTransactionData.getChunkHashes())) {
arbitraryDataFile.deleteAll();
throw new DataException("Could not verify chunk hashes when attempting to store arbitrary transaction data");
}
}
} }
@Override @Override