From 9d24f4b71a7376fbbad2f5de7ca1785fb2c166d1 Mon Sep 17 00:00:00 2001
From: elpatron <m.busche@gmail.com>
Date: Thu, 28 May 2026 21:34:46 +0200
Subject: [PATCH] Handle logbook key decryption failures gracefully by falling
 back to master key in getLogbookKey

---
 client/src/services/logbookKeys.ts | 29 +++++++++++++++++------------
 1 file changed, 17 insertions(+), 12 deletions(-)

diff --git a/client/src/services/logbookKeys.ts b/client/src/services/logbookKeys.ts
index d029227..ba505d0 100644
--- a/client/src/services/logbookKeys.ts
+++ b/client/src/services/logbookKeys.ts
@@ -24,19 +24,24 @@ export async function getLogbookKey(logbookId: string): Promise<ArrayBuffer | nu
     throw new Error('Master key not found. Please log in.')
   }
 
-  // Derive CryptoKey from user master key
-  const aesKey = await window.crypto.subtle.importKey(
-    'raw',
-    masterKeyBytes,
-    { name: 'AES-GCM' },
-    false,
-    ['decrypt']
-  )
+  try {
+    // Derive CryptoKey from user master key
+    const aesKey = await window.crypto.subtle.importKey(
+      'raw',
+      masterKeyBytes,
+      { name: 'AES-GCM' },
+      false,
+      ['decrypt']
+    )
 
-  // Decrypt logbook key using User Master Key
-  const decrypted = await decryptBuffer(record.encryptedKey, record.iv, record.tag, aesKey)
-  keyCache.set(logbookId, decrypted)
-  return decrypted
+    // Decrypt logbook key using User Master Key
+    const decrypted = await decryptBuffer(record.encryptedKey, record.iv, record.tag, aesKey)
+    keyCache.set(logbookId, decrypted)
+    return decrypted
+  } catch (err) {
+    console.warn(`Failed to decrypt logbook key for ${logbookId}, returning null to allow fallback:`, err)
+    return null
+  }
 }
 
 /**