From 815510db0b837cf1fbba0e265664f9390d5c71eb Mon Sep 17 00:00:00 2001
From: "Jamie C. Driver" <jamie@blockstream.io>
Date: Thu, 25 Jul 2024 16:35:17 +0100
Subject: [PATCH] psbt: explicit check of lead magic bytes before attempting
 full parse

---
 main/process/sign_psbt.c      | 11 +++++++++++
 test_data/psbt_tm_liquid.json |  7 +++++++
 test_jade.py                  | 21 ++++++++++++++++-----
 3 files changed, 34 insertions(+), 5 deletions(-)
 create mode 100644 test_data/psbt_tm_liquid.json

diff --git a/main/process/sign_psbt.c b/main/process/sign_psbt.c
index f3e94c18..e1796d03 100644
--- a/main/process/sign_psbt.c
+++ b/main/process/sign_psbt.c
@@ -31,6 +31,9 @@ bool show_btc_fee_confirmation_activity(const struct wally_tx* tx, const output_
 
 static void wally_free_psbt_wrapper(void* psbt) { JADE_WALLY_VERIFY(wally_psbt_free((struct wally_psbt*)psbt)); }
 
+// From https://github.com/bitcoin/bips/blob/master/bip-0174.mediawiki
+static const uint8_t PSBT_MAGIC_PREFIX[5] = { 0x70, 0x73, 0x62, 0x74, 0xFF }; // 'psbt' + 0xff
+
 // Cache what type of inputs we are signing
 #define PSBT_SIGNING_SINGLESIG 0x1
 #define PSBT_SIGNING_MULTISIG 0x2
@@ -992,6 +995,14 @@ bool deserialise_psbt(const uint8_t* psbt_bytes, const size_t psbt_len, struct w
 {
     JADE_ASSERT(psbt_bytes);
     JADE_INIT_OUT_PPTR(psbt_out);
+
+    // Sanity check lead bytes before attempting full parse
+    // NOTE: libwally supports PSET (elements) which Jade does not as yet.
+    if (psbt_len < sizeof(PSBT_MAGIC_PREFIX) || memcmp(psbt_bytes, PSBT_MAGIC_PREFIX, sizeof(PSBT_MAGIC_PREFIX))) {
+        JADE_LOGE("Unexpected leading 'magic' bytes for PSBT");
+        return false;
+    }
+
     return wally_psbt_from_bytes(psbt_bytes, psbt_len, WALLY_PSBT_PARSE_FLAG_STRICT, psbt_out) == WALLY_OK && *psbt_out;
 }
 
diff --git a/test_data/psbt_tm_liquid.json b/test_data/psbt_tm_liquid.json
new file mode 100644
index 00000000..1c4f489f
--- /dev/null
+++ b/test_data/psbt_tm_liquid.json
@@ -0,0 +1,7 @@
+{
+  "input": {
+    "network": "testnet",
+    "psbt": "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"
+  },
+  "expected_error": "Failed to extract psbt from passed bytes"
+}
diff --git a/test_jade.py b/test_jade.py
index f470ef8a..f259d14f 100644
--- a/test_jade.py
+++ b/test_jade.py
@@ -69,12 +69,14 @@ def _h2b_test_case(testcase):
             testcase['expected_output'] = h2b(testcase['expected_output'])
 
     elif 'psbt' in testcase['input']:
-        # sign-psbt data
         testcase['input']['psbt'] = base64.b64decode(testcase['input']['psbt'])
-        testcase['expected_output']['psbt'] = base64.b64decode(testcase['expected_output']['psbt'])
 
-        if 'txn' in testcase['expected_output']:
-            testcase['expected_output']['txn'] = h2b(testcase['expected_output']['txn'])
+        if 'expected_output' in testcase:
+            expected_output = testcase['expected_output']
+            expected_output['psbt'] = base64.b64decode(expected_output['psbt'])
+
+            if 'txn' in expected_output:
+                expected_output['txn'] = h2b(expected_output['txn'])
 
     elif 'message' in testcase['input']:
         # sign-msg test data
@@ -2652,7 +2654,16 @@ def test_sign_liquid_tx(jadeapi, has_psram, has_ble, pattern):
 
 def test_sign_psbt(jadeapi, cases):
     for txn_data in _get_test_cases(cases):
-        rslt = jadeapi.sign_psbt(txn_data['input']['network'], txn_data['input']['psbt'])
+        try:
+            rslt = jadeapi.sign_psbt(txn_data['input']['network'], txn_data['input']['psbt'])
+        except JadeError as err:
+            # Check expected error
+            assert 'expected_output' not in txn_data
+            assert err.message == txn_data['expected_error']
+            continue
+
+        # Othewise, should have worked, check expected output
+        assert 'expected_error' not in txn_data
         assert rslt == txn_data['expected_output']['psbt'], base64.b64encode(rslt).decode()
 
         # Optionally test extracted tx