AaronFiore/electrum
1
0
Fork 0
Code Activity

transaction: run validate_data before setting .utxo, not after

Browse Source 
Feels safer.
This commit is contained in:
SomberNight
2023-03-11 22:57:45 +00:00
parent 5ad4023e7d
commit 6a049a335a
1 changed files with 17 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

25
electrum/transaction.py
View File

@@ -1207,8 +1207,8 @@ class PartialTxInput(TxInput, PSBTSection):
# 'utxo' field in PSBT cannot be another PSBT: # 'utxo' field in PSBT cannot be another PSBT:
if not tx.is_complete(): if not tx.is_complete():
return return
self.validate_data(utxo=tx)
self._utxo = tx self._utxo = tx
self.validate_data()
@property @property
def witness_utxo(self): def witness_utxo(self):
@@ -1216,8 +1216,8 @@ class PartialTxInput(TxInput, PSBTSection):
@witness_utxo.setter @witness_utxo.setter
def witness_utxo(self, value: Optional[TxOutput]): def witness_utxo(self, value: Optional[TxOutput]):
self.validate_data(witness_utxo=value)
self._witness_utxo = value self._witness_utxo = value
self.validate_data()
@property @property
def pubkeys(self) -> Set[bytes]: def pubkeys(self) -> Set[bytes]:
@@ -1270,20 +1270,29 @@ class PartialTxInput(TxInput, PSBTSection):
is_coinbase_output=txin.is_coinbase_output()) is_coinbase_output=txin.is_coinbase_output())
return res return res
def validate_data(self, *, for_signing=False) -> None: def validate_data(
if self.utxo: self,
if self.prevout.txid.hex() != self.utxo.txid(): *,
for_signing=False,
# allow passing provisional fields for 'self', before setting them:
utxo: Optional[Transaction] = None,
witness_utxo: Optional[TxOutput] = None,
) -> None:
utxo = utxo or self.utxo
witness_utxo = witness_utxo or self.witness_utxo
if utxo:
if self.prevout.txid.hex() != utxo.txid():
raise PSBTInputConsistencyFailure(f"PSBT input validation: " raise PSBTInputConsistencyFailure(f"PSBT input validation: "
f"If a non-witness UTXO is provided, its hash must match the hash specified in the prevout") f"If a non-witness UTXO is provided, its hash must match the hash specified in the prevout")
if self.witness_utxo: if witness_utxo:
if self.utxo.outputs()[self.prevout.out_idx] != self.witness_utxo: if utxo.outputs()[self.prevout.out_idx] != witness_utxo:
raise PSBTInputConsistencyFailure(f"PSBT input validation: " raise PSBTInputConsistencyFailure(f"PSBT input validation: "
f"If both non-witness UTXO and witness UTXO are provided, they must be consistent") f"If both non-witness UTXO and witness UTXO are provided, they must be consistent")
# The following test is disabled, so we are willing to sign non-segwit inputs # The following test is disabled, so we are willing to sign non-segwit inputs
# without verifying the input amount. This means, given a maliciously modified PSBT, # without verifying the input amount. This means, given a maliciously modified PSBT,
# for non-segwit inputs, we might end up burning coins as miner fees. # for non-segwit inputs, we might end up burning coins as miner fees.
if for_signing and False: if for_signing and False:
if not self.is_segwit() and self.witness_utxo: if not self.is_segwit() and witness_utxo:
raise PSBTInputConsistencyFailure(f"PSBT input validation: " raise PSBTInputConsistencyFailure(f"PSBT input validation: "
f"If a witness UTXO is provided, no non-witness signature may be created") f"If a witness UTXO is provided, no non-witness signature may be created")
if self.redeem_script and self.address: if self.redeem_script and self.address: