@trezor/connect 9.6.5-beta.2 → 9.7.0-beta.2

package/lib/device/thp/handshake.js

@@ -1,5 +1,8 @@
 "use strict";
-Object.defineProperty(exports, "__esModule", { value: true });
+
+Object.defineProperty(exports, "__esModule", {
+  value: true
+});
 exports.thpHandshake = exports.createThpChannel = void 0;
 const crypto_1 = require("crypto");
 const protobuf_1 = require("@trezor/protobuf");
@@ -7,93 +10,103 @@ const protocol_1 = require("@trezor/protocol");
 const thpCall_1 = require("./thpCall");
 const constants_1 = require("../../constants");
 const DataManager_1 = require("../../data/DataManager");
-const enumFromString = (dm) => typeof dm === 'string' ? protocol_1.thp.ThpPairingMethod[dm] : dm;
 const getPairingMethods = (deviceMethods, settingsMethods) => deviceMethods?.flatMap(dm => {
-    const value = enumFromString(dm);
-    const isRequested = settingsMethods && settingsMethods.find(sm => value === enumFromString(sm));
-    return isRequested ? value : [];
+  const value = protocol_1.thp.getThpPairingMethod(dm);
+  const isRequested = settingsMethods && settingsMethods.find(sm => value === protocol_1.thp.getThpPairingMethod(sm));
+  return isRequested ? value : [];
 });
-const createThpChannel = async (device) => {
-    const thpState = device.getThpState();
-    if (!thpState) {
-        throw constants_1.ERRORS.TypedError('Device_ThpStateMissing');
-    }
-    thpState.setChannel(protocol_1.thp.constants.THP_DEFAULT_CHANNEL);
-    const nonce = (0, crypto_1.randomBytes)(8);
-    const createChannel = await (0, thpCall_1.thpCall)(device, 'ThpCreateChannelRequest', { nonce });
-    const { properties, ...resp } = createChannel.message;
-    if (nonce.compare(resp.nonce) !== 0) {
-        throw new Error('Nonce not meet' + nonce.toString('hex') + ' ' + resp.nonce.toString('hex'));
-    }
-    const settings = DataManager_1.DataManager.getSettings('thp');
-    const pairingMethods = getPairingMethods(properties.pairing_methods, settings?.pairingMethods);
-    if (!pairingMethods?.length) {
-        throw constants_1.ERRORS.TypedError('Device_ThpPairingMethodsException');
-    }
-    thpState.setThpProperties(properties);
-    thpState.setChannel(resp.channel);
-    thpState.updateHandshakeCredentials({
-        pairingMethods,
-        handshakeHash: resp.handshakeHash,
-    });
+const createThpChannel = async device => {
+  const thpState = device.getThpState();
+  if (!thpState) {
+    throw constants_1.ERRORS.TypedError('Device_ThpStateMissing');
+  }
+  thpState.setChannel(protocol_1.thp.constants.THP_DEFAULT_CHANNEL);
+  const nonce = (0, crypto_1.randomBytes)(8);
+  const createChannel = await (0, thpCall_1.thpCall)(device, 'ThpCreateChannelRequest', {
+    nonce
+  });
+  const {
+    properties,
+    ...resp
+  } = createChannel.message;
+  if (nonce.compare(resp.nonce) !== 0) {
+    throw new Error('Nonce not meet' + nonce.toString('hex') + ' ' + resp.nonce.toString('hex'));
+  }
+  const settings = DataManager_1.DataManager.getSettings('thp');
+  const pairingMethods = getPairingMethods(properties.pairing_methods, settings?.pairingMethods);
+  if (!pairingMethods?.length) {
+    throw constants_1.ERRORS.TypedError('Device_ThpPairingMethodsException');
+  }
+  thpState.setThpProperties(properties);
+  thpState.setChannel(resp.channel);
+  thpState.updateHandshakeCredentials({
+    pairingMethods,
+    handshakeHash: resp.handshakeHash
+  });
 };
 exports.createThpChannel = createThpChannel;
 const thpHandshake = async (device, unlockPin = false) => {
-    const thpState = device.getThpState();
-    if (!thpState?.handshakeCredentials) {
-        throw constants_1.ERRORS.TypedError('Device_ThpStateMissing');
-    }
-    const settings = DataManager_1.DataManager.getSettings('thp');
-    const staticKey = settings?.staticKey
-        ? Buffer.from(settings.staticKey, 'hex')
-        : (0, crypto_1.randomBytes)(32);
-    const hostStaticKeys = protocol_1.thp.getCurve25519KeyPair(staticKey);
-    const knownCredentials = (settings?.knownCredentials || []).sort(cre => cre.autoconnect ? -1 : 1);
-    const tryToUnlock = unlockPin ? 1 : 0;
-    const hostEphemeralKeys = protocol_1.thp.getCurve25519KeyPair((0, crypto_1.randomBytes)(32));
-    const handshakeInit = await (0, thpCall_1.thpCall)(device, 'ThpHandshakeInitRequest', {
-        key: hostEphemeralKeys.publicKey,
-        tryToUnlock,
-    });
-    const { trezorEncryptedStaticPubkey } = handshakeInit.message;
-    const handshakeCredentials = protocol_1.thp.handleHandshakeInit({
-        handshakeInitResponse: handshakeInit.message,
-        thpState,
-        hostStaticKeys,
-        hostEphemeralKeys,
-        knownCredentials,
-        tryToUnlock,
-        protobufEncoder: (name, data) => (0, protobuf_1.encodeMessage)(device.transport.getMessages(), name, data),
-    });
-    const { hostKey, trezorKey, hostEncryptedStaticPubkey } = handshakeCredentials;
-    thpState.updateHandshakeCredentials({
-        trezorEncryptedStaticPubkey,
-        hostEncryptedStaticPubkey,
-        handshakeHash: handshakeCredentials.handshakeHash,
-        trezorKey,
-        hostKey,
-        staticKey,
-        hostStaticPublicKey: hostStaticKeys.publicKey,
-    });
-    thpState.setPairingCredentials(handshakeCredentials.allCredentials);
-    const handshakeCompletion = await (0, thpCall_1.thpCall)(device, 'ThpHandshakeCompletionRequest', {
-        hostPubkey: hostEncryptedStaticPubkey,
-        encryptedPayload: handshakeCredentials.encryptedPayload,
-    });
-    if (!handshakeCompletion.message.state && handshakeCredentials.credentials) {
-        thpState.removePairingCredential(handshakeCredentials.credentials);
-        const { credential } = handshakeCredentials.credentials;
-        const index = settings?.knownCredentials?.findIndex(c => c.credential === credential) ?? -1;
-        if (index >= 0) {
-            settings?.knownCredentials?.splice(index, 1);
-        }
-    }
-    thpState.setIsPaired(handshakeCompletion.message.state !== 0);
-    thpState.setPhase('pairing');
-    if (thpState.isAutoconnectPaired || handshakeCompletion.message.state === 2) {
-        await (0, thpCall_1.thpCall)(device, 'ThpEndRequest', {});
-        thpState.setPhase('paired');
+  const thpState = device.getThpState();
+  if (!thpState?.handshakeCredentials) {
+    throw constants_1.ERRORS.TypedError('Device_ThpStateMissing');
+  }
+  const settings = DataManager_1.DataManager.getSettings('thp');
+  const staticKey = settings?.staticKey ? Buffer.from(settings.staticKey, 'hex') : (0, crypto_1.randomBytes)(32);
+  const hostStaticKeys = protocol_1.thp.getCurve25519KeyPair(staticKey);
+  const knownCredentials = (settings?.knownCredentials || []).sort(cre => cre.autoconnect ? -1 : 1);
+  const tryToUnlock = unlockPin ? 1 : 0;
+  const hostEphemeralKeys = protocol_1.thp.getCurve25519KeyPair((0, crypto_1.randomBytes)(32));
+  const handshakeInit = await (0, thpCall_1.thpCall)(device, 'ThpHandshakeInitRequest', {
+    key: hostEphemeralKeys.publicKey,
+    tryToUnlock
+  });
+  const {
+    trezorEncryptedStaticPubkey
+  } = handshakeInit.message;
+  const handshakeCredentials = protocol_1.thp.handleHandshakeInit({
+    handshakeInitResponse: handshakeInit.message,
+    thpState,
+    hostStaticKeys,
+    hostEphemeralKeys,
+    knownCredentials,
+    tryToUnlock,
+    protobufEncoder: (name, data) => (0, protobuf_1.encodeMessage)(device.transport.getMessages(), name, data)
+  });
+  const {
+    hostKey,
+    trezorKey,
+    hostEncryptedStaticPubkey
+  } = handshakeCredentials;
+  thpState.updateHandshakeCredentials({
+    trezorEncryptedStaticPubkey,
+    hostEncryptedStaticPubkey,
+    handshakeHash: handshakeCredentials.handshakeHash,
+    trezorKey,
+    hostKey,
+    staticKey,
+    hostStaticPublicKey: hostStaticKeys.publicKey
+  });
+  thpState.setPairingCredentials(handshakeCredentials.allCredentials);
+  const handshakeCompletion = await (0, thpCall_1.thpCall)(device, 'ThpHandshakeCompletionRequest', {
+    hostPubkey: hostEncryptedStaticPubkey,
+    encryptedPayload: handshakeCredentials.encryptedPayload
+  });
+  if (!handshakeCompletion.message.state && handshakeCredentials.credentials) {
+    thpState.removePairingCredential(handshakeCredentials.credentials);
+    const {
+      credential
+    } = handshakeCredentials.credentials;
+    const index = settings?.knownCredentials?.findIndex(c => c.credential === credential) ?? -1;
+    if (index >= 0) {
+      settings?.knownCredentials?.splice(index, 1);
     }
+  }
+  thpState.setIsPaired(handshakeCompletion.message.state !== 0);
+  thpState.setPhase('pairing');
+  if (thpState.isAutoconnectPaired || handshakeCompletion.message.state === 2) {
+    await (0, thpCall_1.thpCall)(device, 'ThpEndRequest', {});
+    thpState.setPhase('paired');
+  }
 };
 exports.thpHandshake = thpHandshake;
 //# sourceMappingURL=handshake.js.map

package/lib/device/thp/index.js

@@ -1,54 +1,69 @@
 "use strict";
-Object.defineProperty(exports, "__esModule", { value: true });
+
+Object.defineProperty(exports, "__esModule", {
+  value: true
+});
 exports.getThpChannel = exports.createThpSession = exports.getThpCredentials = exports.abortThpWorkflow = void 0;
 const device_1 = require("../../events/device");
 const handshake_1 = require("./handshake");
 const pairing_1 = require("./pairing");
 var thpCall_1 = require("./thpCall");
-Object.defineProperty(exports, "abortThpWorkflow", { enumerable: true, get: function () { return thpCall_1.abortThpWorkflow; } });
+Object.defineProperty(exports, "abortThpWorkflow", {
+  enumerable: true,
+  get: function () {
+    return thpCall_1.abortThpWorkflow;
+  }
+});
 var pairing_2 = require("./pairing");
-Object.defineProperty(exports, "getThpCredentials", { enumerable: true, get: function () { return pairing_2.getThpCredentials; } });
+Object.defineProperty(exports, "getThpCredentials", {
+  enumerable: true,
+  get: function () {
+    return pairing_2.getThpCredentials;
+  }
+});
 var session_1 = require("./session");
-Object.defineProperty(exports, "createThpSession", { enumerable: true, get: function () { return session_1.createThpSession; } });
+Object.defineProperty(exports, "createThpSession", {
+  enumerable: true,
+  get: function () {
+    return session_1.createThpSession;
+  }
+});
 const getThpChannel = async (device, withInteraction) => {
-    const thpState = device.getThpState();
-    if (!thpState)
-        return;
-    try {
-        if (thpState.phase === 'handshake') {
-            await (0, handshake_1.createThpChannel)(device);
-            try {
-                await (0, handshake_1.thpHandshake)(device);
-            }
-            catch (error) {
-                const isPinLocked = error.code === 'ThpDeviceLocked';
-                const isTransportBusy = error.message === 'ThpTransportBusy';
-                if (!isPinLocked && !isTransportBusy)
-                    throw error;
-                thpState.resetState();
-                if (isPinLocked && !withInteraction)
-                    return 'pin-locked';
-                if (isPinLocked) {
-                    device.emit(device_1.DEVICE.BUTTON, {
-                        device,
-                        payload: { code: 'ButtonRequest_PinEntry' },
-                    });
-                }
-                await (0, handshake_1.createThpChannel)(device);
-                await (0, handshake_1.thpHandshake)(device, isPinLocked);
+  const thpState = device.getThpState();
+  if (!thpState) return;
+  try {
+    if (thpState.phase === 'handshake') {
+      await (0, handshake_1.createThpChannel)(device);
+      try {
+        await (0, handshake_1.thpHandshake)(device);
+      } catch (error) {
+        const isPinLocked = error.code === 'ThpDeviceLocked';
+        const isTransportBusy = error.message === 'ThpTransportBusy';
+        if (!isPinLocked && !isTransportBusy) throw error;
+        thpState.resetState();
+        if (isPinLocked && !withInteraction) return 'pin-locked';
+        if (isPinLocked) {
+          device.emit(device_1.DEVICE.BUTTON, {
+            device,
+            payload: {
+              code: 'ButtonRequest_PinEntry'
             }
+          });
         }
-        if (thpState.phase === 'pairing' && withInteraction) {
-            await (0, pairing_1.thpPairing)(device);
-        }
-        if (thpState.phase !== 'paired') {
-            return 'thp-locked';
-        }
+        await (0, handshake_1.createThpChannel)(device);
+        await (0, handshake_1.thpHandshake)(device, isPinLocked);
+      }
     }
-    catch (error) {
-        thpState.resetState();
-        throw error;
+    if (thpState.phase === 'pairing' && withInteraction) {
+      await (0, pairing_1.thpPairing)(device);
+    }
+    if (thpState.phase !== 'paired') {
+      return 'thp-locked';
     }
+  } catch (error) {
+    thpState.resetState();
+    throw error;
+  }
 };
 exports.getThpChannel = getThpChannel;
 //# sourceMappingURL=index.js.map