ExternalVendorCode/HIRS
1
0
Fork 0
mirror of https://github.com/nsacyber/HIRS.git synced 2024-12-18 20:47:58 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Merge pull request #822 from nsacyber/v3_issue-807

Browse Source 
[#807] Display PCR comparison table for mismatches
This commit is contained in:
chubtub 2024-08-09 09:59:27 -04:00 committed by GitHub
commit f7917625ed
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
3 changed files with 17 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
HIRS_AttestationCA/src/main/java/hirs/attestationca/persist/entity/userdefined/SupplyChainValidation.java
View File

@ -105,7 +105,7 @@ public class SupplyChainValidation extends ArchivableEntity {
this.certificatesUsed = new ArrayList<>();
this.rimId = "";
for (ArchivableEntity ae : certificatesUsed) {
if (ae instanceof BaseReferenceManifest rm) {
if (ae instanceof ReferenceManifest rm) {
this.rimId = rm.getId().toString();
break;
} else if (ae instanceof Certificate) {

22
HIRS_AttestationCA/src/main/java/hirs/attestationca/persist/service/ValidationService.java
View File

@ -190,16 +190,22 @@ public class ValidationService {
final SupplyChainValidation.ValidationType validationType
= SupplyChainValidation.ValidationType.FIRMWARE;
List<ReferenceManifest> rims = rimRepo.findByDeviceName(device.getName());
ReferenceManifest baseRim = null;
for (ReferenceManifest rim : rims) {
if (rim.getRimType().equals(ReferenceManifest.BASE_RIM)) {
baseRim = rim;
}
}
AppraisalStatus result = FirmwareScvValidator.validateFirmware(device, policySettings,
rimRepo, rdvRepo, caRepo);
Level logLevel;
List<ReferenceManifest> rims = rimRepo.findByDeviceName(device.getName());
ReferenceManifest referenceManifest = null;
String rimType = "";
if (result.getAdditionalInfo().equals(ReferenceManifest.MEASUREMENT_RIM)) {
rimType = ReferenceManifest.MEASUREMENT_RIM;
} else {
rimType = ReferenceManifest.BASE_RIM;
}
for (ReferenceManifest rim : rims) {
if (rim.getRimType().equals(rimType)) {
referenceManifest = rim;
}
}
switch (result.getAppStatus()) {
case PASS:
@ -213,7 +219,7 @@ public class ValidationService {
logLevel = Level.ERROR;
}
return buildValidationRecord(validationType, result.getAppStatus(),
result.getMessage(), baseRim, logLevel);
result.getMessage(), referenceManifest, logLevel);
}
/**

3
HIRS_AttestationCA/src/main/java/hirs/attestationca/persist/validation/FirmwareScvValidator.java
View File

@ -270,7 +270,8 @@ public class FirmwareScvValidator extends SupplyChainCredentialValidator {
fwStatus = new AppraisalStatus(FAIL, String.format("%s%n%s",
fwStatus.getMessage(), sb.toString()));
} else {
fwStatus = new AppraisalStatus(FAIL, sb.toString());
fwStatus = new AppraisalStatus(FAIL,
sb.toString(), ReferenceManifest.MEASUREMENT_RIM);
}
}
}