arno/trezor-firmware
1
0
Fork 0
mirror of https://github.com/trezor/trezor-firmware.git synced 2025-02-27 06:42:02 +00:00
Code Issues Releases Wiki Activity

feat(python): implement session based trezorctl

Browse Source 
[no changelog]
This commit is contained in:
M1nd3r 2025-02-04 15:18:39 +01:00
parent a5f7a8b0a4
commit a43692f7b2
2 changed files with 10 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -30,7 +30,7 @@ from .. import exceptions, transport, ui
from ..client import ProtocolVersion, TrezorClient from ..client import ProtocolVersion, TrezorClient
from ..messages import Capability from ..messages import Capability
from ..transport import Transport from ..transport import Transport
from ..transport.session import Session, SessionV1 from ..transport.session import Session, SessionV1, SessionV2
from ..transport.thp.channel_database import ChannelDatabase, get_channel_db from ..transport.thp.channel_database import ChannelDatabase, get_channel_db
LOG = logging.getLogger(__name__) LOG = logging.getLogger(__name__)
@ -148,7 +148,7 @@ class TrezorConnection:
empty_passphrase: bool = False, empty_passphrase: bool = False,
must_resume: bool = False, must_resume: bool = False,
) -> Session: ) -> Session:
client = self.get_client() client = self.get_client() # add channel database
if must_resume and self.session_id is None: if must_resume and self.session_id is None:
click.echo("Failed to resume session - no session id provided") click.echo("Failed to resume session - no session id provided")
raise RuntimeError("Failed to resume session - no session id provided") raise RuntimeError("Failed to resume session - no session id provided")
@ -159,6 +159,9 @@ class TrezorConnection:
session = SessionV1.resume_from_id( session = SessionV1.resume_from_id(
client=client, session_id=self.session_id client=client, session_id=self.session_id
) )
elif client.protocol_version is ProtocolVersion.PROTOCOL_V2:
session = SessionV2(client, self.session_id)
# TODO fix resumption on THP
else: else:
raise Exception("Unsupported client protocol", client.protocol_version) raise Exception("Unsupported client protocol", client.protocol_version)
if must_resume: if must_resume:
@ -361,7 +364,8 @@ def with_client(
try: try:
return func(client, *args, **kwargs) return func(client, *args, **kwargs)
finally: finally:
pass if client.protocol_version == ProtocolVersion.PROTOCOL_V2:
get_channel_db().save_channel(client.protocol)
# if not session_was_resumed: # if not session_was_resumed:
# try: # try:
# client.end_session() # client.end_session()

4
python/src/trezorlib/cli/trezorctl.py
View File

@ -25,7 +25,7 @@ from typing import TYPE_CHECKING, Any, Callable, Iterable, Optional, TypeVar, ca
import click import click
from .. import __version__, log, messages, protobuf from .. import __version__, log, messages, protobuf
from ..client import TrezorClient from ..client import ProtocolVersion, TrezorClient
from ..transport import DeviceIsBusy, enumerate_devices from ..transport import DeviceIsBusy, enumerate_devices
from ..transport.session import Session from ..transport.session import Session
from ..transport.thp import channel_database from ..transport.thp import channel_database
@ -309,6 +309,8 @@ def list_devices(no_resolve: bool) -> Optional[Iterable["Transport"]]:
try: try:
client = get_client(transport, get_channel_db()) client = get_client(transport, get_channel_db())
description = format_device_name(client.features) description = format_device_name(client.features)
if client.protocol_version == ProtocolVersion.PROTOCOL_V2:
get_channel_db().save_channel(client.protocol)
except DeviceIsBusy: except DeviceIsBusy:
description = "Device is in use by another process" description = "Device is in use by another process"
except Exception as e: except Exception as e: