daemon.load_wallet to raise if given redundant password #8799
+125
−20
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
- for a wallet with no password, running commands with a pw given should raise InvalidPassword, instead of ignoring the provided pw - and for wallet.unlock, it is very confusing to save the given pw in memory, if the wallet does not actually use a pw
SomberNight
commented
Jan 10, 2024
Comment on lines
+518
to
+521
| if password: | ||
| # if a password was given, we check it. | ||
| # e.g. for unpassworded wallet, if given pw, we should raise. | ||
| wallet.check_password(password) |
There was a problem hiding this comment.
@ecdsa commented out of band that load_wallet should not care about the keystore, only about the storage (wallet.check_password tests both storage and keystore), and e.g. if a password is given to load_wallet for a wallet that only has keystore encryption, load_wallet should unconditionally raise, even if the provided password matches the keystore
diff --git a/electrum/daemon.py b/electrum/daemon.py
index 4cfd0012db..3225e590d5 100644
--- a/electrum/daemon.py
+++ b/electrum/daemon.py
@@ -510,6 +510,9 @@ class Daemon(Logger):
if not password:
raise InvalidPassword('No password given')
storage.decrypt(password)
+ else:
+ if password:
+ raise InvalidPassword("password given but wallet storage is not encrypted")
# read data, pass it to db
db = WalletDB(storage.read(), storage=storage, upgrade=upgrade)
if db.get_action():
ecdsa
added a commit
that referenced
this pull request
Jun 8, 2024
- the unlock command was replaced by an option to load_wallet, because some applications (the swapserver plugin) need to be executed with an unlocked password. Now the swapserver plugin waits until the wallet is unlocked. - wallet.unlock now checks password unconditionally, see #8799
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
(let's see if tests pass on CI)