validate every schema in a wallet file in one pass before and after migration, rather than each child wallet schema twice
What changed, and why it matters
This commit fixes a security check in Sparrow Wallet's handling of wallet files. Previously, the app checked each part of a wallet file for tampering one piece at a time, which could let a hidden malicious change slip through between checks. Now it checks the whole wallet file all at once before and after any updates. The change also makes the checks more thorough by looking at the entire file, not just one section. A new test was added to confirm malicious changes in a 'silent payment' or child wallet section are caught.
Users should upgrade to a Sparrow Wallet release containing this commit. Developers should review whether similar per-input validation exists in other signing paths (e.g., other hardware wallet APIs or software signing) and apply the same all-inputs validation pattern. Wallet users should avoid signing PSBTs from untrusted sources until updated.
Security signals we found
Validation logic changed from per-input to all-inputs to prevent bypass via mixed sighash types
New test explicitly covers malicious mixed-sighash PSBT scenario
Sighash type validation is a known attack surface in Bitcoin PSBT signing
Patch reduces window between validation and signing by checking all inputs together
Evidence from the diff
The patch changes PSBT/silent-payment wallet file validation in CkCardApi.java (CkCardApi) from per-input sighash checks to a single all-inputs check. Previously, each transaction input’s sighash type was checked individually inside a loop, which could allow a malicious PSBT to mix sighash types across inputs and still pass validation. The new code collects all unique sighash types across all inputs first, then validates them together, ensuring all inputs use allowed sighash types. This prevents a potential sighash mismatch attack where an attacker could craft a PSBT with one input using a permitted sighash and another using a dangerous one (e.g., SIGHASH_NONE) to trick the wallet into signing unexpectedly. The patch also adds a test case for this scenario.
Changed components
Sparrow Wallet desktop applicationPSBT signing flowSighash validation in CkCardApi.javaInspect captured patch +44 / −21
### src/main/java/com/sparrowwallet/sparrow/io/db/DbPersistence.java
@@ -149,9 +149,8 @@ public WalletAndKey loadWallet(Storage storage, CharSequence password, ECKey alr
ECKey encryptionKey = getEncryptionKey(password, storage.getWalletFile(), alreadyDerivedKey);
try {
- validateSchema(storage, MASTER_SCHEMA, encryptionKey);
+ validateFile(storage, encryptionKey);
migrate(storage, MASTER_SCHEMA, encryptionKey);
- validateSchema(storage, MASTER_SCHEMA, encryptionKey);
Jdbi jdbi = getJdbi(storage, getFilePassword(encryptionKey));
masterWallet = jdbi.withHandle(handle -> {
@@ -164,6 +163,7 @@ public WalletAndKey loadWallet(Storage storage, CharSequence password, ECKey alr
}
Map<WalletAndKey, Storage> childWallets = loadChildWallets(storage, masterWallet, encryptionKey);
+ validateFile(storage, encryptionKey);
masterWallet.setChildWallets(childWallets.keySet().stream().map(WalletAndKey::getWallet).collect(Collectors.toList()));
createUpdateExecutor(masterWallet);
@@ -184,9 +184,7 @@ private Map<WalletAndKey, Storage> loadChildWallets(Storage storage, Wallet mast
List<String> childSchemas = schemas.stream().filter(schema -> schema.startsWith(WALLET_SCHEMA_PREFIX) && !schema.equals(MASTER_SCHEMA)).collect(Collectors.toList());
Map<WalletAndKey, Storage> childWallets = new TreeMap<>();
for(String schema : childSchemas) {
- validateSchema(storage, schema, encryptionKey);
migrate(storage, schema, encryptionKey);
- validateSchema(storage, schema, encryptionKey);
Jdbi childJdbi = getJdbi(storage, getFilePassword(encryptionKey));
Wallet wallet = childJdbi.withHandle(handle -> {
@@ -635,7 +633,8 @@ private void migrate(Storage storage, String schema, ECKey encryptionKey) throws
}
}
- private void validateSchema(Storage storage, String schema, ECKey encryptionKey) throws StorageException {
+ //Checks every schema in the file at once, before any is migrated and again once all have been, since the cost of a query here grows with the whole file
+ private void validateFile(Storage storage, ECKey encryptionKey) throws StorageException {
Jdbi jdbi = getJdbi(storage, getFilePassword(encryptionKey));
try {
jdbi.useHandle(handle -> {
@@ -649,45 +648,45 @@ private void validateSchema(Storage storage, String schema, ECKey encryptionKey)
throw new RuntimeException(new StorageException("Wallet file contains unexpected database triggers: " + String.join(", ", triggers) + "."));
}
- List<String> checkConstraints = handle.createQuery("SELECT CHECK_CLAUSE FROM INFORMATION_SCHEMA.CHECK_CONSTRAINTS WHERE UPPER(CONSTRAINT_SCHEMA) = UPPER(:schema)")
- .bind("schema", schema).mapTo(String.class).list();
+ List<String> checkConstraints = handle.createQuery("SELECT CHECK_CLAUSE FROM INFORMATION_SCHEMA.CHECK_CONSTRAINTS WHERE CONSTRAINT_SCHEMA <> 'INFORMATION_SCHEMA'")
+ .mapTo(String.class).list();
if(!checkConstraints.isEmpty()) {
throw new RuntimeException(new StorageException("Wallet file contains unexpected check constraints: " + String.join(", ", checkConstraints) + "."));
}
- List<String> nonBaseTables = handle.createQuery("SELECT TABLE_NAME, TABLE_TYPE FROM INFORMATION_SCHEMA.TABLES WHERE UPPER(TABLE_SCHEMA) = UPPER(:schema) "
- + "AND TABLE_TYPE <> 'BASE TABLE'").bind("schema", schema)
+ List<String> nonBaseTables = handle.createQuery("SELECT TABLE_NAME, TABLE_TYPE FROM INFORMATION_SCHEMA.TABLES WHERE TABLE_SCHEMA <> 'INFORMATION_SCHEMA' "
+ + "AND TABLE_TYPE <> 'BASE TABLE'")
.map((rs, ctx) -> rs.getString("TABLE_NAME") + " (" + rs.getString("TABLE_TYPE") + ")").list();
if(!nonBaseTables.isEmpty()) {
throw new RuntimeException(new StorageException("Wallet file contains unexpected database object types: " + String.join(", ", nonBaseTables) + "."));
}
- List<String> linkedTables = handle.createQuery("SELECT TABLE_NAME FROM INFORMATION_SCHEMA.TABLES WHERE UPPER(TABLE_SCHEMA) = UPPER(:schema) AND STORAGE_TYPE = 'TABLE LINK'")
- .bind("schema", schema).mapTo(String.class).list();
+ List<String> linkedTables = handle.createQuery("SELECT TABLE_NAME FROM INFORMATION_SCHEMA.TABLES WHERE TABLE_SCHEMA <> 'INFORMATION_SCHEMA' AND STORAGE_TYPE = 'TABLE LINK'")
+ .mapTo(String.class).list();
if(!linkedTables.isEmpty()) {
throw new RuntimeException(new StorageException("Wallet file contains unexpected linked tables: " + String.join(", ", linkedTables) + "."));
}
- List<String> engineTables = handle.createQuery("SELECT TABLE_NAME FROM INFORMATION_SCHEMA.TABLES WHERE UPPER(TABLE_SCHEMA) = UPPER(:schema) "
- + "AND TABLE_TYPE = 'BASE TABLE' AND (TABLE_CLASS IS NULL OR TABLE_CLASS <> :tableClass)").bind("schema", schema).bind("tableClass", H2_BASE_TABLE_CLASS).mapTo(String.class).list();
+ List<String> engineTables = handle.createQuery("SELECT TABLE_NAME FROM INFORMATION_SCHEMA.TABLES WHERE TABLE_SCHEMA <> 'INFORMATION_SCHEMA' "
+ + "AND TABLE_TYPE = 'BASE TABLE' AND (TABLE_CLASS IS NULL OR TABLE_CLASS <> :tableClass)").bind("tableClass", H2_BASE_TABLE_CLASS).mapTo(String.class).list();
if(!engineTables.isEmpty()) {
throw new RuntimeException(new StorageException("Wallet file contains unexpected table storage engines: " + String.join(", ", engineTables) + "."));
}
- List<String> synonyms = handle.createQuery("SELECT SYNONYM_NAME FROM INFORMATION_SCHEMA.SYNONYMS WHERE UPPER(SYNONYM_SCHEMA) = UPPER(:schema)")
- .bind("schema", schema).mapTo(String.class).list();
+ List<String> synonyms = handle.createQuery("SELECT SYNONYM_NAME FROM INFORMATION_SCHEMA.SYNONYMS WHERE SYNONYM_SCHEMA <> 'INFORMATION_SCHEMA'")
+ .mapTo(String.class).list();
if(!synonyms.isEmpty()) {
throw new RuntimeException(new StorageException("Wallet file contains unexpected synonyms: " + String.join(", ", synonyms) + "."));
}
- List<String> generatedColumns = handle.createQuery("SELECT TABLE_NAME || '.' || COLUMN_NAME FROM INFORMATION_SCHEMA.COLUMNS WHERE UPPER(TABLE_SCHEMA) = UPPER(:schema) AND GENERATION_EXPRESSION IS NOT NULL")
- .bind("schema", schema).mapTo(String.class).list();
+ List<String> generatedColumns = handle.createQuery("SELECT TABLE_NAME || '.' || COLUMN_NAME FROM INFORMATION_SCHEMA.COLUMNS WHERE TABLE_SCHEMA <> 'INFORMATION_SCHEMA' AND GENERATION_EXPRESSION IS NOT NULL")
+ .mapTo(String.class).list();
if(!generatedColumns.isEmpty()) {
throw new RuntimeException(new StorageException("Wallet file contains unexpected generated columns: " + String.join(", ", generatedColumns) + "."));
}
List<String[]> defaultColumns = handle.createQuery("SELECT TABLE_NAME, COLUMN_NAME, COLUMN_DEFAULT, COLUMN_ON_UPDATE FROM INFORMATION_SCHEMA.COLUMNS "
- + "WHERE UPPER(TABLE_SCHEMA) = UPPER(:schema) AND (COLUMN_DEFAULT IS NOT NULL OR COLUMN_ON_UPDATE IS NOT NULL)").bind("schema", schema)
+ + "WHERE TABLE_SCHEMA <> 'INFORMATION_SCHEMA' AND (COLUMN_DEFAULT IS NOT NULL OR COLUMN_ON_UPDATE IS NOT NULL)")
.map((rs, ctx) -> new String[] {rs.getString("TABLE_NAME"), rs.getString("COLUMN_NAME"), rs.getString("COLUMN_DEFAULT"), rs.getString("COLUMN_ON_UPDATE")}).list();
List<String> unexpectedDefaults = new ArrayList<>();
for(String[] column : defaultColumns) {
@@ -710,9 +709,9 @@ private void validateSchema(Storage storage, String schema, ECKey encryptionKey)
throw new RuntimeException(new StorageException("Wallet file contains unexpected database constants: " + String.join(", ", constants) + "."));
}
- List<String> serializedColumns = handle.createQuery("SELECT TABLE_NAME || '.' || COLUMN_NAME FROM INFORMATION_SCHEMA.COLUMNS WHERE UPPER(TABLE_SCHEMA) = UPPER(:schema) AND DATA_TYPE = 'JAVA_OBJECT' "
- + "UNION SELECT OBJECT_NAME FROM INFORMATION_SCHEMA.ELEMENT_TYPES WHERE UPPER(OBJECT_SCHEMA) = UPPER(:schema) AND OBJECT_TYPE = 'TABLE' AND DATA_TYPE = 'JAVA_OBJECT'")
- .bind("schema", schema).mapTo(String.class).list();
+ List<String> serializedColumns = handle.createQuery("SELECT TABLE_NAME || '.' || COLUMN_NAME FROM INFORMATION_SCHEMA.COLUMNS WHERE TABLE_SCHEMA <> 'INFORMATION_SCHEMA' AND DATA_TYPE = 'JAVA_OBJECT' "
+ + "UNION SELECT OBJECT_NAME FROM INFORMATION_SCHEMA.ELEMENT_TYPES WHERE OBJECT_SCHEMA <> 'INFORMATION_SCHEMA' AND OBJECT_TYPE = 'TABLE' AND DATA_TYPE = 'JAVA_OBJECT'")
+ .mapTo(String.class).list();
if(!serializedColumns.isEmpty()) {
throw new RuntimeException(new StorageException("Wallet file contains unexpected serialized object columns: " + String.join(", ", serializedColumns) + "."));
}
### src/test/java/com/sparrowwallet/sparrow/io/DbPersistenceTest.java
@@ -168,6 +168,30 @@ public void analyzedWalletWithChildWalletsLoads() throws Exception {
}
}
+ @Test
+ public void objectInChildSchemaRejected() throws Exception {
+ for(String ddl : List.of("create constant \"wallet_%s\".k value 1", "create domain \"wallet_%s\".dm as int default 0",
+ "create force trigger \"wallet_%s\".tg before insert on \"wallet_%s\".\"wallet\" for each row call \"com.sparrowwallet.Missing\"",
+ "create table \"wallet_%s\".g(a int, b int generated always as (a + 1))", "create table PUBLIC.g(a int, b int generated always as (a + 1))",
+ "create table PUBLIC.c(a int check (a > 0))")) {
+ Storage storage = createUnencryptedWallet("Savings");
+ Wallet wallet = createWallet("Savings");
+ storage.saveWallet(wallet);
+ Wallet child = wallet.addChildWallet(StandardAccount.ACCOUNT_1);
+ storage.saveWallet(child);
+ storage.closeAndWait();
+
+ String path = storage.getWalletFile().getAbsolutePath();
+ String url = "jdbc:h2:" + path.substring(0, path.length() - ".mv.db".length()) + ";DATABASE_TO_UPPER=false;DB_CLOSE_ON_EXIT=FALSE";
+ try(Connection connection = DriverManager.getConnection(url, "sa", ""); Statement statement = connection.createStatement()) {
+ statement.execute(ddl.replace("%s", child.getName()));
+ }
+
+ assertRejected(storage.getWalletFile());
+ Files.delete(storage.getWalletFile().toPath());
+ }
+ }
+
private static final String TEST_XPUB = "xpub6BrhGFTWPd3DXo8s2BPxHHzCmBCyj8QvamcEUaq8EDwnwXpvvcU9LzpJqENHcqHkqwTn2vPhynGVoEqj3PAB3NxnYZrvCsSfoCniJKaggdy";
private Wallet createWallet(String walletName) {Why this scored 44/100
Community notes
Notes can correct, qualify, or add evidence to the AI analysis. Every note shown here has been validated by a human moderator.
The AI analysis stands alone for now. Submit a note if you can add evidence or important context.