From 2b5720744580158f0cd919824ccf7b72a7836374 Mon Sep 17 00:00:00 2001 From: Cyrus <24922493+cyrus-dev@users.noreply.github.com> Date: Wed, 30 Sep 2020 07:51:27 -0400 Subject: [PATCH] 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. --- ...stractAttestationCertificateAuthority.java | 6 +++ ...eferenceManifestDetailsPageController.java | 2 +- .../ReferenceManifestPageController.java | 4 +- .../WEB-INF/jsp/reference-manifests.jsp | 2 +- .../main/webapp/WEB-INF/jsp/rim-details.jsp | 7 +--- .../src/main/webapp/common/rim_details.css | 10 +++++ .../data/persist/BaseReferenceManifest.java | 3 ++ .../hirs/data/persist/ReferenceManifest.java | 38 +++++++++---------- 8 files changed, 44 insertions(+), 28 deletions(-) diff --git a/HIRS_AttestationCA/src/main/java/hirs/attestationca/AbstractAttestationCertificateAuthority.java b/HIRS_AttestationCA/src/main/java/hirs/attestationca/AbstractAttestationCertificateAuthority.java index 46686746..f56cc6e3 100644 --- a/HIRS_AttestationCA/src/main/java/hirs/attestationca/AbstractAttestationCertificateAuthority.java +++ b/HIRS_AttestationCA/src/main/java/hirs/attestationca/AbstractAttestationCertificateAuthority.java @@ -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 diff --git a/HIRS_AttestationCAPortal/src/main/java/hirs/attestationca/portal/page/controllers/ReferenceManifestDetailsPageController.java b/HIRS_AttestationCAPortal/src/main/java/hirs/attestationca/portal/page/controllers/ReferenceManifestDetailsPageController.java index aedd4d55..4cb31788 100644 --- a/HIRS_AttestationCAPortal/src/main/java/hirs/attestationca/portal/page/controllers/ReferenceManifestDetailsPageController.java +++ b/HIRS_AttestationCAPortal/src/main/java/hirs/attestationca/portal/page/controllers/ReferenceManifestDetailsPageController.java @@ -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()); diff --git a/HIRS_AttestationCAPortal/src/main/java/hirs/attestationca/portal/page/controllers/ReferenceManifestPageController.java b/HIRS_AttestationCAPortal/src/main/java/hirs/attestationca/portal/page/controllers/ReferenceManifestPageController.java index 9c8eb677..2b4fc8f9 100644 --- a/HIRS_AttestationCAPortal/src/main/java/hirs/attestationca/portal/page/controllers/ReferenceManifestPageController.java +++ b/HIRS_AttestationCAPortal/src/main/java/hirs/attestationca/portal/page/controllers/ReferenceManifestPageController.java @@ -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 { diff --git a/HIRS_AttestationCAPortal/src/main/webapp/WEB-INF/jsp/reference-manifests.jsp b/HIRS_AttestationCAPortal/src/main/webapp/WEB-INF/jsp/reference-manifests.jsp index b4d5cda5..2f85be97 100644 --- a/HIRS_AttestationCAPortal/src/main/webapp/WEB-INF/jsp/reference-manifests.jsp +++ b/HIRS_AttestationCAPortal/src/main/webapp/WEB-INF/jsp/reference-manifests.jsp @@ -48,7 +48,7 @@ {data: 'rimType'}, {data: 'platformManufacturer'}, {data: 'platformModel'}, - {data: 'firmwareVersion'}, + {data: 'swidTagVersion'}, { data: 'id', orderable: false, diff --git a/HIRS_AttestationCAPortal/src/main/webapp/WEB-INF/jsp/rim-details.jsp b/HIRS_AttestationCAPortal/src/main/webapp/WEB-INF/jsp/rim-details.jsp index e801ab21..319ef09d 100644 --- a/HIRS_AttestationCAPortal/src/main/webapp/WEB-INF/jsp/rim-details.jsp +++ b/HIRS_AttestationCAPortal/src/main/webapp/WEB-INF/jsp/rim-details.jsp @@ -56,7 +56,7 @@ PCR${event.getPcrIndex()} ${event.getEventTypeStr()} ${event.getEventDigestStr()} - ${event.getEventContentStr()} + ${event.getEventContentStr()} @@ -73,7 +73,7 @@
SWID Name: ${initialData.swidName}
SWID Version: ${initialData.swidVersion}
SWID Tag ID: ${initialData.swidTagId}
-
SWID Tag Version: 
+
SWID Tag Version: ${initialData.swidTagVersion}
SWID Corpus: 
@@ -127,9 +127,6 @@
Payload Type: ${initialData.payloadType}
 - -
Firmware Version: ${initialData.firmwareVersion}
-
Binding Spec: ${initialData.bindingSpec}
Binding Spec Version: ${initialData.bindingSpecVersion}
diff --git a/HIRS_AttestationCAPortal/src/main/webapp/common/rim_details.css b/HIRS_AttestationCAPortal/src/main/webapp/common/rim_details.css index 36170572..0d01c08e 100644 --- a/HIRS_AttestationCAPortal/src/main/webapp/common/rim_details.css +++ b/HIRS_AttestationCAPortal/src/main/webapp/common/rim_details.css @@ -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; +} \ No newline at end of file diff --git a/HIRS_Utils/src/main/java/hirs/data/persist/BaseReferenceManifest.java b/HIRS_Utils/src/main/java/hirs/data/persist/BaseReferenceManifest.java index 85bb28b5..a48f5693 100644 --- a/HIRS_Utils/src/main/java/hirs/data/persist/BaseReferenceManifest.java +++ b/HIRS_Utils/src/main/java/hirs/data/persist/BaseReferenceManifest.java @@ -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) { diff --git a/HIRS_Utils/src/main/java/hirs/data/persist/ReferenceManifest.java b/HIRS_Utils/src/main/java/hirs/data/persist/ReferenceManifest.java index f6802122..0a94056c 100644 --- a/HIRS_Utils/src/main/java/hirs/data/persist/ReferenceManifest.java +++ b/HIRS_Utils/src/main/java/hirs/data/persist/ReferenceManifest.java @@ -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