Add context logs for native messaging (#11690)

* Add logging to decryption routines * Fix case of uknown encryption type * Add decryption context to log where failures occur * Update log message * Fix linting * Add more context logs * Add context logs for native messaging * Update apps/desktop/native-messaging-test-runner/src/native-message.service.ts Co-authored-by: Maciej Zieniuk <[email protected]> * Update apps/desktop/src/services/native-message-handler.service.ts Co-authored-by: Maciej Zieniuk <[email protected]> * Rename channel key to desktop ipc channel key --------- Co-authored-by: Maciej Zieniuk <[email protected]>
bitwarden · Nov 5, 2024 · 48bd438 · 48bd438
1 parent 8bee0ad
commit 48bd438
Show file tree

Hide file tree

Showing 4 changed files with 12 additions and 2 deletions.
diff --git a/apps/browser/src/background/nativeMessaging.background.ts b/apps/browser/src/background/nativeMessaging.background.ts
@@ -274,7 +274,11 @@ export class NativeMessagingBackground {
     let message = rawMessage as ReceiveMessage;
     if (!this.platformUtilsService.isSafari()) {
       message = JSON.parse(
-        await this.encryptService.decryptToUtf8(rawMessage as EncString, this.sharedSecret),
+        await this.encryptService.decryptToUtf8(
+          rawMessage as EncString,
+          this.sharedSecret,
+          "ipc-desktop-ipc-channel-key",
+        ),
       );
     }
 

diff --git a/apps/desktop/native-messaging-test-runner/src/native-message.service.ts b/apps/desktop/native-messaging-test-runner/src/native-message.service.ts
@@ -219,7 +219,11 @@ export default class NativeMessageService {
     key: string,
   ): Promise<DecryptedCommandData> {
     const sharedKey = await this.getSharedKeyForKey(key);
-    const decrypted = await this.encryptService.decryptToUtf8(payload, sharedKey);
+    const decrypted = await this.encryptService.decryptToUtf8(
+      payload,
+      sharedKey,
+      "native-messaging-session",
+    );
 
     return JSON.parse(decrypted);
   }

diff --git a/apps/desktop/src/services/native-message-handler.service.ts b/apps/desktop/src/services/native-message-handler.service.ts
@@ -185,6 +185,7 @@ export class NativeMessageHandlerService {
       let decryptedResult = await this.encryptService.decryptToUtf8(
         message.encryptedCommand as EncString,
         this.ddgSharedSecret,
+        "ddg-shared-key",
       );
 
       decryptedResult = this.trimNullCharsFromMessage(decryptedResult);

diff --git a/apps/desktop/src/services/native-messaging.service.ts b/apps/desktop/src/services/native-messaging.service.ts
@@ -114,6 +114,7 @@ export class NativeMessagingService {
       await this.encryptService.decryptToUtf8(
         rawMessage as EncString,
         SymmetricCryptoKey.fromString(await ipc.platform.ephemeralStore.getEphemeralValue(appId)),
+        `native-messaging-session-${appId}`,
       ),
     );