@onekeyfe/hd-core 1.2.8-alpha.131 → 1.2.8-alpha.133

package/__tests__/logBlockEvent.test.ts

@@ -63,11 +63,17 @@ describe('getLogBlockLabel', () => {
     }
   );
 
-  it('logs signing requests and responses as-is', () => {
+  it.each([false, true])('redacts btcSignMessage logs with debug=%s', enabled => {
+    const method = 'btcSignMessage';
+    const prefix = `sensitive-btc-sign-message-${enabled}`;
+    const logger = initLog(prefix, enabled);
+    const postMessage = jest.fn();
+    setLoggerPostMessage(postMessage);
+    const consoleLog = jest.spyOn(console, 'log').mockImplementation(() => undefined);
     const request = {
-      method: 'btcSignMessage',
+      method,
       path: "m/44'/0'/0'/0/0",
-      messageHex: '68656c6c6f',
+      messageHex: Buffer.from('synthetic-message-marker').toString('hex'),
       coin: 'Bitcoin',
     };
     const iframeRequest = {
@@ -77,15 +83,39 @@ describe('getLogBlockLabel', () => {
     const response = {
       success: true,
       payload: {
-        signature: 'signature-bytes',
-        address: 'bc1qexample',
+        signature: 'synthetic-signature-marker',
+        address: 'synthetic-address-marker',
       },
     };
+    const task = { id: 7, method: { name: method, payload: request } };
+    const originals = JSON.stringify([request, iframeRequest, response, task]);
+    const blockLabel = getLogBlockLabel(iframeRequest);
 
-    expect(getLogBlockLabel(request)).toBeUndefined();
-    expect(getLogBlockLabel(iframeRequest)).toBeUndefined();
-    expect(getSafeLogPayload(request)).toBe(request);
-    expect(getSafeLogPayload(response)).toBe(response);
+    try {
+      expect(getLogBlockLabel(request)).toBe(method);
+      expect(blockLabel).toBe(method);
+      logger.debug('request:', getSafeLogPayload(iframeRequest, blockLabel));
+      logger.debug('response:', getSafeLogPayload(response, blockLabel));
+      logger.debug('Cancel Api connect task: ', getSafeLogTask(task));
+
+      const cached = getLog().filter(entry => entry.prefix === prefix);
+      expect(cached.map(entry => entry.message[1])).toEqual([
+        { method, payload: '[REDACTED]' },
+        { method, payload: '[REDACTED]' },
+        { id: task.id, method, payload: '[REDACTED]' },
+      ]);
+      expect(postMessage).toHaveBeenCalledTimes(3);
+      expect(consoleLog).toHaveBeenCalledTimes(enabled ? 3 : 0);
+      for (const output of [cached, postMessage.mock.calls, consoleLog.mock.calls]) {
+        const serialized = JSON.stringify(output);
+        expect(serialized).not.toContain('synthetic-');
+        expect(serialized).not.toContain(request.messageHex);
+      }
+      expect(JSON.stringify([request, iframeRequest, response, task])).toBe(originals);
+    } finally {
+      consoleLog.mockRestore();
+      setLoggerPostMessage(jest.fn());
+    }
   });
 
   it('keeps ordinary API requests and responses visible', () => {
@@ -383,7 +413,7 @@ describe('getLogBlockLabel', () => {
   it('logs other queued tasks as before', () => {
     const task = {
       id: 8,
-      method: { name: 'btcSignMessage', payload: { method: 'btcSignMessage' } },
+      method: { name: 'getDeviceState', payload: { method: 'getDeviceState' } },
     };
     expect(getSafeLogTask(task)).toBe(task);
     expect(getSafeLogTask(undefined)).toBeUndefined();

package/dist/events/logBlockEvent.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"logBlockEvent.d.ts","sourceRoot":"","sources":["../../src/events/logBlockEvent.ts"],"names":[],"mappings":"AAGA,eAAO,MAAM,aAAa,EAAE,GAAG,CAAC,MAAM,CAKpC,CAAC;AAmBH,wBAAgB,gBAAgB,CAAC,OAAO,EAAE,OAAO,GAAG,MAAM,GAAG,SAAS,CAmBrE;AAuCD,wBAAgB,iBAAiB,CAAC,KAAK,EAAE,OAAO,EAAE,UAAU,CAAC,EAAE,MAAM,GAAG,OAAO,CAM9E;AAGD,wBAAgB,cAAc,CAAC,CAAC,SAAS;IAAE,EAAE,CAAC,EAAE,MAAM,CAAC;IAAC,MAAM,CAAC,EAAE;QAAE,OAAO,CAAC,EAAE,OAAO,CAAA;KAAE,CAAA;CAAE,EACtF,IAAI,EAAE,CAAC,GAAG,SAAS,GAClB,CAAC,GAAG;IAAE,EAAE,CAAC,EAAE,MAAM,CAAC;IAAC,MAAM,EAAE,MAAM,CAAC;IAAC,OAAO,EAAE,MAAM,CAAA;CAAE,GAAG,SAAS,CAGlE;AAED,wBAAgB,oBAAoB,CAAC,KAAK,EAAE,MAAM,EAAE,UAAU,CAAC,EAAE,MAAM,GAAG,MAAM,CAE/E"}
+{"version":3,"file":"logBlockEvent.d.ts","sourceRoot":"","sources":["../../src/events/logBlockEvent.ts"],"names":[],"mappings":"AAGA,eAAO,MAAM,aAAa,EAAE,GAAG,CAAC,MAAM,CAKpC,CAAC;AAoBH,wBAAgB,gBAAgB,CAAC,OAAO,EAAE,OAAO,GAAG,MAAM,GAAG,SAAS,CAmBrE;AAuCD,wBAAgB,iBAAiB,CAAC,KAAK,EAAE,OAAO,EAAE,UAAU,CAAC,EAAE,MAAM,GAAG,OAAO,CAM9E;AAGD,wBAAgB,cAAc,CAAC,CAAC,SAAS;IAAE,EAAE,CAAC,EAAE,MAAM,CAAC;IAAC,MAAM,CAAC,EAAE;QAAE,OAAO,CAAC,EAAE,OAAO,CAAA;KAAE,CAAA;CAAE,EACtF,IAAI,EAAE,CAAC,GAAG,SAAS,GAClB,CAAC,GAAG;IAAE,EAAE,CAAC,EAAE,MAAM,CAAC;IAAC,MAAM,EAAE,MAAM,CAAC;IAAC,OAAO,EAAE,MAAM,CAAA;CAAE,GAAG,SAAS,CAGlE;AAED,wBAAgB,oBAAoB,CAAC,KAAK,EAAE,MAAM,EAAE,UAAU,CAAC,EAAE,MAAM,GAAG,MAAM,CAE/E"}

package/dist/index.js

@@ -2449,6 +2449,7 @@ const LogBlockEvent = new Set([
 ]);
 const LogPayloadBlockMethod = new Set([
     'btcDeriveContextHash',
+    'btcSignMessage',
     'deviceUploadNft',
     'deviceUploadWallpaper',
     'uploadPortfolio',

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@onekeyfe/hd-core",
-  "version": "1.2.8-alpha.131",
+  "version": "1.2.8-alpha.133",
   "description": "Core processes and APIs for communicating with OneKey hardware devices.",
   "author": "OneKey",
   "homepage": "https://github.com/OneKeyHQ/hardware-js-sdk#readme",
@@ -25,8 +25,8 @@
     "url": "https://github.com/OneKeyHQ/hardware-js-sdk/issues"
   },
   "dependencies": {
-    "@onekeyfe/hd-shared": "1.2.8-alpha.131",
-    "@onekeyfe/hd-transport": "1.2.8-alpha.131",
+    "@onekeyfe/hd-shared": "1.2.8-alpha.133",
+    "@onekeyfe/hd-transport": "1.2.8-alpha.133",
     "axios": "1.15.2",
     "bignumber.js": "^9.0.2",
     "buffer": "^6.0.3",
@@ -46,5 +46,5 @@
     "@types/w3c-web-usb": "^1.0.10",
     "@types/web-bluetooth": "^0.0.21"
   },
-  "gitHead": "8368279d92c3ff3b04fd186a4fc890eba83305c8"
+  "gitHead": "c859b88e03cf7a80e3168ab048fd1af6cb286af6"
 }

package/src/events/logBlockEvent.ts

@@ -12,6 +12,7 @@ export const LogBlockEvent: Set<string> = new Set([
 // or log events can retain them, regardless of whether debug output is enabled.
 const LogPayloadBlockMethod: Set<string> = new Set([
   'btcDeriveContextHash',
+  'btcSignMessage',
   'deviceUploadNft',
   'deviceUploadWallpaper',
   'uploadPortfolio',