AaronFiore/electrum
1
0
Fork 0
Code Activity

daemon: get_wallet: handle OSError for weiiird paths

Browse Source 
I think _wallet_key_from_path should not raise.
This is probably the sane way to deal with this.
Though all this is assuming that os.path.realpath can be treated as consistent/stateless.

closes https://github.com/spesmilo/electrum/issues/10182
This commit is contained in:
SomberNight
2025-09-03 14:14:22 +00:00
parent 4a0a3bb38a
commit c68deb25ff
2 changed files with 7 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
electrum/daemon.py
View File

@@ -462,7 +462,11 @@ class Daemon(Logger):
# note: the path returned by realpath has been observed NOT to work for FS operations! # note: the path returned by realpath has been observed NOT to work for FS operations!
# (e.g. for Cryptomator WinFSP/FUSE mounts, see #8495). # (e.g. for Cryptomator WinFSP/FUSE mounts, see #8495).
# It is okay for us to use it for computing a canonical wallet *key*, but cannot be used as a path! # It is okay for us to use it for computing a canonical wallet *key*, but cannot be used as a path!
path = os.path.realpath(path) try:
path = os.path.realpath(path, strict=False)
except OSError as e: # see #10182
_logger.warning(f"could not parse {path!r}: {e!r}")
path = path
# - "normcase" does Windows-specific case and slash normalisation: # - "normcase" does Windows-specific case and slash normalisation:
path = os.path.normcase(path) path = os.path.normcase(path)
# - prepend header to break usage of wallet keys as fs paths # - prepend header to break usage of wallet keys as fs paths
@@ -672,7 +676,7 @@ class Daemon(Logger):
if not os.path.isfile(path): if not os.path.isfile(path):
continue continue
wallet = self.get_wallet(path) wallet = self.get_wallet(path)
# note: we only create a new wallet object if one was not loaded into the wallet already. # note: we only create a new wallet object if one was not loaded into the daemon already.
# This is to avoid having two wallet objects contending for the same file. # This is to avoid having two wallet objects contending for the same file.
# Take care: this only works if the daemon knows about all wallet objects. # Take care: this only works if the daemon knows about all wallet objects.
# if other code already has created a Wallet() for a file but did not tell the daemon, # if other code already has created a Wallet() for a file but did not tell the daemon,

2
electrum/gui/qml/qedaemon.py
View File

@@ -38,7 +38,7 @@ class QEWalletListModel(QAbstractListModel):
_ROLE_KEYS = range(Qt.ItemDataRole.UserRole, Qt.ItemDataRole.UserRole + len(_ROLE_NAMES)) _ROLE_KEYS = range(Qt.ItemDataRole.UserRole, Qt.ItemDataRole.UserRole + len(_ROLE_NAMES))
_ROLE_MAP = dict(zip(_ROLE_KEYS, [bytearray(x.encode()) for x in _ROLE_NAMES])) _ROLE_MAP = dict(zip(_ROLE_KEYS, [bytearray(x.encode()) for x in _ROLE_NAMES]))
def __init__(self, daemon, parent=None): def __init__(self, daemon: 'Daemon', parent=None):
QAbstractListModel.__init__(self, parent) QAbstractListModel.__init__(self, parent)
self.daemon = daemon self.daemon = daemon
self._wallets = [] self._wallets = []