2018-06-21 14:28:34 +00:00
|
|
|
# This file is part of the Trezor project.
|
2016-11-25 21:53:55 +00:00
|
|
|
#
|
2019-05-29 16:44:09 +00:00
|
|
|
# Copyright (C) 2012-2019 SatoshiLabs and contributors
|
2016-11-25 21:53:55 +00:00
|
|
|
#
|
|
|
|
# This library is free software: you can redistribute it and/or modify
|
2018-06-21 14:28:34 +00:00
|
|
|
# it under the terms of the GNU Lesser General Public License version 3
|
|
|
|
# as published by the Free Software Foundation.
|
2016-11-25 21:53:55 +00:00
|
|
|
#
|
|
|
|
# This library is distributed in the hope that it will be useful,
|
|
|
|
# but WITHOUT ANY WARRANTY; without even the implied warranty of
|
|
|
|
# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
|
|
|
# GNU Lesser General Public License for more details.
|
|
|
|
#
|
2018-06-21 14:28:34 +00:00
|
|
|
# You should have received a copy of the License along with this library.
|
|
|
|
# If not, see <https://www.gnu.org/licenses/lgpl-3.0.html>.
|
2016-11-25 21:53:55 +00:00
|
|
|
|
2018-08-13 16:21:24 +00:00
|
|
|
import logging
|
2018-01-29 16:46:24 +00:00
|
|
|
import struct
|
2018-08-13 16:21:24 +00:00
|
|
|
from io import BytesIO
|
2019-02-18 19:43:08 +00:00
|
|
|
from typing import Any, Dict, Iterable, Optional
|
2018-08-13 16:21:24 +00:00
|
|
|
|
|
|
|
import requests
|
2017-08-24 12:29:27 +00:00
|
|
|
|
2018-08-13 16:21:24 +00:00
|
|
|
from .. import mapping, protobuf
|
2019-03-07 13:16:48 +00:00
|
|
|
from . import Transport, TransportException
|
2014-07-26 14:27:28 +00:00
|
|
|
|
2018-05-24 15:55:41 +00:00
|
|
|
LOG = logging.getLogger(__name__)
|
|
|
|
|
2018-08-13 16:21:24 +00:00
|
|
|
TREZORD_HOST = "http://127.0.0.1:21325"
|
2018-11-08 17:06:58 +00:00
|
|
|
TREZORD_ORIGIN_HEADER = {"Origin": "https://python.trezor.io"}
|
2014-07-26 14:27:28 +00:00
|
|
|
|
2018-11-08 17:52:15 +00:00
|
|
|
TREZORD_VERSION_MODERN = (2, 0, 25)
|
|
|
|
|
2018-11-08 17:06:58 +00:00
|
|
|
CONNECTION = requests.Session()
|
|
|
|
CONNECTION.headers.update(TREZORD_ORIGIN_HEADER)
|
2017-06-23 19:31:42 +00:00
|
|
|
|
2018-11-08 17:06:58 +00:00
|
|
|
|
|
|
|
def call_bridge(uri: str, data=None) -> requests.Response:
|
|
|
|
url = TREZORD_HOST + "/" + uri
|
|
|
|
r = CONNECTION.post(url, data=data)
|
|
|
|
if r.status_code != 200:
|
|
|
|
error_str = "trezord: {} failed with code {}: {}".format(
|
|
|
|
uri, r.status_code, r.json()["error"]
|
|
|
|
)
|
|
|
|
raise TransportException(error_str)
|
|
|
|
return r
|
trezorlib: transport/protocol reshuffle
This commit breaks session handling (which matters with Bridge) and
regresses Bridge to an older code state. Both of these issues will be
rectified in subsequent commits.
Explanation of this big API reshuffle follows:
* protocols are moved to trezorlib.transport, and to a single common file.
* there is a cleaner definition of Transport and Protocol API (see below)
* fully valid mypy type hinting
* session handle counters and open handle counters mostly went away. Transports
and Protocols are meant to be "raw" APIs; TrezorClient will implement
context-handler-based sessions, session tracking, etc.
I'm calling this a "reshuffle" because it involved very small number of
code changes. Most of it is moving things around where they sit better.
The API changes are as follows.
Transport is now a thing that can:
* open and close sessions
* read and write protobuf messages
* enumerate and find devices
Some transports (all except bridge) are technically bytes-based and need
a separate protocol implementation (because we have two existing protocols,
although only the first one is actually used). Hence a protocol superclass.
Protocol is a thing that *also* can:
* open and close sessions
* read and write protobuf messages
For that, it requires a `handle`.
Handle is a physical layer for a protocol. It can:
* open and close some sort of device connection
(this is distinct from session! Connection is a channel over which you can
send data. Session is a logical arrangement on top of that; you can have
multiple sessions on a single connection.)
* read and write 64-byte chunks of data
With that, we introduce ProtocolBasedTransport, which simply delegates
the appropriate Transport functionality to respective Protocol methods.
hid and webusb transports are ProtocolBasedTransport-s that provide separate
device handles. HidHandle and WebUsbHandle existed before, but the distinction
of functionality between a Transport and its Handle was unclear. Some methods
were moved and now the handles implement the Handle API, while the transports
provide the enumeration parts of the Transport API, as well as glue between
the respective Protocols and Handles.
udp transport is also a ProtocolBasedTransport, but it acts as its own handle.
(That might be changed. For now, I went with the pre-existing structure.)
In addition, session_begin/end is renamed to begin/end_session to keep
consistent verb_noun naming.
2018-11-08 14:24:28 +00:00
|
|
|
|
|
|
|
|
2018-11-08 17:52:15 +00:00
|
|
|
def is_legacy_bridge() -> bool:
|
|
|
|
config = call_bridge("configure").json()
|
|
|
|
version_tuple = tuple(map(int, config["version"].split(".")))
|
|
|
|
return version_tuple < TREZORD_VERSION_MODERN
|
|
|
|
|
|
|
|
|
|
|
|
class BridgeHandle:
|
|
|
|
def __init__(self, transport: "BridgeTransport") -> None:
|
|
|
|
self.transport = transport
|
|
|
|
|
|
|
|
def read_buf(self) -> bytes:
|
|
|
|
raise NotImplementedError
|
|
|
|
|
|
|
|
def write_buf(self, buf: bytes) -> None:
|
|
|
|
raise NotImplementedError
|
|
|
|
|
|
|
|
|
|
|
|
class BridgeHandleModern(BridgeHandle):
|
|
|
|
def write_buf(self, buf: bytes) -> None:
|
|
|
|
self.transport._call("post", data=buf.hex())
|
|
|
|
|
|
|
|
def read_buf(self) -> bytes:
|
|
|
|
data = self.transport._call("read")
|
|
|
|
return bytes.fromhex(data.text)
|
|
|
|
|
|
|
|
|
|
|
|
class BridgeHandleLegacy(BridgeHandle):
|
|
|
|
def __init__(self, transport: "BridgeTransport") -> None:
|
|
|
|
super().__init__(transport)
|
|
|
|
self.request = None # type: Optional[str]
|
|
|
|
|
|
|
|
def write_buf(self, buf: bytes) -> None:
|
|
|
|
if self.request is not None:
|
|
|
|
raise TransportException("Can't write twice on legacy Bridge")
|
|
|
|
self.request = buf.hex()
|
|
|
|
|
|
|
|
def read_buf(self) -> bytes:
|
|
|
|
if self.request is None:
|
|
|
|
raise TransportException("Can't read without write on legacy Bridge")
|
|
|
|
try:
|
|
|
|
data = self.transport._call("call", data=self.request)
|
|
|
|
return bytes.fromhex(data.text)
|
|
|
|
finally:
|
|
|
|
self.request = None
|
|
|
|
|
|
|
|
|
2017-08-24 12:29:27 +00:00
|
|
|
class BridgeTransport(Transport):
|
2018-08-13 16:21:24 +00:00
|
|
|
"""
|
2017-08-24 12:29:27 +00:00
|
|
|
BridgeTransport implements transport through TREZOR Bridge (aka trezord).
|
2018-08-13 16:21:24 +00:00
|
|
|
"""
|
2017-04-20 11:16:15 +00:00
|
|
|
|
2018-08-13 16:21:24 +00:00
|
|
|
PATH_PREFIX = "bridge"
|
2018-11-23 11:09:49 +00:00
|
|
|
ENABLED = True
|
2018-02-02 18:17:48 +00:00
|
|
|
|
2018-11-08 17:52:15 +00:00
|
|
|
def __init__(
|
|
|
|
self, device: Dict[str, Any], legacy: bool, debug: bool = False
|
|
|
|
) -> None:
|
|
|
|
if legacy and debug:
|
|
|
|
raise TransportException("Debugging not supported on legacy Bridge")
|
|
|
|
|
2017-08-24 12:29:27 +00:00
|
|
|
self.device = device
|
trezorlib: transport/protocol reshuffle
This commit breaks session handling (which matters with Bridge) and
regresses Bridge to an older code state. Both of these issues will be
rectified in subsequent commits.
Explanation of this big API reshuffle follows:
* protocols are moved to trezorlib.transport, and to a single common file.
* there is a cleaner definition of Transport and Protocol API (see below)
* fully valid mypy type hinting
* session handle counters and open handle counters mostly went away. Transports
and Protocols are meant to be "raw" APIs; TrezorClient will implement
context-handler-based sessions, session tracking, etc.
I'm calling this a "reshuffle" because it involved very small number of
code changes. Most of it is moving things around where they sit better.
The API changes are as follows.
Transport is now a thing that can:
* open and close sessions
* read and write protobuf messages
* enumerate and find devices
Some transports (all except bridge) are technically bytes-based and need
a separate protocol implementation (because we have two existing protocols,
although only the first one is actually used). Hence a protocol superclass.
Protocol is a thing that *also* can:
* open and close sessions
* read and write protobuf messages
For that, it requires a `handle`.
Handle is a physical layer for a protocol. It can:
* open and close some sort of device connection
(this is distinct from session! Connection is a channel over which you can
send data. Session is a logical arrangement on top of that; you can have
multiple sessions on a single connection.)
* read and write 64-byte chunks of data
With that, we introduce ProtocolBasedTransport, which simply delegates
the appropriate Transport functionality to respective Protocol methods.
hid and webusb transports are ProtocolBasedTransport-s that provide separate
device handles. HidHandle and WebUsbHandle existed before, but the distinction
of functionality between a Transport and its Handle was unclear. Some methods
were moved and now the handles implement the Handle API, while the transports
provide the enumeration parts of the Transport API, as well as glue between
the respective Protocols and Handles.
udp transport is also a ProtocolBasedTransport, but it acts as its own handle.
(That might be changed. For now, I went with the pre-existing structure.)
In addition, session_begin/end is renamed to begin/end_session to keep
consistent verb_noun naming.
2018-11-08 14:24:28 +00:00
|
|
|
self.session = None # type: Optional[str]
|
2018-11-08 17:52:15 +00:00
|
|
|
self.debug = debug
|
|
|
|
self.legacy = legacy
|
|
|
|
|
|
|
|
if legacy:
|
|
|
|
self.handle = BridgeHandleLegacy(self) # type: BridgeHandle
|
|
|
|
else:
|
|
|
|
self.handle = BridgeHandleModern(self)
|
2015-12-21 17:18:06 +00:00
|
|
|
|
trezorlib: transport/protocol reshuffle
This commit breaks session handling (which matters with Bridge) and
regresses Bridge to an older code state. Both of these issues will be
rectified in subsequent commits.
Explanation of this big API reshuffle follows:
* protocols are moved to trezorlib.transport, and to a single common file.
* there is a cleaner definition of Transport and Protocol API (see below)
* fully valid mypy type hinting
* session handle counters and open handle counters mostly went away. Transports
and Protocols are meant to be "raw" APIs; TrezorClient will implement
context-handler-based sessions, session tracking, etc.
I'm calling this a "reshuffle" because it involved very small number of
code changes. Most of it is moving things around where they sit better.
The API changes are as follows.
Transport is now a thing that can:
* open and close sessions
* read and write protobuf messages
* enumerate and find devices
Some transports (all except bridge) are technically bytes-based and need
a separate protocol implementation (because we have two existing protocols,
although only the first one is actually used). Hence a protocol superclass.
Protocol is a thing that *also* can:
* open and close sessions
* read and write protobuf messages
For that, it requires a `handle`.
Handle is a physical layer for a protocol. It can:
* open and close some sort of device connection
(this is distinct from session! Connection is a channel over which you can
send data. Session is a logical arrangement on top of that; you can have
multiple sessions on a single connection.)
* read and write 64-byte chunks of data
With that, we introduce ProtocolBasedTransport, which simply delegates
the appropriate Transport functionality to respective Protocol methods.
hid and webusb transports are ProtocolBasedTransport-s that provide separate
device handles. HidHandle and WebUsbHandle existed before, but the distinction
of functionality between a Transport and its Handle was unclear. Some methods
were moved and now the handles implement the Handle API, while the transports
provide the enumeration parts of the Transport API, as well as glue between
the respective Protocols and Handles.
udp transport is also a ProtocolBasedTransport, but it acts as its own handle.
(That might be changed. For now, I went with the pre-existing structure.)
In addition, session_begin/end is renamed to begin/end_session to keep
consistent verb_noun naming.
2018-11-08 14:24:28 +00:00
|
|
|
def get_path(self) -> str:
|
2018-08-13 16:21:24 +00:00
|
|
|
return "%s:%s" % (self.PATH_PREFIX, self.device["path"])
|
2015-12-21 17:18:06 +00:00
|
|
|
|
2018-11-08 17:52:15 +00:00
|
|
|
def find_debug(self) -> "BridgeTransport":
|
|
|
|
if not self.device.get("debug"):
|
|
|
|
raise TransportException("Debug device not available")
|
|
|
|
return BridgeTransport(self.device, self.legacy, debug=True)
|
2017-08-24 12:29:27 +00:00
|
|
|
|
2018-11-08 17:06:58 +00:00
|
|
|
def _call(self, action: str, data: str = None) -> requests.Response:
|
|
|
|
session = self.session or "null"
|
|
|
|
uri = action + "/" + str(session)
|
2018-11-08 17:52:15 +00:00
|
|
|
if self.debug:
|
|
|
|
uri = "debug/" + uri
|
2018-11-08 17:06:58 +00:00
|
|
|
return call_bridge(uri, data=data)
|
|
|
|
|
2018-11-08 17:52:15 +00:00
|
|
|
@classmethod
|
|
|
|
def enumerate(cls) -> Iterable["BridgeTransport"]:
|
|
|
|
try:
|
|
|
|
legacy = is_legacy_bridge()
|
|
|
|
return [
|
|
|
|
BridgeTransport(dev, legacy) for dev in call_bridge("enumerate").json()
|
|
|
|
]
|
|
|
|
except Exception:
|
|
|
|
return []
|
|
|
|
|
trezorlib: transport/protocol reshuffle
This commit breaks session handling (which matters with Bridge) and
regresses Bridge to an older code state. Both of these issues will be
rectified in subsequent commits.
Explanation of this big API reshuffle follows:
* protocols are moved to trezorlib.transport, and to a single common file.
* there is a cleaner definition of Transport and Protocol API (see below)
* fully valid mypy type hinting
* session handle counters and open handle counters mostly went away. Transports
and Protocols are meant to be "raw" APIs; TrezorClient will implement
context-handler-based sessions, session tracking, etc.
I'm calling this a "reshuffle" because it involved very small number of
code changes. Most of it is moving things around where they sit better.
The API changes are as follows.
Transport is now a thing that can:
* open and close sessions
* read and write protobuf messages
* enumerate and find devices
Some transports (all except bridge) are technically bytes-based and need
a separate protocol implementation (because we have two existing protocols,
although only the first one is actually used). Hence a protocol superclass.
Protocol is a thing that *also* can:
* open and close sessions
* read and write protobuf messages
For that, it requires a `handle`.
Handle is a physical layer for a protocol. It can:
* open and close some sort of device connection
(this is distinct from session! Connection is a channel over which you can
send data. Session is a logical arrangement on top of that; you can have
multiple sessions on a single connection.)
* read and write 64-byte chunks of data
With that, we introduce ProtocolBasedTransport, which simply delegates
the appropriate Transport functionality to respective Protocol methods.
hid and webusb transports are ProtocolBasedTransport-s that provide separate
device handles. HidHandle and WebUsbHandle existed before, but the distinction
of functionality between a Transport and its Handle was unclear. Some methods
were moved and now the handles implement the Handle API, while the transports
provide the enumeration parts of the Transport API, as well as glue between
the respective Protocols and Handles.
udp transport is also a ProtocolBasedTransport, but it acts as its own handle.
(That might be changed. For now, I went with the pre-existing structure.)
In addition, session_begin/end is renamed to begin/end_session to keep
consistent verb_noun naming.
2018-11-08 14:24:28 +00:00
|
|
|
def begin_session(self) -> None:
|
2018-11-08 17:06:58 +00:00
|
|
|
data = self._call("acquire/" + self.device["path"])
|
|
|
|
self.session = data.json()["session"]
|
2014-07-26 14:27:28 +00:00
|
|
|
|
trezorlib: transport/protocol reshuffle
This commit breaks session handling (which matters with Bridge) and
regresses Bridge to an older code state. Both of these issues will be
rectified in subsequent commits.
Explanation of this big API reshuffle follows:
* protocols are moved to trezorlib.transport, and to a single common file.
* there is a cleaner definition of Transport and Protocol API (see below)
* fully valid mypy type hinting
* session handle counters and open handle counters mostly went away. Transports
and Protocols are meant to be "raw" APIs; TrezorClient will implement
context-handler-based sessions, session tracking, etc.
I'm calling this a "reshuffle" because it involved very small number of
code changes. Most of it is moving things around where they sit better.
The API changes are as follows.
Transport is now a thing that can:
* open and close sessions
* read and write protobuf messages
* enumerate and find devices
Some transports (all except bridge) are technically bytes-based and need
a separate protocol implementation (because we have two existing protocols,
although only the first one is actually used). Hence a protocol superclass.
Protocol is a thing that *also* can:
* open and close sessions
* read and write protobuf messages
For that, it requires a `handle`.
Handle is a physical layer for a protocol. It can:
* open and close some sort of device connection
(this is distinct from session! Connection is a channel over which you can
send data. Session is a logical arrangement on top of that; you can have
multiple sessions on a single connection.)
* read and write 64-byte chunks of data
With that, we introduce ProtocolBasedTransport, which simply delegates
the appropriate Transport functionality to respective Protocol methods.
hid and webusb transports are ProtocolBasedTransport-s that provide separate
device handles. HidHandle and WebUsbHandle existed before, but the distinction
of functionality between a Transport and its Handle was unclear. Some methods
were moved and now the handles implement the Handle API, while the transports
provide the enumeration parts of the Transport API, as well as glue between
the respective Protocols and Handles.
udp transport is also a ProtocolBasedTransport, but it acts as its own handle.
(That might be changed. For now, I went with the pre-existing structure.)
In addition, session_begin/end is renamed to begin/end_session to keep
consistent verb_noun naming.
2018-11-08 14:24:28 +00:00
|
|
|
def end_session(self) -> None:
|
2017-08-24 12:29:27 +00:00
|
|
|
if not self.session:
|
|
|
|
return
|
2018-11-08 17:06:58 +00:00
|
|
|
self._call("release")
|
2017-08-24 12:29:27 +00:00
|
|
|
self.session = None
|
|
|
|
|
trezorlib: transport/protocol reshuffle
This commit breaks session handling (which matters with Bridge) and
regresses Bridge to an older code state. Both of these issues will be
rectified in subsequent commits.
Explanation of this big API reshuffle follows:
* protocols are moved to trezorlib.transport, and to a single common file.
* there is a cleaner definition of Transport and Protocol API (see below)
* fully valid mypy type hinting
* session handle counters and open handle counters mostly went away. Transports
and Protocols are meant to be "raw" APIs; TrezorClient will implement
context-handler-based sessions, session tracking, etc.
I'm calling this a "reshuffle" because it involved very small number of
code changes. Most of it is moving things around where they sit better.
The API changes are as follows.
Transport is now a thing that can:
* open and close sessions
* read and write protobuf messages
* enumerate and find devices
Some transports (all except bridge) are technically bytes-based and need
a separate protocol implementation (because we have two existing protocols,
although only the first one is actually used). Hence a protocol superclass.
Protocol is a thing that *also* can:
* open and close sessions
* read and write protobuf messages
For that, it requires a `handle`.
Handle is a physical layer for a protocol. It can:
* open and close some sort of device connection
(this is distinct from session! Connection is a channel over which you can
send data. Session is a logical arrangement on top of that; you can have
multiple sessions on a single connection.)
* read and write 64-byte chunks of data
With that, we introduce ProtocolBasedTransport, which simply delegates
the appropriate Transport functionality to respective Protocol methods.
hid and webusb transports are ProtocolBasedTransport-s that provide separate
device handles. HidHandle and WebUsbHandle existed before, but the distinction
of functionality between a Transport and its Handle was unclear. Some methods
were moved and now the handles implement the Handle API, while the transports
provide the enumeration parts of the Transport API, as well as glue between
the respective Protocols and Handles.
udp transport is also a ProtocolBasedTransport, but it acts as its own handle.
(That might be changed. For now, I went with the pre-existing structure.)
In addition, session_begin/end is renamed to begin/end_session to keep
consistent verb_noun naming.
2018-11-08 14:24:28 +00:00
|
|
|
def write(self, msg: protobuf.MessageType) -> None:
|
2018-08-13 16:21:24 +00:00
|
|
|
LOG.debug(
|
trezorlib: transport/protocol reshuffle
This commit breaks session handling (which matters with Bridge) and
regresses Bridge to an older code state. Both of these issues will be
rectified in subsequent commits.
Explanation of this big API reshuffle follows:
* protocols are moved to trezorlib.transport, and to a single common file.
* there is a cleaner definition of Transport and Protocol API (see below)
* fully valid mypy type hinting
* session handle counters and open handle counters mostly went away. Transports
and Protocols are meant to be "raw" APIs; TrezorClient will implement
context-handler-based sessions, session tracking, etc.
I'm calling this a "reshuffle" because it involved very small number of
code changes. Most of it is moving things around where they sit better.
The API changes are as follows.
Transport is now a thing that can:
* open and close sessions
* read and write protobuf messages
* enumerate and find devices
Some transports (all except bridge) are technically bytes-based and need
a separate protocol implementation (because we have two existing protocols,
although only the first one is actually used). Hence a protocol superclass.
Protocol is a thing that *also* can:
* open and close sessions
* read and write protobuf messages
For that, it requires a `handle`.
Handle is a physical layer for a protocol. It can:
* open and close some sort of device connection
(this is distinct from session! Connection is a channel over which you can
send data. Session is a logical arrangement on top of that; you can have
multiple sessions on a single connection.)
* read and write 64-byte chunks of data
With that, we introduce ProtocolBasedTransport, which simply delegates
the appropriate Transport functionality to respective Protocol methods.
hid and webusb transports are ProtocolBasedTransport-s that provide separate
device handles. HidHandle and WebUsbHandle existed before, but the distinction
of functionality between a Transport and its Handle was unclear. Some methods
were moved and now the handles implement the Handle API, while the transports
provide the enumeration parts of the Transport API, as well as glue between
the respective Protocols and Handles.
udp transport is also a ProtocolBasedTransport, but it acts as its own handle.
(That might be changed. For now, I went with the pre-existing structure.)
In addition, session_begin/end is renamed to begin/end_session to keep
consistent verb_noun naming.
2018-11-08 14:24:28 +00:00
|
|
|
"sending message: {}".format(msg.__class__.__name__),
|
2018-08-13 16:21:24 +00:00
|
|
|
extra={"protobuf": msg},
|
|
|
|
)
|
trezorlib: transport/protocol reshuffle
This commit breaks session handling (which matters with Bridge) and
regresses Bridge to an older code state. Both of these issues will be
rectified in subsequent commits.
Explanation of this big API reshuffle follows:
* protocols are moved to trezorlib.transport, and to a single common file.
* there is a cleaner definition of Transport and Protocol API (see below)
* fully valid mypy type hinting
* session handle counters and open handle counters mostly went away. Transports
and Protocols are meant to be "raw" APIs; TrezorClient will implement
context-handler-based sessions, session tracking, etc.
I'm calling this a "reshuffle" because it involved very small number of
code changes. Most of it is moving things around where they sit better.
The API changes are as follows.
Transport is now a thing that can:
* open and close sessions
* read and write protobuf messages
* enumerate and find devices
Some transports (all except bridge) are technically bytes-based and need
a separate protocol implementation (because we have two existing protocols,
although only the first one is actually used). Hence a protocol superclass.
Protocol is a thing that *also* can:
* open and close sessions
* read and write protobuf messages
For that, it requires a `handle`.
Handle is a physical layer for a protocol. It can:
* open and close some sort of device connection
(this is distinct from session! Connection is a channel over which you can
send data. Session is a logical arrangement on top of that; you can have
multiple sessions on a single connection.)
* read and write 64-byte chunks of data
With that, we introduce ProtocolBasedTransport, which simply delegates
the appropriate Transport functionality to respective Protocol methods.
hid and webusb transports are ProtocolBasedTransport-s that provide separate
device handles. HidHandle and WebUsbHandle existed before, but the distinction
of functionality between a Transport and its Handle was unclear. Some methods
were moved and now the handles implement the Handle API, while the transports
provide the enumeration parts of the Transport API, as well as glue between
the respective Protocols and Handles.
udp transport is also a ProtocolBasedTransport, but it acts as its own handle.
(That might be changed. For now, I went with the pre-existing structure.)
In addition, session_begin/end is renamed to begin/end_session to keep
consistent verb_noun naming.
2018-11-08 14:24:28 +00:00
|
|
|
buffer = BytesIO()
|
|
|
|
protobuf.dump_message(buffer, msg)
|
|
|
|
ser = buffer.getvalue()
|
2018-01-29 16:46:24 +00:00
|
|
|
header = struct.pack(">HL", mapping.get_type(msg), len(ser))
|
2018-11-08 17:06:58 +00:00
|
|
|
|
2018-11-08 17:52:15 +00:00
|
|
|
self.handle.write_buf(header + ser)
|
trezorlib: transport/protocol reshuffle
This commit breaks session handling (which matters with Bridge) and
regresses Bridge to an older code state. Both of these issues will be
rectified in subsequent commits.
Explanation of this big API reshuffle follows:
* protocols are moved to trezorlib.transport, and to a single common file.
* there is a cleaner definition of Transport and Protocol API (see below)
* fully valid mypy type hinting
* session handle counters and open handle counters mostly went away. Transports
and Protocols are meant to be "raw" APIs; TrezorClient will implement
context-handler-based sessions, session tracking, etc.
I'm calling this a "reshuffle" because it involved very small number of
code changes. Most of it is moving things around where they sit better.
The API changes are as follows.
Transport is now a thing that can:
* open and close sessions
* read and write protobuf messages
* enumerate and find devices
Some transports (all except bridge) are technically bytes-based and need
a separate protocol implementation (because we have two existing protocols,
although only the first one is actually used). Hence a protocol superclass.
Protocol is a thing that *also* can:
* open and close sessions
* read and write protobuf messages
For that, it requires a `handle`.
Handle is a physical layer for a protocol. It can:
* open and close some sort of device connection
(this is distinct from session! Connection is a channel over which you can
send data. Session is a logical arrangement on top of that; you can have
multiple sessions on a single connection.)
* read and write 64-byte chunks of data
With that, we introduce ProtocolBasedTransport, which simply delegates
the appropriate Transport functionality to respective Protocol methods.
hid and webusb transports are ProtocolBasedTransport-s that provide separate
device handles. HidHandle and WebUsbHandle existed before, but the distinction
of functionality between a Transport and its Handle was unclear. Some methods
were moved and now the handles implement the Handle API, while the transports
provide the enumeration parts of the Transport API, as well as glue between
the respective Protocols and Handles.
udp transport is also a ProtocolBasedTransport, but it acts as its own handle.
(That might be changed. For now, I went with the pre-existing structure.)
In addition, session_begin/end is renamed to begin/end_session to keep
consistent verb_noun naming.
2018-11-08 14:24:28 +00:00
|
|
|
|
|
|
|
def read(self) -> protobuf.MessageType:
|
2018-11-08 17:52:15 +00:00
|
|
|
data = self.handle.read_buf()
|
|
|
|
headerlen = struct.calcsize(">HL")
|
|
|
|
msg_type, datalen = struct.unpack(">HL", data[:headerlen])
|
|
|
|
buffer = BytesIO(data[headerlen : headerlen + datalen])
|
|
|
|
msg = protobuf.load_message(buffer, mapping.get_class(msg_type))
|
|
|
|
LOG.debug(
|
|
|
|
"received message: {}".format(msg.__class__.__name__),
|
|
|
|
extra={"protobuf": msg},
|
|
|
|
)
|
|
|
|
return msg
|