AaronFiore/electrum
1
0
Fork 0
Code Activity

keystore: Old_KeyStore: fix check_password(None) if ks has password

Browse Source 
check_password(None) should raise InvalidPassword when called on a keystore that has a password.

regression from f86bdc86a2

fixes https://github.com/spesmilo/electrum/issues/10142
This commit is contained in:
SomberNight
2025-08-16 18:08:10 +00:00
parent 392400295e
commit 2318cf7369
2 changed files with 16 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
electrum/keystore.py
View File

@@ -737,6 +737,8 @@ class Old_KeyStore(MasterPublicKeyMixin, Deterministic_KeyStore):
return Old_KeyStore({'mpk': self.mpk})
def _get_hex_seed(self, password) -> str:
if not is_hex_str(self.seed) and password is None:
raise InvalidPassword()
hex_str = pw_decode(self.seed, password, version=self.pw_hash_version)
assert is_hex_str(hex_str), f"expected hex str, got {type(hex_str)} with {len(hex_str)=}"
return hex_str

14
tests/test_wallet.py
View File

@@ -347,6 +347,20 @@ class TestWalletPassword(WalletTestCase):
wallet.check_password("wrong password")
wallet.check_password("1234")
async def test_update_password_of_standard_wallet_oldseed(self):
d = restore_wallet_from_text__for_unittest(
"powerful random nobody notice nothing important anyway look away hidden message over", path=self.wallet_path, config=self.config)
wallet = d['wallet'] # type: Standard_Wallet
wallet.check_password(None)
wallet.update_password(None, "1234")
with self.assertRaises(InvalidPassword):
wallet.check_password(None)
with self.assertRaises(InvalidPassword):
wallet.check_password("wrong password")
wallet.check_password("1234")
async def test_update_password_with_app_restarts(self):
wallet_str = '{"addr_history":{"1364Js2VG66BwRdkaoxAaFtdPb1eQgn8Dr":[],"15CyDgLffJsJgQrhcyooFH4gnVDG82pUrA":[],"1Exet2BhHsFxKTwhnfdsBMkPYLGvobxuW6":[]},"addresses":{"change":[],"receiving":["1364Js2VG66BwRdkaoxAaFtdPb1eQgn8Dr","1Exet2BhHsFxKTwhnfdsBMkPYLGvobxuW6","15CyDgLffJsJgQrhcyooFH4gnVDG82pUrA"]},"keystore":{"keypairs":{"0344b1588589958b0bcab03435061539e9bcf54677c104904044e4f8901f4ebdf5":"L2sED74axVXC4H8szBJ4rQJrkfem7UMc6usLCPUoEWxDCFGUaGUM","0389508c13999d08ffae0f434a085f4185922d64765c0bff2f66e36ad7f745cc5f":"L3Gi6EQLvYw8gEEUckmqawkevfj9s8hxoQDFveQJGZHTfyWnbk1U","04575f52b82f159fa649d2a4c353eb7435f30206f0a6cb9674fbd659f45082c37d559ffd19bea9c0d3b7dcc07a7b79f4cffb76026d5d4dff35341efe99056e22d2":"5JyVyXU1LiRXATvRTQvR9Kp8Rx1X84j2x49iGkjSsXipydtByUq"},"type":"imported"},"pruned_txo":{},"seed_version":13,"stored_height":-1,"transactions":{},"tx_fees":{},"txi":{},"txo":{},"use_encryption":false,"verified_tx3":{},"wallet_type":"standard","winpos-qt":[100,100,840,405]}'
storage = WalletStorage(self.wallet_path)