AaronFiore/electrum
1
0
Fork 0
Code Activity

wizard: don't log sensitive values: replace blacklist with whitelist

Browse Source 
- blacklist was missing yet another item "multisig_master_pubkey"
- let's just do a whitelist. a blacklist is too risky for my liking here.
This commit is contained in:
SomberNight
2024-02-13 13:51:53 +00:00
parent 7cf22d4b9f
commit 638fdf114e
1 changed files with 13 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
electrum/wizard.py
View File

@@ -163,10 +163,16 @@ class AbstractWizard:
self._logger.debug(logstr) self._logger.debug(logstr)
def sanitize_stack_item(self, _stack_item) -> dict: def sanitize_stack_item(self, _stack_item) -> dict:
sensitive_keys = [ whitelist = [
'seed', 'seed_extra_words', 'master_key', 'private_key_list', 'password', "wallet_name", "wallet_exists", "wallet_is_open", "wallet_needs_hw_unlock",
# trustedcoin: "wallet_type", "keystore_type", "seed_variant", "seed_type", "seed_extend",
'xprv1', 'xpub1', 'xpub2', 'xprv', 'xpub', "trustedcoin_keepordisable", "script_type", "derivation_path", "encrypt",
# hardware devices:
"hardware_device", "hw_type", "label", "soft_device_id",
# inside keystore:
"type", "pw_hash_version", "derivation", "root_fingerprint",
# multisig:
"multisig_participants", "multisig_signatures", "multisig_current_cosigner", "cosigner_keystore_type",
] ]
def sanitize(_dict): def sanitize(_dict):
@@ -175,10 +181,10 @@ class AbstractWizard:
if isinstance(_dict[item], dict): if isinstance(_dict[item], dict):
result[item] = sanitize(_dict[item]) result[item] = sanitize(_dict[item])
else: else:
if item in sensitive_keys: if item in whitelist:
result[item] = '<sensitive value removed>'
else:
result[item] = _dict[item] result[item] = _dict[item]
else:
result[item] = '<redacted>'
return result return result
return sanitize(_stack_item) return sanitize(_stack_item)