From ab8d30ee8254b218f405a461c905dc33c9a74161 Mon Sep 17 00:00:00 2001
From: Cyrus <24922493+cyrus-dev@users.noreply.github.com>
Date: Thu, 7 Jan 2021 09:48:04 -0500
Subject: [PATCH] Corrected the missing boot order entry on the page and
 updated how the boot variables are searched for.  However, DBX is still not
 showing up.

---
 .../ReferenceManifestDetailsPageController.java           | 8 ++++----
 .../src/main/webapp/WEB-INF/jsp/rim-details.jsp           | 8 +++++++-
 2 files changed, 11 insertions(+), 5 deletions(-)

diff --git a/HIRS_AttestationCAPortal/src/main/java/hirs/attestationca/portal/page/controllers/ReferenceManifestDetailsPageController.java b/HIRS_AttestationCAPortal/src/main/java/hirs/attestationca/portal/page/controllers/ReferenceManifestDetailsPageController.java
index 20dc0199..17b8e7ee 100644
--- a/HIRS_AttestationCAPortal/src/main/java/hirs/attestationca/portal/page/controllers/ReferenceManifestDetailsPageController.java
+++ b/HIRS_AttestationCAPortal/src/main/java/hirs/attestationca/portal/page/controllers/ReferenceManifestDetailsPageController.java
@@ -382,13 +382,13 @@ public class ReferenceManifestDetailsPageController
                 bootOrder = true;
             } else if (contentStr.contains("Boot0000")) {
                 defaultBootDevice = true;
-            } else if (contentStr.contains("PK")) {
+            } else if (contentStr.contains("variable named PK")) {
                 pk = true;
-            } else if (contentStr.contains("KEK")) {
+            } else if (contentStr.contains("variable named KEK")) {
                 kek = true;
-            } else if (contentStr.contains("DB")) {
+            } else if (contentStr.contains("variable named db")) {
                 sigDb = true;
-            } else if (contentStr.contains("DBX")) {
+            } else if (contentStr.contains("variable named dbx")) {
                 forbiddenDbx = true;
             } else if (contentStr.contains("Secure Boot is Enabled")) {
                 secureBoot = true;
diff --git a/HIRS_AttestationCAPortal/src/main/webapp/WEB-INF/jsp/rim-details.jsp b/HIRS_AttestationCAPortal/src/main/webapp/WEB-INF/jsp/rim-details.jsp
index 6a8492c5..ecdd813d 100644
--- a/HIRS_AttestationCAPortal/src/main/webapp/WEB-INF/jsp/rim-details.jsp
+++ b/HIRS_AttestationCAPortal/src/main/webapp/WEB-INF/jsp/rim-details.jsp
@@ -85,6 +85,9 @@
                                                 <c:if test="${initialData.gptTable}">
                                                 <li>GPT Table</li>
                                                 </c:if>
+                                                <c:if test="${initialData.bootOrder}">
+                                                <li>Boot Order</li>
+                                                </c:if>
                                                 <c:if test="${initialData.defaultBootDevice}">
                                                 <li>Default boot device</li>
                                                 </c:if>
@@ -132,7 +135,7 @@
                                                 </c:if>
                                         </ul>
 
-                                        <c:if test="${not initialData.acpiTables || not initialData.smbiosTables || not initialData.gptTable || not initialData.defaultBootDevice}">
+                                        <c:if test="${not initialData.acpiTables || not initialData.smbiosTables || not initialData.gptTable || not initialData.bootOrder || not initialData.defaultBootDevice}">
                                             <li>Device Configuration</li>
                                             </c:if>
                                         <ul>
@@ -145,6 +148,9 @@
                                                 <c:if test="${not initialData.gptTable}">
                                                 <li>GPT Table</li>
                                                 </c:if>
+                                                <c:if test="${not initialData.bootOrder}">
+                                                <li>Boot Order</li>
+                                                </c:if>
                                                 <c:if test="${not initialData.defaultBootDevice}">
                                                 <li>Default boot device</li>
                                                 </c:if>