mirror of
https://github.com/nsacyber/HIRS.git
synced 2025-04-07 19:34:27 +00:00
Updated the Tag Version and version fields for Base and Support rims. In addition, adjusted the lay out of the support rim table so that the events column isn't as long. Instead, the full content shows up in an hover action.
This commit is contained in:
Cyrus
parent
2cb7c26fc3
commit
2b57207445
@ -515,8 +515,14 @@ public abstract class AbstractAttestationCertificateAuthority
|
||||
if (request.getQuote() != null && !request.getQuote().isEmpty()) {
|
||||
parseTPMQuote(request.getQuote().toStringUtf8());
|
||||
}
|
||||
if (request.getPcrslist() != null) {
|
||||
LOG.error(String.format("Not Null: %s", request.getPcrslist()));
|
||||
} else {
|
||||
LOG.error("The getPcrsList is null");
|
||||
}
|
||||
if (request.getPcrslist() != null && !request.getPcrslist().isEmpty()) {
|
||||
this.pcrValues = request.getPcrslist().toStringUtf8();
|
||||
LOG.error(String.format("%s", request.getPcrslist().toStringUtf8()));
|
||||
}
|
||||
|
||||
// Get device name and device
|
||||
|
||||
@ -127,6 +127,7 @@ public class ReferenceManifestDetailsPageController
|
||||
// Software Identity
|
||||
data.put("swidName", bRim.getSwidName());
|
||||
data.put("swidVersion", bRim.getSwidVersion());
|
||||
data.put("swidTagVersion", bRim.getSwidTagVersion());
|
||||
if (bRim.isSwidCorpus() == 1) {
|
||||
data.put("swidCorpus", "True");
|
||||
} else {
|
||||
@ -157,7 +158,6 @@ public class ReferenceManifestDetailsPageController
|
||||
data.put("platformManufacturerId", bRim.getPlatformManufacturerId());
|
||||
data.put("platformModel", bRim.getPlatformModel());
|
||||
data.put("platformVersion", bRim.getPlatformVersion());
|
||||
data.put("firmwareVersion", bRim.getFirmwareVersion());
|
||||
data.put("payloadType", bRim.getPayloadType());
|
||||
data.put("colloquialVersion", bRim.getColloquialVersion());
|
||||
data.put("edition", bRim.getEdition());
|
||||
|
||||
@ -212,7 +212,7 @@ public class ReferenceManifestPageController
|
||||
BaseReferenceManifest bRim = (BaseReferenceManifest) element;
|
||||
for (SwidResource swid : bRim.parseResource()) {
|
||||
if (swid.getName().equals(rim.getFileName())) {
|
||||
rim.setFirmwareVersion(swid.getSize());
|
||||
rim.setSwidTagVersion(bRim.getSwidTagVersion());
|
||||
rim.setPlatformManufacturer(bRim.getPlatformManufacturer());
|
||||
rim.setPlatformModel(bRim.getPlatformModel());
|
||||
rim.setTagId(bRim.getTagId());
|
||||
@ -229,7 +229,7 @@ public class ReferenceManifestPageController
|
||||
if (swid.getName().equals(sRim.getFileName())) {
|
||||
sRim.setPlatformManufacturer(bRim.getPlatformManufacturer());
|
||||
sRim.setPlatformModel(bRim.getPlatformModel());
|
||||
sRim.setFirmwareVersion(swid.getSize());
|
||||
sRim.setSwidTagVersion(bRim.getSwidTagVersion());
|
||||
sRim.setTagId(bRim.getTagId());
|
||||
rim.setAssociatedRim(sRim.getId());
|
||||
try {
|
||||
|
||||
@ -48,7 +48,7 @@
|
||||
{data: 'rimType'},
|
||||
{data: 'platformManufacturer'},
|
||||
{data: 'platformModel'},
|
||||
{data: 'firmwareVersion'},
|
||||
{data: 'swidTagVersion'},
|
||||
{
|
||||
data: 'id',
|
||||
orderable: false,
|
||||
|
||||
@ -56,7 +56,7 @@
|
||||
<td>PCR${event.getPcrIndex()}</td>
|
||||
<td>${event.getEventTypeStr()}</td>
|
||||
<td>${event.getEventDigestStr()}</td>
|
||||
<td>${event.getEventContentStr()}</td>
|
||||
<td class="dataCell" title="${event.getEventContentStr()}">${event.getEventContentStr()}</td>
|
||||
</tr>
|
||||
<c:set var="count" value="${count + 1}" scope="page"/>
|
||||
</c:forEach>
|
||||
@ -73,7 +73,7 @@
|
||||
<div>SWID Name: <span>${initialData.swidName}</span></div>
|
||||
<div>SWID Version: <span>${initialData.swidVersion}</span></div>
|
||||
<div>SWID Tag ID: <span>${initialData.swidTagId}</span></div>
|
||||
<div>SWID Tag Version: <span></span></div>
|
||||
<div>SWID Tag Version: <span>${initialData.swidTagVersion}</span></div>
|
||||
<c:if test="${initialData.swidCorpus}">
|
||||
<div>SWID Corpus: <span><img src="${icons}/ic_checkbox_marked_circle_black_green_24dp.png" title="Corpus Flag"></span>
|
||||
</div>
|
||||
@ -127,9 +127,6 @@
|
||||
<c:if test="${not empty initialData.payloadType}">
|
||||
<div>Payload Type: <span>${initialData.payloadType}</span></div>
|
||||
</c:if>
|
||||
<c:if test="${not empty initialData.firmwareVersion}">
|
||||
<div>Firmware Version: <span>${initialData.firmwareVersion}</span></div>
|
||||
</c:if>
|
||||
<div>Binding Spec: <span>${initialData.bindingSpec}</span></div>
|
||||
<div>Binding Spec Version: <span>${initialData.bindingSpecVersion}</span></div>
|
||||
<c:if test="${not empty initiaData.pcUriGlobal}">
|
||||
|
||||
@ -34,3 +34,13 @@
|
||||
/* Add a grey background color to the table header and on hover */
|
||||
background-color: #f1f1f1;
|
||||
}
|
||||
|
||||
.dataCell {
|
||||
display: table-cell;
|
||||
padding: 2px 15px 2px 15px;
|
||||
white-space: nowrap;
|
||||
text-overflow: ellipsis;
|
||||
overflow: hidden;
|
||||
width: auto;
|
||||
max-width: 1px;
|
||||
}
|
||||
@ -109,6 +109,9 @@ public class BaseReferenceManifest extends ReferenceManifest {
|
||||
this.swidPatch = si.isPatch() ? 1 : 0;
|
||||
this.swidSupplemental = si.isSupplemental() ? 1 : 0;
|
||||
this.swidVersion = si.getVersion();
|
||||
if (si.getTagVersion() != null) {
|
||||
this.setSwidTagVersion(si.getTagVersion().toString());
|
||||
}
|
||||
|
||||
for (Object object : si.getEntityOrEvidenceOrLink()) {
|
||||
if (object instanceof JAXBElement) {
|
||||
|
||||
@ -99,7 +99,7 @@ public abstract class ReferenceManifest extends ArchivableEntity {
|
||||
@Column
|
||||
private String platformManufacturerId = null;
|
||||
@Column
|
||||
private String firmwareVersion = null;
|
||||
private String swidTagVersion = null;
|
||||
@Column
|
||||
private String platformModel = null;
|
||||
@Column(nullable = false)
|
||||
@ -238,6 +238,24 @@ public abstract class ReferenceManifest extends ArchivableEntity {
|
||||
this.rimType = rimType;
|
||||
}
|
||||
|
||||
/**
|
||||
* Getter for the SWID tag version.
|
||||
*
|
||||
* @return string of the tag version number
|
||||
*/
|
||||
public String getSwidTagVersion() {
|
||||
return swidTagVersion;
|
||||
}
|
||||
|
||||
/**
|
||||
* Setter for the SWID tag version.
|
||||
*
|
||||
* @param swidTagVersion string of the version
|
||||
*/
|
||||
public void setSwidTagVersion(final String swidTagVersion) {
|
||||
this.swidTagVersion = swidTagVersion;
|
||||
}
|
||||
|
||||
/**
|
||||
* Getter for the RIM Tag ID.
|
||||
*
|
||||
@ -256,24 +274,6 @@ public abstract class ReferenceManifest extends ArchivableEntity {
|
||||
this.tagId = tagId;
|
||||
}
|
||||
|
||||
/**
|
||||
* Getter for the firmware version info.
|
||||
*
|
||||
* @return string for the firmware version
|
||||
*/
|
||||
public String getFirmwareVersion() {
|
||||
return firmwareVersion;
|
||||
}
|
||||
|
||||
/**
|
||||
* Setter for the firmware version info.
|
||||
*
|
||||
* @param firmwareVersion passed in firmware version
|
||||
*/
|
||||
public void setFirmwareVersion(final String firmwareVersion) {
|
||||
this.firmwareVersion = firmwareVersion;
|
||||
}
|
||||
|
||||
/**
|
||||
* Getter for the associated RIM DB ID.
|
||||
* @return UUID for the rim
|
||||
|
||||
Loading…
x
Reference in New Issue
Block a user