From 8484a829e010422a3cf97f8f9d83b2fa968bd15c Mon Sep 17 00:00:00 2001
From: chubtub <43381989+chubtub@users.noreply.github.com>
Date: Wed, 22 Jan 2025 01:40:04 -0500
Subject: [PATCH] Clean up error reporting and logging

---
 .../persist/validation/FirmwareScvValidator.java     | 12 ++++++++----
 1 file changed, 8 insertions(+), 4 deletions(-)

diff --git a/HIRS_AttestationCA/src/main/java/hirs/attestationca/persist/validation/FirmwareScvValidator.java b/HIRS_AttestationCA/src/main/java/hirs/attestationca/persist/validation/FirmwareScvValidator.java
index 8fb45ed8..2b4d6024 100644
--- a/HIRS_AttestationCA/src/main/java/hirs/attestationca/persist/validation/FirmwareScvValidator.java
+++ b/HIRS_AttestationCA/src/main/java/hirs/attestationca/persist/validation/FirmwareScvValidator.java
@@ -86,7 +86,7 @@ public class FirmwareScvValidator extends SupplyChainCredentialValidator {
 
         String failedString = "";
         if (baseReferenceManifest == null) {
-            failedString = "Base Reference Integrity Manifest\n";
+            failedString = "Base Reference Integrity Manifest not found for " + hostName + "\n";
             passed = false;
         } else if (measurement == null) {
             measurement = (EventLogMeasurements) referenceManifestRepository.findByHexDecHashAndRimType(
@@ -99,7 +99,7 @@ public class FirmwareScvValidator extends SupplyChainCredentialValidator {
         }
 
         if (measurement == null) {
-            failedString += "Bios measurement";
+            failedString += "Bios measurement not found for " + hostName;
             passed = false;
         }
 
@@ -126,8 +126,7 @@ public class FirmwareScvValidator extends SupplyChainCredentialValidator {
             }
         }
         if (!passed) {
-            fwStatus = new AppraisalStatus(FAIL, String.format("Firmware Validation failed: "
-                    + "%s for %s cannot be found", failedString, hostName));
+            fwStatus = new AppraisalStatus(FAIL, failedString);
             if (measurement != null) {
                 measurement.setOverallValidationResult(fwStatus.getAppStatus());
                 referenceManifestRepository.save(measurement);
@@ -337,4 +336,9 @@ public class FirmwareScvValidator extends SupplyChainCredentialValidator {
 
         return pcrAppraisalStatus;
     }
+
+    private static void logAndReportError(AppraisalStatus status, String errorString) {
+        status.setMessage(errorString);
+        log.error(errorString);
+    }
 }