ExternalVendorCode/HIRS
1
0
Fork 0
mirror of https://github.com/nsacyber/HIRS.git synced 2025-03-10 14:34:27 +00:00
Code Issues Actions 6 Packages Projects Releases Wiki Activity

Final changes to be tested against component failures

Browse Source
This commit is contained in:
Cyrus 2020-11-12 09:58:18 -05:00
parent 67b70a386d
commit f7912908e0
2 changed files with 3 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
HIRS_AttestationCAPortal/src/main/java/hirs/attestationca/portal/util/CertificateStringMapBuilder.java
View File

@ -31,7 +31,6 @@ public final class CertificateStringMapBuilder {
private static final Logger LOGGER = private static final Logger LOGGER =
LogManager.getLogger(CertificateStringMapBuilder.class); LogManager.getLogger(CertificateStringMapBuilder.class);
private static final int VALUE_INDEX = 1;
private CertificateStringMapBuilder() { private CertificateStringMapBuilder() {
@ -341,19 +340,7 @@ public final class CertificateStringMapBuilder {
//CPSuri //CPSuri
data.put("CPSuri", certificate.getCPSuri()); data.put("CPSuri", certificate.getCPSuri());
//component failure //component failure
StringBuilder savedFailures = new StringBuilder(); data.put("failures", certificate.getComponentFailures());
String[] serialSplit;
for (String str : certificate.getComponentFailures().split(",")) {
if (str.contains("Model")) {
serialSplit = str.split("=");
if (serialSplit.length > VALUE_INDEX) {
savedFailures.append(serialSplit[VALUE_INDEX]);
} else {
savedFailures.append(str);
}
}
}
data.put("failures", savedFailures.toString());
//Get platform Configuration values and set map with it //Get platform Configuration values and set map with it
PlatformConfiguration platformConfiguration = certificate.getPlatformConfiguration(); PlatformConfiguration platformConfiguration = certificate.getPlatformConfiguration();

3
HIRS_AttestationCAPortal/src/main/webapp/WEB-INF/jsp/certificate-details.jsp
View File

@ -614,10 +614,11 @@
<div class="panel-body"> <div class="panel-body">
<div id="componentIdentifier" class="row"> <div id="componentIdentifier" class="row">
<c:forEach items="${initialData.componentsIdentifier}" var="component"> <c:forEach items="${initialData.componentsIdentifier}" var="component">
<c:set var="combined" value="${component.getComponentManufacturer()}${component.getComponentModel()}" scope="page"/>
<div class="component col col-md-4"> <div class="component col col-md-4">
<div class="panel panel-default"> <div class="panel panel-default">
<c:choose> <c:choose>
<c:when test="${fn:contains(initialData.failures, component.getComponentSerial()) && not empty fn:trim(component.getComponentSerial())}"> <c:when test="${fn:contains(initialData.failures, combined)}">
<div class="panel-heading" style="background-color: red; color: white"> <div class="panel-heading" style="background-color: red; color: white">
</c:when> </c:when>
<c:otherwise> <c:otherwise>