arno/trezor-firmware
1
0
Fork 0
mirror of https://github.com/trezor/trezor-firmware.git synced 2025-04-24 11:09:09 +00:00
Code Issues Releases Wiki Activity

feat(python): make failing to resume session hard-fail

Browse Source
This commit is contained in:
M1nd3r 2025-03-06 18:00:45 +01:00
parent 69cbc25c3d
commit 260c399d01
1 changed files with 15 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
python/src/trezorlib/cli/__init__.py
View File

@ -144,7 +144,14 @@ class TrezorConnection:
if must_resume:
if session.id != self.session_id or session.id is None:
click.echo("Failed to resume session")
RuntimeError("Failed to resume session - no session id provided")
env_var = os.environ.get("TREZOR_SESSION_ID")
if env_var and bytes.fromhex(env_var) == self.session_id:
click.echo(
"Session-id stored in TREZOR_SESSION_ID is no longer valid. Call 'unset TREZOR_SESSION_ID' to clear it."
)
raise exceptions.FailedSessionResumption(
received_session_id=session.id
)
return session
features = client.protocol.get_features()
@ -164,7 +171,7 @@ class TrezorConnection:
available_on_device = Capability.PassphraseEntry in features.capabilities
passphrase = get_passphrase(available_on_device, self.passphrase_on_host)
session = client.get_session(
passphrase=passphrase, derive_cardano=derive_cardano, should_derive=True
passphrase=passphrase, derive_cardano=derive_cardano
)
return session
@ -263,6 +270,8 @@ class TrezorConnection:
except transport.DeviceIsBusy:
click.echo("Device is in use by another process.")
sys.exit(1)
except exceptions.FailedSessionResumption:
sys.exit(1)
except Exception:
click.echo("Failed to find a Trezor device.")
if self.path is not None:
@ -304,17 +313,19 @@ def with_session(
def function_with_session(
obj: TrezorConnection, *args: "P.args", **kwargs: "P.kwargs"
) -> "R":
is_resume_mandatory = must_resume or obj.session_id is not None
with obj.session_context(
empty_passphrase=empty_passphrase,
derive_cardano=derive_cardano,
seedless=seedless,
must_resume=must_resume,
must_resume=is_resume_mandatory,
) as session:
try:
return func(session, *args, **kwargs)
finally:
if not must_resume:
if not is_resume_mandatory:
session.end()
return function_with_session