Clean up error reporting and logging

This commit is contained in:
chubtub 2025-01-22 01:40:04 -05:00
parent 7d950ea09c
commit 8484a829e0

View File

@ -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);
}
}