AaronFiore/electrum
1
0
Fork 0
Code Activity

check_password_for_directory: safeguards

Browse Source
This commit is contained in:
ThomasV
2021-03-25 16:12:24 +01:00
parent 4b870f15a7
commit f14b7d5a12
1 changed files with 14 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
electrum/wallet.py
View File

@@ -3218,8 +3218,13 @@ def check_password_for_directory(config: SimpleConfig, old_password, new_passwor
is_unified = False is_unified = False
# it is a bit wasteful load the wallet here, but that is fine # it is a bit wasteful load the wallet here, but that is fine
# because we are progressively enforcing storage encryption. # because we are progressively enforcing storage encryption.
db = WalletDB(storage.read(), manual_upgrades=False) try:
wallet = Wallet(db, storage, config=config) db = WalletDB(storage.read(), manual_upgrades=False)
wallet = Wallet(db, storage, config=config)
except:
_logger.exception(f'failed to load {basename}:')
failed.append(basename)
continue
if wallet.has_keystore_encryption(): if wallet.has_keystore_encryption():
try: try:
wallet.check_password(old_password) wallet.check_password(old_password)
@@ -3240,8 +3245,13 @@ def check_password_for_directory(config: SimpleConfig, old_password, new_passwor
except: except:
failed.append(basename) failed.append(basename)
continue continue
db = WalletDB(storage.read(), manual_upgrades=False) try:
wallet = Wallet(db, storage, config=config) db = WalletDB(storage.read(), manual_upgrades=False)
wallet = Wallet(db, storage, config=config)
except:
_logger.exception(f'failed to load {basename}:')
failed.append(basename)
continue
try: try:
wallet.check_password(old_password) wallet.check_password(old_password)
except: except: