arno/trezor-firmware
1
0
Fork 0
mirror of https://github.com/trezor/trezor-firmware.git synced 2024-11-15 12:08:59 +00:00
Code Issues Releases Wiki Activity

Use right URL for bridge and keep-alive connection

Browse Source 
The bridge is using https with a certificate signed for localback.net.

Use a session object (self.conn) to keep connection alive and
prevent costly ssl handshakes for every call.
This commit is contained in:
Jochen Hoenicke 2015-03-05 11:00:18 +01:00
parent e523d34596
commit 9107aab76a
1 changed files with 8 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
trezorlib/transport_bridge.py
View File

@ -7,7 +7,7 @@ import mapping
from transport import Transport
import messages_pb2 as proto
TREZORD_HOST = 'http://localhost:21324'
TREZORD_HOST = 'https://localback.net:21324'
CONFIG_URL = 'https://mytrezor.com/data/plugin/config_signed.bin'
def get_error(resp):
@ -22,11 +22,13 @@ class BridgeTransport(Transport):
config = r.text
r = requests.post(TREZORD_HOST + '/configure', data=config)
self.conn = requests.Session();
r = self.conn.post(TREZORD_HOST + '/configure', data=config, verify=None)
if r.status_code != 200:
raise Exception('trezord: Could not configure' + get_error(r))
r = requests.get(TREZORD_HOST + '/enumerate')
r = self.conn.get(TREZORD_HOST + '/enumerate', verify=None)
if r.status_code != 200:
raise Exception('trezord: Could not enumerate devices' + get_error(r))
enum = r.json()
@ -41,14 +43,14 @@ class BridgeTransport(Transport):
super(BridgeTransport, self).__init__(device, *args, **kwargs)
def _open(self):
r = requests.post(TREZORD_HOST + '/acquire/%s' % self.path)
r = self.conn.post(TREZORD_HOST + '/acquire/%s' % self.path, verify=None)
if r.status_code != 200:
raise Exception('trezord: Could not acquire session' + get_error(r))
resp = r.json()
self.session = resp['session']
def _close(self):
r = requests.post(TREZORD_HOST + '/release/%s' % self.session)
r = self.conn.post(TREZORD_HOST + '/release/%s' % self.session, verify=None)
if r.status_code != 200:
raise Exception('trezord: Could not release session' + get_error(r))
else:
@ -61,7 +63,7 @@ class BridgeTransport(Transport):
cls = protobuf_msg.__class__.__name__
msg = protobuf_json.pb2json(protobuf_msg)
payload = '{"type": "%s", "message": %s}' % (cls, json.dumps(msg))
r = requests.post(TREZORD_HOST + '/call/%s' % self.session, data=payload)
r = self.conn.post(TREZORD_HOST + '/call/%s' % self.session, data=payload, verify=None)
if r.status_code != 200:
raise Exception('trezord: Could not write message' + get_error(r))
else: