fix: restore TPM replacement flow for blacklisted boot flash

.limetech/ai-review-markers/ai-cld-1117-tpm-blacklisted-pr-66d786804bbd.json

@@ -0,0 +1,8 @@
+{
+  "disposition": "PATCH",
+  "forecast_commit": "4ea919b834a792e0fef28d00895c16e7d64ca9a3",
+  "reviewed_sha": "99f842b895eda84febe8448587f79b48ea2fda35",
+  "schema": "limetech.ai-review-marker.v2",
+  "stage": "final",
+  "unresolved_proportionality_findings": []
+}

plugin/source/dynamix.unraid.net/usr/local/emhttp/plugins/dynamix.my.servers/include/state.php

@@ -289,6 +289,7 @@ public function getServerState()
             "flashVendor" => $this->var['flashVendor'],
             "flashBackupActivated" => $this->flashBackupActivated,
             "guid" => $this->var['flashGUID'],
+            "tpmGuid" => $this->var['tpmGUID'] ?? '',
             "hasRemoteApikey" => $this->hasRemoteApikey,
             "internalPort" => _var($_SERVER, 'SERVER_PORT'),
             "keyfile" => $this->keyfileBase64UrlSafe,

web/__test__/components/Registration.test.ts

@@ -366,6 +366,95 @@ describe('Registration.standalone.vue', () => {
     expect(wrapper.find('[data-testid="move-license-to-tpm"]').exists()).toBe(true);
   });
 
