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

Some minor updates. Fixed a null pointer exception in the

Browse Source 
SupplyChainValidationServiceImpl.  Updated warnings when files are
missing from the device claim
This commit is contained in:
Cyrus 2022-02-11 07:32:07 -05:00
parent 13e8074e88
commit 2db5b86da1
3 changed files with 13 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
HIRS_AttestationCA/src/main/java/hirs/attestationca/AbstractAttestationCertificateAuthority.java
View File

@ -840,7 +840,8 @@ public abstract class AbstractAttestationCertificateAuthority
}
}
} else {
LOG.warn("Device did not send support RIM file...");
LOG.warn(String.format("%s did not send support RIM file...",
dv.getNw().getHostname()));
}
if (dv.getSwidfileCount() > 0) {
@ -876,7 +877,8 @@ public abstract class AbstractAttestationCertificateAuthority
}
}
} else {
LOG.warn("Device did not send swid tag file...");
LOG.warn(String.format("%s did not send swid tag file...",
dv.getNw().getHostname()));
}
//update Support RIMs and Base RIMs.
@ -952,7 +954,8 @@ public abstract class AbstractAttestationCertificateAuthority
LOG.error(ioEx);
}
} else {
LOG.warn("Device did not send bios measurement log...");
LOG.warn(String.format("Device did not send bios measurement log...",
dv.getNw().getHostname()));
}
// Get TPM info, currently unimplemented
@ -1885,7 +1888,7 @@ public abstract class AbstractAttestationCertificateAuthority
generateCertificate = scp.isIssueAttestationCertificate();
if (issuedAc != null && scp.isGenerateOnExpiration()) {
if (issuedAc.getEndValidity().after(currentDate)) {
// so the issued AC is expired
// so the issued AC is not expired
// however are we within the threshold
days = daysBetween(currentDate, issuedAc.getEndValidity());
if (days < Integer.parseInt(scp.getReissueThreshold())) {

9
HIRS_AttestationCA/src/main/java/hirs/attestationca/service/SupplyChainValidationServiceImpl.java
View File

@ -389,7 +389,7 @@ public class SupplyChainValidationServiceImpl implements SupplyChainValidationSe
Set<BaseReferenceManifest> baseReferenceManifests = null;
BaseReferenceManifest baseReferenceManifest = null;
ReferenceManifest supportReferenceManifest = null;
ReferenceManifest measurement = null;
EventLogMeasurements measurement = null;
ReferenceDigestRecord digestRecord = null;
baseReferenceManifests = BaseReferenceManifest.select(referenceManifestManager)
@ -581,9 +581,10 @@ public class SupplyChainValidationServiceImpl implements SupplyChainValidationSe
} else {
fwStatus = new AppraisalStatus(FAIL, String.format("Firmware Validation failed: "
+ "%s for %s can not be found", failedString, manufacturer));
EventLogMeasurements eventLog = (EventLogMeasurements) measurement;
eventLog.setOverallValidationResult(fwStatus.getAppStatus());
this.referenceManifestManager.update(eventLog);
if (measurement != null) {
measurement.setOverallValidationResult(fwStatus.getAppStatus());
this.referenceManifestManager.update(measurement);
}
}
return buildValidationRecord(SupplyChainValidation.ValidationType.FIRMWARE,

2
HIRS_Utils/src/main/java/hirs/data/persist/ReferenceDigestRecord.java
View File

@ -30,7 +30,7 @@ public class ReferenceDigestRecord extends ArchivableEntity {
private String model;
@Column(nullable = false)
private String deviceName;
@Column(columnDefinition = "blob", nullable = true)
@Column(columnDefinition = "mediumblob", nullable = true)
private byte[] valueBlob;
/**