From 6e96c32a5e658731a6b4fe22ca2f82db97a9c9a8 Mon Sep 17 00:00:00 2001 From: Cyrus <24922493+cyrus-dev@users.noreply.github.com> Date: Tue, 11 Jul 2023 07:07:13 -0400 Subject: [PATCH] Please enter the message for your changes.ssociated event values to the support rim and delete them properly and to not also upload duplicate issues. [no ci] --- .../ReferenceDigestValueRepository.java | 9 +-- .../manager/ReferenceManifestRepository.java | 8 +- .../userdefined/rim/EventLogMeasurements.java | 73 ------------------- .../userdefined/rim/ReferenceDigestValue.java | 10 ++- ...eferenceManifestDetailsPageController.java | 36 +++------ .../ReferenceManifestPageController.java | 41 +++++++---- 6 files changed, 50 insertions(+), 127 deletions(-) diff --git a/HIRS_AttestationCA/src/main/java/hirs/attestationca/persist/entity/manager/ReferenceDigestValueRepository.java b/HIRS_AttestationCA/src/main/java/hirs/attestationca/persist/entity/manager/ReferenceDigestValueRepository.java index 0cdda1b0..87632ce1 100644 --- a/HIRS_AttestationCA/src/main/java/hirs/attestationca/persist/entity/manager/ReferenceDigestValueRepository.java +++ b/HIRS_AttestationCA/src/main/java/hirs/attestationca/persist/entity/manager/ReferenceDigestValueRepository.java @@ -13,12 +13,11 @@ public interface ReferenceDigestValueRepository extends JpaRepository listAll(); - @Query(value = "SELECT * FROM ReferenceDigestValue WHERE model = ?1", nativeQuery = true) - List listByModel(String model); - @Query(value = "SELECT * FROM ReferenceDigestValue WHERE manufacturer = ?1", nativeQuery = true) - List listByManufacturer(String manufacturer); + List findByModel(String model); + List findByManufacturer(String manufacturer); @Query(value = "SELECT * FROM ReferenceDigestValue WHERE baseRimId = '?1' OR supportRimId = '?1'", nativeQuery = true) List getValuesByRimId(UUID associatedRimId); @Query(value = "SELECT * FROM ReferenceDigestValue WHERE supportRimId = '?1'", nativeQuery = true) - List getValuesBySupportRimId(UUID supportRimId); + List findBySupportRimId(UUID supportRimId); + List findBySupportRimHash(String supportRimHash); } diff --git a/HIRS_AttestationCA/src/main/java/hirs/attestationca/persist/entity/manager/ReferenceManifestRepository.java b/HIRS_AttestationCA/src/main/java/hirs/attestationca/persist/entity/manager/ReferenceManifestRepository.java index 136d9b83..80782394 100644 --- a/HIRS_AttestationCA/src/main/java/hirs/attestationca/persist/entity/manager/ReferenceManifestRepository.java +++ b/HIRS_AttestationCA/src/main/java/hirs/attestationca/persist/entity/manager/ReferenceManifestRepository.java @@ -14,14 +14,12 @@ import java.util.UUID; @Repository public interface ReferenceManifestRepository extends JpaRepository { - @Query(value = "SELECT * FROM ReferenceManifest WHERE hexDecHash = ?1", nativeQuery = true) - ReferenceManifest findByHash(String rimHash); - @Query(value = "SELECT * FROM ReferenceManifest WHERE hexDecHash = ?1 AND rimType = ?2", nativeQuery = true) - ReferenceManifest findByHash(String rimHash, String rimType); + ReferenceManifest findByHexDecHash(String hexDecHash); + ReferenceManifest findByHexDecHashAndRimType(String hexDecHash, String rimType); @Query(value = "SELECT * FROM ReferenceManifest WHERE platformManufacturer = ?1 AND platformModel = ?2 AND rimType = 'Base'", nativeQuery = true) List getBaseByManufacturerModel(String manufacturer, String model); @Query(value = "SELECT * FROM ReferenceManifest WHERE platformManufacturer = ?1 AND DTYPE = ?2", nativeQuery = true) - List getByManufacturer(String manufacturer, String dType); + ReferenceManifest getByManufacturer(String manufacturer, String dType); @Query(value = "SELECT * FROM ReferenceManifest WHERE platformModel = ?1 AND DTYPE = ?2", nativeQuery = true) ReferenceManifest getByModel(String model, String dType); @Query(value = "SELECT * FROM ReferenceManifest WHERE DTYPE = 'BaseReferenceManifest'", nativeQuery = true) diff --git a/HIRS_AttestationCA/src/main/java/hirs/attestationca/persist/entity/userdefined/rim/EventLogMeasurements.java b/HIRS_AttestationCA/src/main/java/hirs/attestationca/persist/entity/userdefined/rim/EventLogMeasurements.java index b3987b29..4d400121 100644 --- a/HIRS_AttestationCA/src/main/java/hirs/attestationca/persist/entity/userdefined/rim/EventLogMeasurements.java +++ b/HIRS_AttestationCA/src/main/java/hirs/attestationca/persist/entity/userdefined/rim/EventLogMeasurements.java @@ -3,8 +3,6 @@ package hirs.attestationca.persist.entity.userdefined.rim; import com.fasterxml.jackson.annotation.JsonIgnore; import hirs.attestationca.persist.entity.userdefined.ReferenceManifest; import hirs.attestationca.persist.enums.AppraisalStatus; -import hirs.attestationca.persist.service.ReferenceManifestServiceImpl; -import hirs.attestationca.persist.service.selector.ReferenceManifestSelector; import hirs.utils.tpm.eventlog.TCGEventLog; import hirs.utils.tpm.eventlog.TpmPcrEvent; import jakarta.persistence.Column; @@ -41,66 +39,6 @@ public class EventLogMeasurements extends ReferenceManifest { @Getter @Setter private AppraisalStatus.Status overallValidationResult = AppraisalStatus.Status.FAIL; - /** - * This class enables the retrieval of SupportReferenceManifest by their attributes. - */ - public static class Selector extends ReferenceManifestSelector { - /** - * Construct a new ReferenceManifestSelector that - * will use the given (@link ReferenceManifestService} - * to retrieve one or may SupportReferenceManifest. - * - * @param referenceManifestManager the reference manifest manager to be used to retrieve - * reference manifests. - */ - public Selector(final ReferenceManifestServiceImpl referenceManifestManager) { - super(referenceManifestManager, EventLogMeasurements.class, false); - } - - /** - * Specify the platform manufacturer that rims must have to be considered - * as matching. - * @param manufacturer string for the manufacturer - * @return this instance - */ - public Selector byManufacturer(final String manufacturer) { - setFieldValue(PLATFORM_MANUFACTURER, manufacturer); - return this; - } - - /** - * Specify the platform model that rims must have to be considered - * as matching. - * @param model string for the model - * @return this instance - */ - public Selector byModel(final String model) { - setFieldValue(PLATFORM_MODEL, model); - return this; - } - - /** - * Specify the device name that rims must have to be considered - * as matching. - * @param deviceName string for the deviceName - * @return this instance - */ - public Selector byDeviceName(final String deviceName) { - setFieldValue("deviceName", deviceName); - return this; - } - - /** - * Specify the RIM hash associated with the Event Log. - * @param hexDecHash the hash of the file associated with the rim - * @return this instance - */ - public Selector byHexDecHash(final String hexDecHash) { - setFieldValue(HEX_DEC_HASH_FIELD, hexDecHash); - return this; - } - } - /** * Support constructor for the RIM object. * @@ -135,17 +73,6 @@ public class EventLogMeasurements extends ReferenceManifest { this.pcrHash = 0; } - /** - * Get a Selector for use in retrieving ReferenceManifest. - * - * @param rimMan the ReferenceManifestService to be used to retrieve - * persisted RIMs - * @return a Selector instance to use for retrieving RIMs - */ - public static Selector select(final ReferenceManifestServiceImpl rimMan) { - return new Selector(rimMan); - } - /** * Getter method for the expected PCR values contained within the support * RIM. diff --git a/HIRS_AttestationCA/src/main/java/hirs/attestationca/persist/entity/userdefined/rim/ReferenceDigestValue.java b/HIRS_AttestationCA/src/main/java/hirs/attestationca/persist/entity/userdefined/rim/ReferenceDigestValue.java index 3d1129d7..be8106ef 100644 --- a/HIRS_AttestationCA/src/main/java/hirs/attestationca/persist/entity/userdefined/rim/ReferenceDigestValue.java +++ b/HIRS_AttestationCA/src/main/java/hirs/attestationca/persist/entity/userdefined/rim/ReferenceDigestValue.java @@ -1,6 +1,6 @@ package hirs.attestationca.persist.entity.userdefined.rim; -import hirs.attestationca.persist.entity.ArchivableEntity; +import hirs.attestationca.persist.entity.AbstractEntity; import jakarta.persistence.Access; import jakarta.persistence.AccessType; import jakarta.persistence.Column; @@ -26,7 +26,7 @@ import java.util.UUID; @EqualsAndHashCode(callSuper=false) @Table(name = "ReferenceDigestValue") @Access(AccessType.FIELD) -public class ReferenceDigestValue extends ArchivableEntity { +public class ReferenceDigestValue extends AbstractEntity { @JdbcTypeCode(java.sql.Types.VARCHAR) @Column @@ -43,6 +43,8 @@ public class ReferenceDigestValue extends ArchivableEntity { @Column(nullable = false) private String digestValue; @Column(nullable = false) + private String supportRimHash; + @Column(nullable = false) private String eventType; @Column(columnDefinition = "blob", nullable = true) private byte[] contentBlob; @@ -64,6 +66,7 @@ public class ReferenceDigestValue extends ArchivableEntity { this.model = ""; this.pcrIndex = -1; this.digestValue = ""; + this.supportRimHash = ""; this.eventType = ""; this.matchFail = false; this.patched = false; @@ -79,6 +82,7 @@ public class ReferenceDigestValue extends ArchivableEntity { * @param model the specific device type * @param pcrIndex the event number * @param digestValue the key digest value + * @param supportRimHash the support file's hash value * @param eventType the event type to store * @param matchFail the status of the baseline check * @param patched the status of the value being updated to patch @@ -88,6 +92,7 @@ public class ReferenceDigestValue extends ArchivableEntity { public ReferenceDigestValue(final UUID baseRimId, final UUID supportRimId, final String manufacturer, final String model, final int pcrIndex, final String digestValue, + final String supportRimHash, final String eventType, final boolean matchFail, final boolean patched, final boolean updated, final byte[] contentBlob) { @@ -97,6 +102,7 @@ public class ReferenceDigestValue extends ArchivableEntity { this.model = model; this.pcrIndex = pcrIndex; this.digestValue = digestValue; + this.supportRimHash = supportRimHash; this.eventType = eventType; this.matchFail = matchFail; this.patched = patched; 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 901c53c0..37bf6ac3 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 @@ -29,7 +29,6 @@ import org.springframework.web.bind.annotation.RequestMapping; import org.springframework.web.servlet.ModelAndView; import java.io.IOException; -import java.nio.charset.StandardCharsets; import java.security.KeyStore; import java.security.NoSuchAlgorithmException; import java.security.cert.CertificateException; @@ -234,8 +233,8 @@ public class ReferenceManifestDetailsPageController extends PageController resources = baseRim.getFileResources(); TCGEventLog logProcessor = null; - List subManifests; SupportReferenceManifest support = null; if (baseRim.getAssociatedRim() == null) { - /** - * Need to have parsing implemented - */ -// referenceManifestRepository.findByHash("hexDecHash", "Support"); - subManifests = referenceManifestRepository + support = (SupportReferenceManifest) referenceManifestRepository .getByManufacturer(baseRim.getPlatformManufacturer(), "SupportReferenceManifest"); - String fileString = new String(baseRim.getRimBytes(), StandardCharsets.UTF_8); - - for (ReferenceManifest rim : subManifests) { - if (rim instanceof SupportReferenceManifest) { - support = (SupportReferenceManifest) rim; - if (fileString.contains(rim.getHexDecHash())) { - break; - } - } - } if (support != null) { baseRim.setAssociatedRim(support.getId()); } @@ -314,8 +298,8 @@ public class ReferenceManifestDetailsPageController extends PageController eventValues = new ArrayList<>(); + List eventValues = new LinkedList<>(); if (measurements.getDeviceName() != null) { supports.addAll(referenceManifestRepository.byDeviceName(measurements .getDeviceName())); @@ -545,7 +527,7 @@ public class ReferenceManifestDetailsPageController extends PageController values = new LinkedList<>(); if (referenceManifest == null) { String notFoundMessage = "Unable to locate RIM with ID: " + id; messages.addError(notFoundMessage); log.warn(notFoundMessage); } else { + // if support rim, update associated events + values = referenceDigestValueRepository.findBySupportRimHash( + referenceManifest.getHexDecHash()); + + for (ReferenceDigestValue value : values) { + referenceDigestValueRepository.delete(value); + } + referenceManifestRepository.delete(referenceManifest); String deleteCompletedMessage = "RIM successfully deleted"; messages.addInfo(deleteCompletedMessage); log.info(deleteCompletedMessage); - - // if support rim, update associated events - if (referenceManifest instanceof SupportReferenceManifest) { - List values = referenceDigestValueRepository - .getValuesByRimId(referenceManifest.getId()); - - for (ReferenceDigestValue value : values) { - referenceDigestValueRepository.delete(value); - } - } } } catch (IllegalArgumentException iaEx) { String uuidError = "Failed to parse ID from: " + id; @@ -396,6 +395,8 @@ public class ReferenceManifestPageController extends PageController