+  it('shows the TPM mismatch and Replace Key action when the boot flash is blacklisted', async () => {
+    serverStore.state = 'EBLACKLISTED';
+    serverStore.guid = '058F-6387-0000-0000F1F1E1C6';
+    serverStore.flashGuid = '058F-6387-0000-0000F1F1E1C6';
+    serverStore.regGuid = '01-OLD-TPM-GUID-1234567890';
+    serverStore.tpmGuid = '01-V35H8S0L1QHK1SBG1XHXJNH7';
+    serverStore.keyfile = 'keyfile-present';
+
+    await wrapper.vm.$nextTick();
+
+    expect(wrapper.find('[data-testid="move-license-to-tpm"]').exists()).toBe(false);
+    expect(wrapper.text()).toContain('License / TPM mismatch');
+    expect(wrapper.text()).not.toContain('Blacklisted boot device GUID');
+    expect(wrapper.text()).not.toContain('copy the correct key file');
+    expect(wrapper.text()).not.toContain('Move License to TPM');
+    expect(wrapper.text()).toContain('Your license is registered to a different TPM');
+    expect(findItemByLabel(t('TPM GUID'))?.props('text')).toBe('01-V35H8S0L1QHK1SBG1XHXJNH7');
+    expect(findItemByLabel(t('registration.registeredGuid'))?.props('text')).toBe(
+      '01-OLD-TPM-GUID-1234567890'
+    );
+    expect(wrapper.find('[data-testid="key-actions"]').exists()).toBe(true);
+    expect(serverStore.keyActions?.some((action) => action.name === 'replace')).toBe(true);
+    expect(serverStore.keyActions?.find((action) => action.name === 'replace')?.text).toBe(
+      'Replace Key'
+    );
+
+    serverStore.keyActions?.find((action) => action.name === 'replace')?.click?.();
+
+    expect(accountStore.replace).toHaveBeenCalledWith(
+      expect.objectContaining({
+        guid: '01-V35H8S0L1QHK1SBG1XHXJNH7',
+        regGuid: '01-OLD-TPM-GUID-1234567890',
+        state: 'EGUID',
+      })
+    );
+    expect(serverStore.state).toBe('EBLACKLISTED');
+    expect(accountStore.replaceTpm).not.toHaveBeenCalled();
+  });
+
+  it('does not show Move License to TPM for invalid blacklisted states', async () => {
+    serverStore.state = 'EBLACKLISTED1';
+    serverStore.guid = '058F-6387-0000-0000F1F1E1C6';
+    serverStore.flashGuid = '058F-6387-0000-0000F1F1E1C6';
+    serverStore.tpmGuid = '01-V35H8S0L1QHK1SBG1XHXJNH7';
+    serverStore.keyfile = 'keyfile-present';
+
+    await wrapper.vm.$nextTick();
+
+    expect(wrapper.find('[data-testid="move-license-to-tpm"]').exists()).toBe(false);
+  });
+
+  it('does not show Move License to TPM for a blacklisted boot flash without a key file', async () => {
+    serverStore.state = 'EBLACKLISTED';
+    serverStore.guid = '058F-6387-0000-0000F1F1E1C6';
+    serverStore.flashGuid = '058F-6387-0000-0000F1F1E1C6';
+    serverStore.tpmGuid = '01-V35H8S0L1QHK1SBG1XHXJNH7';
+    serverStore.keyfile = '';
+
+    await wrapper.vm.$nextTick();
+
+    expect(wrapper.find('[data-testid="move-license-to-tpm"]').exists()).toBe(false);
+  });
+
+  it('does not show Move License to TPM when the blacklisted flash is still the registered license device', async () => {
+    serverStore.state = 'EBLACKLISTED';
+    serverStore.guid = '058F-6387-0000-0000F1F1E1C6';
+    serverStore.flashGuid = '058F-6387-0000-0000F1F1E1C6';
+    serverStore.regGuid = '058F-6387-0000-0000F1F1E1C6';
+    serverStore.tpmGuid = '01-V35H8S0L1QHK1SBG1XHXJNH7';
+    serverStore.keyfile = 'keyfile-present';
+
+    await wrapper.vm.$nextTick();
+
+    expect(wrapper.find('[data-testid="move-license-to-tpm"]').exists()).toBe(false);
+  });
+
+  it('does not show Move License to TPM when the key is already registered to the detected TPM', async () => {
+    serverStore.state = 'EBLACKLISTED';
+    serverStore.guid = '058F-6387-0000-0000F1F1E1C6';
+    serverStore.flashGuid = '058F-6387-0000-0000F1F1E1C6';
+    serverStore.regGuid = '01-V35H8S0L1QHK1SBG1XHXJNH7';
+    serverStore.tpmGuid = '01-V35H8S0L1QHK1SBG1XHXJNH7';
+    serverStore.keyfile = 'keyfile-present';
+
+    await wrapper.vm.$nextTick();
+
+    expect(wrapper.find('[data-testid="move-license-to-tpm"]').exists()).toBe(false);
+  });
+
   it('triggers the TPM replacement action when Move License to TPM is clicked', async () => {
     serverStore.state = 'PRO';
     serverStore.guid = '058F-6387-0000-0000F1F1E1C6';

web/__test__/store/account.test.ts

@@ -257,6 +257,31 @@ describe('Account Store', () => {
       );
     });
 
+    it('should forward a supplied server payload for replace', () => {
+      const replacementPayload = {
+        guid: '01-old-tpm-guid',
+        keyfile: 'test-keyfile',
+        name: 'test-server',
+        registered: true,
+        state: 'EBLACKLISTED' as const,
+      };
+
+      store.replace(replacementPayload);
+
+      expect(mockSend).toHaveBeenCalledTimes(1);
+      expect(mockSend).toHaveBeenCalledWith(
+        ACCOUNT_CALLBACK.toString(),
+        [
+          {
+            server: replacementPayload,
+            type: 'replace',
+          },
+        ],
+        undefined,
+        'post'
+      );
+    });
+
     it('should forward the full server payload for replaceTpm', () => {
       store.replaceTpm();
 

web/src/components/Registration.standalone.vue

@@ -51,6 +51,7 @@ const {
   guid,
   keyActions,
   computedRegDevs,
+  hasBlacklistedTpmLicenseMismatch,
   regGuid,
   regTm,
   regTo,
@@ -129,9 +130,12 @@ const showPartnerActivationCode = computed(() => {
   );
 });
 const showTpmTransferButton = computed((): boolean =>
-  Boolean((keyInstalled.value || showTrialExpiration.value) && hasDistinctTpmGuid.value)
+  Boolean(hasDistinctTpmGuid.value && (keyInstalled.value || showTrialExpiration.value))
 );
 const disableTpmTransferButton = computed((): boolean => showTrialExpiration.value);
+const showTpmGuid = computed((): boolean =>
+  Boolean(showTpmTransferButton.value || hasBlacklistedTpmLicenseMismatch.value)
+);
 
 // Organize items into three sections
 const bootDeviceItems = computed((): RegistrationItemProps[] => {
@@ -144,7 +148,7 @@ const bootDeviceItems = computed((): RegistrationItemProps[] => {
           },
         ]
       : []),
-    ...(showTpmTransferButton.value && tpmGuid.value
+    ...(showTpmGuid.value && tpmGuid.value
       ? [
           {
             label: t('registration.tpmGuid'),
@@ -176,7 +180,7 @@ const bootDeviceItems = computed((): RegistrationItemProps[] => {
           },
         ]
       : []),
-    ...(state.value === 'EGUID'
+    ...(state.value === 'EGUID' || hasBlacklistedTpmLicenseMismatch.value
       ? [
           {
             label: t('registration.registeredGuid'),
@@ -369,7 +373,7 @@ const actionItems = computed((): RegistrationItemProps[] => {
 
           <!-- Actions Section -->
           <div
-            v-if="actionItems.length > 0"
+            v-if="actionItems.length > 0 || showTpmTransferButton"
             class="rounded-lg border border-gray-200 p-4 dark:border-gray-700"
           >
             <h4 class="mb-3 text-lg font-semibold">{{ t('registration.actions') }}</h4>

web/src/locales/ar.json

@@ -767,6 +767,9 @@
   "server.state.eblacklisted.heading": "معرّف الإقلاع المدرج بالقائمة السوداء",
   "server.state.eblacklisted.humanReadable": "مدرج بالقائمة السوداء",
   "server.state.eblacklisted.message": "<p>تم إدراج جهاز الإقلاع هذا على القائمة السوداء. يمكن أن يحدث هذا نتيجة نقل مفتاح الترخيص الخاص بك إلى جهاز بديل، وأنت تقوم حالياً بالإقلاع من جهازك القديم.</p><p>قد يكون الجهاز مدرجاً أيضاً بالقائمة السوداء إذا اكتشفنا أن الرقم التسلسلي غير فريد - وهذا شائع مع قارئات البطاقات USB.</p>",
+  "server.state.eblacklisted.tpmMismatch.heading": "License / TPM mismatch",
+  "server.state.eblacklisted.tpmMismatch.humanReadable": "LICENSE / TPM MISMATCH",
+  "server.state.eblacklisted.tpmMismatch.message": "<p>Your license is registered to a different TPM than the one currently detected. This can occur after a hardware swap.</p><p>Choose Replace Key to start the license replacement flow. The blacklisted boot flash will not be changed.</p>",
   "server.state.eblacklisted1.heading": "خطأ في جهاز الإقلاع",
   "server.state.eblacklisted1.message": "<p>جهاز الإقلاع هذا لديه معرّف غير صالح. الرجاء محاولة جهاز إقلاع مختلف</p>",
   "server.state.eblacklisted2.heading": "جهاز الإقلاع لا يحتوي على رقم تسلسلي",

web/src/locales/bn.json

@@ -767,6 +767,9 @@
   "server.state.eblacklisted.heading": "ব্ল্যাকলিস্টেড বুট ডিভাইস গাইড",
   "server.state.eblacklisted.humanReadable": "ব্ল্যাকলিস্টেড",
   "server.state.eblacklisted.message": "<p>এই বুট ডিভাইসটি ব্ল্যাকলিস্ট করা হয়েছে। এটি আপনার লাইসেন্স কী একটি প্রতিস্থাপন ডিভাইসে ট্রান্সফার করার ফলস্বরূপ হতে পারে, এবং আপাতত আপনি আপনার পুরনো ডিভাইস থেকে উঠেছেন।</p><p>ডিভাইসটিও ব্ল্যাকলিস্ট হতে পারে যদি আমরা অনন্য সিরিয়াল নম্বর না পাই – এটির মধ্যে ইউএসবি কার্ড রিডারে সাধারণ থাকে।</p>",
+  "server.state.eblacklisted.tpmMismatch.heading": "License / TPM mismatch",
+  "server.state.eblacklisted.tpmMismatch.humanReadable": "LICENSE / TPM MISMATCH",
+  "server.state.eblacklisted.tpmMismatch.message": "<p>Your license is registered to a different TPM than the one currently detected. This can occur after a hardware swap.</p><p>Choose Replace Key to start the license replacement flow. The blacklisted boot flash will not be changed.</p>",
   "server.state.eblacklisted1.heading": "বুট ডিভাইস ত্রুটি",
   "server.state.eblacklisted1.message": "<p>এই বুট ডিভাইসে অবৈধ গাইড হয়েছে। অনুগ্রহ করে অন্য এক বুট ডিভাইস চেষ্টা করুন।</p>",
   "server.state.eblacklisted2.heading": "বুট ডিভাইসে কোনো সিরিয়াল নম্বর নেই",

web/src/locales/ca.json

@@ -767,6 +767,9 @@
   "server.state.eblacklisted.heading": "Dispositiu de arrencada en llista negra GUID",
   "server.state.eblacklisted.humanReadable": "EN LLISTA NEGRA",
   "server.state.eblacklisted.message": "<p>Aquest dispositiu d'arrencada ha estat posat a la llista negra. Això pot passar com a resultat de transferir la vostra clau de llicència a un dispositiu de reemplaçament, i actualment esteu arrencant des del vostre dispositiu antic.</p><p>Un dispositiu també es pot incloure en la llista negra si descobrim que el número de sèrie no és únic – això és comú amb els lectors de targetes USB.</p>",
+  "server.state.eblacklisted.tpmMismatch.heading": "License / TPM mismatch",
+  "server.state.eblacklisted.tpmMismatch.humanReadable": "LICENSE / TPM MISMATCH",
+  "server.state.eblacklisted.tpmMismatch.message": "<p>Your license is registered to a different TPM than the one currently detected. This can occur after a hardware swap.</p><p>Choose Replace Key to start the license replacement flow. The blacklisted boot flash will not be changed.</p>",
   "server.state.eblacklisted1.heading": "Error de dispositiu d'arrencada",
   "server.state.eblacklisted1.message": "<p>Aquest dispositiu d'arrencada té un GUID no vàlid. Si us plau, proveu amb un altre dispositiu d'arrencada</p>",
   "server.state.eblacklisted2.heading": "El dispositiu d'arrencada no té número de sèrie",

web/src/locales/cs.json

@@ -767,6 +767,9 @@
   "server.state.eblacklisted.heading": "Zakázaný GUID boot zařízení",
   "server.state.eblacklisted.humanReadable": "ČERNÁ LISTINA",
   "server.state.eblacklisted.message": "<p>Toto boot zařízení bylo zakázáno. To může nastat v důsledku převodu vašeho licenčního klíče na náhradní zařízení a aktuálně bootujete ze starého zařízení.</p><p>Zařízení může být také zakázáno, pokud zjistíme, že sériové číslo není unikátní — to je běžné u USB čteček karet.</p>",
+  "server.state.eblacklisted.tpmMismatch.heading": "License / TPM mismatch",
+  "server.state.eblacklisted.tpmMismatch.humanReadable": "LICENSE / TPM MISMATCH",
+  "server.state.eblacklisted.tpmMismatch.message": "<p>Your license is registered to a different TPM than the one currently detected. This can occur after a hardware swap.</p><p>Choose Replace Key to start the license replacement flow. The blacklisted boot flash will not be changed.</p>",
   "server.state.eblacklisted1.heading": "Chyba boot zařízení",
   "server.state.eblacklisted1.message": "<p>Toto boot zařízení má neplatný GUID. Zkuste prosím jiné boot zařízení</p>",
   "server.state.eblacklisted2.heading": "Boot zařízení nemá sériové číslo",

web/src/locales/da.json

@@ -767,6 +767,9 @@
   "server.state.eblacklisted.heading": "Blacklistet boot-enhed GUID",
   "server.state.eblacklisted.humanReadable": "BLACKLISTED",
   "server.state.eblacklisted.message": "<p>Denne boot-enhed er blevet blacklistet. Dette kan ske som følge af at overføre din licensnøgle til en erstatningsenhed, og du er i øjeblikket startet fra din gamle enhed.</p><p>En enhed kan også blive blacklistet, hvis vi opdager, at serienummeret ikke er unikt – dette er almindeligt med USB-kortlæsere.</p>",
+  "server.state.eblacklisted.tpmMismatch.heading": "License / TPM mismatch",
+  "server.state.eblacklisted.tpmMismatch.humanReadable": "LICENSE / TPM MISMATCH",
+  "server.state.eblacklisted.tpmMismatch.message": "<p>Your license is registered to a different TPM than the one currently detected. This can occur after a hardware swap.</p><p>Choose Replace Key to start the license replacement flow. The blacklisted boot flash will not be changed.</p>",
   "server.state.eblacklisted1.heading": "Boot-enhed fejl",
   "server.state.eblacklisted1.message": "<p>Denne boot-enhed har en ugyldig GUID. Prøv venligst en anden boot-enhed</p>",
   "server.state.eblacklisted2.heading": "Boot-enhed har ikke noget serienummer",

web/src/locales/de.json

@@ -767,6 +767,9 @@
   "server.state.eblacklisted.heading": "Schwarze Liste Boot-Gerät-GUID",
   "server.state.eblacklisted.humanReadable": "AUF DER SCHWARZEN LISTE",
   "server.state.eblacklisted.message": "<p>Dieses Boot-Gerät wurde auf die schwarze Liste gesetzt. Dies kann passieren, wenn Ihr Lizenzschlüssel auf ein Ersatzgerät übertragen wurde und das Gerät, von dem Sie starten, das alte Gerät ist.</p><p>Ein Gerät kann auch auf die schwarze Liste gesetzt werden, wenn wir feststellen, dass die Seriennummer nicht eindeutig ist – was bei USB-Kartenlesern häufig vorkommt.</p>",
+  "server.state.eblacklisted.tpmMismatch.heading": "License / TPM mismatch",
+  "server.state.eblacklisted.tpmMismatch.humanReadable": "LICENSE / TPM MISMATCH",
+  "server.state.eblacklisted.tpmMismatch.message": "<p>Your license is registered to a different TPM than the one currently detected. This can occur after a hardware swap.</p><p>Choose Replace Key to start the license replacement flow. The blacklisted boot flash will not be changed.</p>",
   "server.state.eblacklisted1.heading": "Boot-Gerätefehler",
   "server.state.eblacklisted1.message": "<p>Dieses Boot-Gerät hat eine ungültige GUID. Bitte versuchen Sie ein anderes Boot-Gerät</p>",
   "server.state.eblacklisted2.heading": "Boot-Gerät hat keine Seriennummer",

web/src/locales/en.json

@@ -767,6 +767,9 @@
   "server.state.eblacklisted.heading": "Blacklisted boot device GUID",
   "server.state.eblacklisted.humanReadable": "BLACKLISTED",
   "server.state.eblacklisted.message": "<p>This boot device has been blacklisted. This can occur as a result of transferring your license key to a replacement device, and you are currently booted from your old device.</p><p>A device may also be blacklisted if we discover the serial number is not unique – this is common with USB card readers.</p>",
+  "server.state.eblacklisted.tpmMismatch.heading": "License / TPM mismatch",
+  "server.state.eblacklisted.tpmMismatch.humanReadable": "LICENSE / TPM MISMATCH",
+  "server.state.eblacklisted.tpmMismatch.message": "<p>Your license is registered to a different TPM than the one currently detected. This can occur after a hardware swap.</p><p>Choose Replace Key to start the license replacement flow. The blacklisted boot flash will not be changed.</p>",
   "server.state.eblacklisted1.heading": "Boot device error",
   "server.state.eblacklisted1.message": "<p>This boot device has an invalid GUID. Please try a different boot device</p>",
   "server.state.eblacklisted2.heading": "Boot device has no serial number",

web/src/locales/es.json

@@ -767,6 +767,9 @@
   "server.state.eblacklisted.heading": "Dispositivo de arranque en la lista negra GUID",
   "server.state.eblacklisted.humanReadable": "EN LISTA NEGRA",
   "server.state.eblacklisted.message": "<p>Este dispositivo de arranque ha sido incluido en la lista negra. Esto puede ocurrir como resultado de transferir su clave de licencia a un dispositivo de reemplazo, y actualmente está arrancando desde su dispositivo antiguo.</p><p>Un dispositivo también puede ser incluido en la lista negra si descubrimos que el número de serie no es único, lo cual es común con lectores de tarjetas USB.</p>",
+  "server.state.eblacklisted.tpmMismatch.heading": "License / TPM mismatch",
+  "server.state.eblacklisted.tpmMismatch.humanReadable": "LICENSE / TPM MISMATCH",
+  "server.state.eblacklisted.tpmMismatch.message": "<p>Your license is registered to a different TPM than the one currently detected. This can occur after a hardware swap.</p><p>Choose Replace Key to start the license replacement flow. The blacklisted boot flash will not be changed.</p>",
   "server.state.eblacklisted1.heading": "Error del dispositivo de arranque",
   "server.state.eblacklisted1.message": "<p>Este dispositivo de arranque tiene un GUID inválido. Por favor, pruebe con un dispositivo de arranque diferente.</p>",
   "server.state.eblacklisted2.heading": "El dispositivo de arranque no tiene número de serie",