From 8b24aa92dda0cd1b95290459c6e77d97bf05a9bd Mon Sep 17 00:00:00 2001 From: iadgovuser29 <33426478+iadgovuser29@users.noreply.github.com> Date: Thu, 13 Jun 2024 11:01:33 -0400 Subject: [PATCH] Should RIM lookup include rimType? --- .../persist/entity/manager/ReferenceManifestRepository.java | 2 +- .../persist/service/SupplyChainValidationService.java | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) 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 ecf941df..92554be4 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 @@ -17,7 +17,7 @@ import java.util.UUID; public interface ReferenceManifestRepository extends JpaRepository { ReferenceManifest findByHexDecHash(String hexDecHash); - ReferenceManifest findByEventLogHash(String eventLogHash); + ReferenceManifest findByEventLogHash(String rimType, String eventLogHash); ReferenceManifest findByBase64Hash(String base64Hash); ReferenceManifest findByHexDecHashAndRimType(String hexDecHash, String rimType); @Query(value = "SELECT * FROM ReferenceManifest WHERE platformManufacturer = ?1 AND platformModel = ?2 AND rimType = 'Base'", nativeQuery = true) diff --git a/HIRS_AttestationCA/src/main/java/hirs/attestationca/persist/service/SupplyChainValidationService.java b/HIRS_AttestationCA/src/main/java/hirs/attestationca/persist/service/SupplyChainValidationService.java index 7f17908c..d4260e88 100644 --- a/HIRS_AttestationCA/src/main/java/hirs/attestationca/persist/service/SupplyChainValidationService.java +++ b/HIRS_AttestationCA/src/main/java/hirs/attestationca/persist/service/SupplyChainValidationService.java @@ -321,7 +321,7 @@ public class SupplyChainValidationService { deviceName)); } else { ReferenceManifest manifest = referenceManifestRepository - .findByEventLogHash(sRim.getEventLogHash()); + .findByEventLogHash(sRim.getRimType(), sRim.getEventLogHash()); if (manifest instanceof EventLogMeasurements) { eventLog = (EventLogMeasurements)manifest; }