ExternalVendorCode/HIRS
1
0
Fork 0
mirror of https://github.com/nsacyber/HIRS.git synced 2025-01-01 18:56:46 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Merge pull request #460 from nsacyber/issue-448

Browse Source 
[#448] Visual Updates for Firmware Validation
This commit is contained in:
iadgovuser26 2022-04-29 12:36:26 -04:00 committed by GitHub
commit 0917b9a872
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 25 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -445,6 +445,7 @@ public class SupplyChainValidationServiceImpl implements SupplyChainValidationSe
passed = false; passed = false;
fwStatus = new AppraisalStatus(FAIL, fwStatus = new AppraisalStatus(FAIL,
"Firmware validation failed: invalid certificate path."); "Firmware validation failed: invalid certificate path.");
validationObject = baseReferenceManifest;
} }
} catch (IOException e) { } catch (IOException e) {
LOGGER.error("Error getting X509 cert from manager: " + e.getMessage()); LOGGER.error("Error getting X509 cert from manager: " + e.getMessage());
@ -467,7 +468,7 @@ public class SupplyChainValidationServiceImpl implements SupplyChainValidationSe
} }
} }
if (signingCert == null) { if (passed && signingCert == null) {
passed = false; passed = false;
fwStatus = new AppraisalStatus(FAIL, fwStatus = new AppraisalStatus(FAIL,
"Firmware validation failed: signing cert not found."); "Firmware validation failed: signing cert not found.");

2
HIRS_AttestationCAPortal/src/main/webapp/WEB-INF/jsp/index.jsp
View File

@ -70,7 +70,7 @@
<h3> <h3>
<a href="${portal}/rim-database"><img src="${icons}/ic_devices_black_24dp.png" /> RIM Database</a> <a href="${portal}/rim-database"><img src="${icons}/ic_devices_black_24dp.png" /> RIM Database</a>
</h3> </h3>
<h4>View a list of TPM events </h4> <h4>View a list of Reference Integrity Measurements</h4>
</div> </div>
</div> </div>
</div> </div>

21
HIRS_AttestationCAPortal/src/main/webapp/WEB-INF/jsp/rim-details.jsp
View File

@ -13,10 +13,12 @@
<jsp:attribute name="pageHeaderTitle"> <jsp:attribute name="pageHeaderTitle">
<c:choose> <c:choose>
<c:when test="${initialData.rimType=='Measurement'}"> <c:when test="${initialData.rimType=='Measurement'}">
TCG Event Log <c:if test="${initialData.validationResult=='PASS'}">
<a href="${portal}/reference-manifests/download?id=${param.id}"> TCG Log events
<img src="${icons}/ic_file_download_black_24dp.png" title="Download ${initialData.rimType} RIM"> </c:if>
</a> <c:if test="${initialData.validationResult=='FAIL'}">
TCG Log event(s) not found in the RIM DB
</c:if>
</c:when> </c:when>
<c:otherwise> <c:otherwise>
${initialData.rimType} Reference Integrity Manifest ${initialData.rimType} Reference Integrity Manifest
@ -38,7 +40,7 @@
<c:when test="${initialData.rimType=='Support' || (initialData.rimType=='Measurement' && initialData.validationResult=='PASS')}"> <c:when test="${initialData.rimType=='Support' || (initialData.rimType=='Measurement' && initialData.validationResult=='PASS')}">
<div class="row"> <div class="row">
<div class="col-md-1 col-md-offset-1"><span class="colHeader">Additional<br />RIM Info</span></div> <div class="col-md-1 col-md-offset-1"><span class="colHeader">Additional<br />RIM Info</span></div>
<div id="baseRim" class="col col-md-8"> <div class="col col-md-8">
<c:choose> <c:choose>
<c:when test="${not empty initialData.associatedRim}"> <c:when test="${not empty initialData.associatedRim}">
<a href="${portal}/rim-details?id=${initialData.associatedRim}"> <a href="${portal}/rim-details?id=${initialData.associatedRim}">
@ -272,6 +274,13 @@
<div class="row"> <div class="row">
<div class="col-md-1 col-md-offset-1"><span class="colHeader">Base/Support</span></div> <div class="col-md-1 col-md-offset-1"><span class="colHeader">Base/Support</span></div>
<div id="measurements" class="col col-md-8"> <div id="measurements" class="col col-md-8">
<div>Download Measurement:&nbsp;
<span>
<a href="${portal}/reference-manifests/download?id=${param.id}">
BIOS Measurements
</a>
</span>
</div>
<c:if test="${not empty initialData.hostName}"> <c:if test="${not empty initialData.hostName}">
<div>Device:&nbsp;<span>${initialData.hostName}</span> <div>Device:&nbsp;<span>${initialData.hostName}</span>
</div> </div>
@ -306,7 +315,7 @@
</div> </div>
<div style="display: flex;"> <div style="display: flex;">
<div class="mappedButton"> <div class="mappedButton">
Baseline Events of Type:<br /> Expected Events from RIM DB:<br />
<span style="word-wrap: break-word"><a role="button" data-toggle="collapse" href="#eventContent${iterator}">${lEvent.getEventTypeString()}</a></span> <span style="word-wrap: break-word"><a role="button" data-toggle="collapse" href="#eventContent${iterator}">${lEvent.getEventTypeString()}</a></span>
</div> </div>
<div id="eventContent${iterator}" class="panel-collapse collapse in" style="flex: 2"> <div id="eventContent${iterator}" class="panel-collapse collapse in" style="flex: 2">