Handle replacement base and support RIMs in their respective logic bl…

…ocks

HIRS_AttestationCA/src/main/java/hirs/attestationca/persist/provision/IdentityClaimProcessor.java

@@ -63,6 +63,7 @@
 import java.util.List;
 import java.util.Map;
 import java.util.Optional;
+import java.util.UUID;
 import java.util.regex.Matcher;
 import java.util.regex.Pattern;
 
@@ -351,6 +352,7 @@ private DeviceInfoReport parseDeviceInfo(final ProvisionerTpm2.IdentityClaim cla
  SupportReferenceManifest support = null;
  EventLogMeasurements measurements;
  boolean isReplacement = false;
+ String replacementRimId = "";
  String tagId = "";
  String fileName = "";
  Pattern pattern = Pattern.compile("([^\\s]+(\\.(?i)(rimpcr|rimel|bin|log))$)");
@@ -378,20 +380,13 @@ private DeviceInfoReport parseDeviceInfo(final ProvisionerTpm2.IdentityClaim cla
  for (BaseReferenceManifest bRim : baseRims) {
  if (bRim.getTagId().equals(dbBaseRim.getTagId())) {
  dbBaseRim = bRim;
+ replacementRimId = dbBaseRim.getAssociatedRim().toString();
  isReplacement = true;
  break;
  }
  }
  dbBaseRim.setDeviceName(dv.getNw().getHostname());
  this.referenceManifestRepository.save(dbBaseRim);
- Optional<ReferenceManifest> associatedRim =
- referenceManifestRepository.findById(dbBaseRim.getAssociatedRim());
- SupportReferenceManifest sRim = null;
- if (associatedRim.isPresent()) {
- sRim = (SupportReferenceManifest) associatedRim.get();
- }
- sRim.setDeviceName(dv.getNw().getHostname());
- this.referenceManifestRepository.save(sRim);
  } else if (dbBaseRim.isArchived()) {
  /*
  This block accounts for RIMs that may have been soft-deleted (archived)
@@ -433,24 +428,35 @@ private DeviceInfoReport parseDeviceInfo(final ProvisionerTpm2.IdentityClaim cla
  support = (SupportReferenceManifest) referenceManifestRepository.findByHexDecHashAndRimType(
  Hex.encodeHexString(messageDigest.digest(logFile.toByteArray())),
  ReferenceManifest.SUPPORT_RIM);
- if (support == null && !isReplacement) {
+ if (support == null) {
  /*
  Either the logFile does not have a corresponding support RIM in the backend
  or it was deleted. The support RIM for a replacement base RIM is handled
  in the previous loop block.
  */
- support = new SupportReferenceManifest(
- String.format("%s.rimel",
- defaultClientName),
- logFile.toByteArray());
- // this is a validity check
- new TCGEventLog(support.getRimBytes());
- // no issues, continue
- support.setPlatformManufacturer(dv.getHw().getManufacturer());
- support.setPlatformModel(dv.getHw().getProductName());
- support.setFileName(String.format("%s_[%s].rimel", defaultClientName,
- support.getHexDecHash().substring(
- support.getHexDecHash().length() - NUM_OF_VARIABLES)));
+ if (isReplacement) {
+ Optional<ReferenceManifest> replacementRim =
+ referenceManifestRepository.findById(UUID.fromString(replacementRimId));
+ if (replacementRim.isPresent()) {
+ support = (SupportReferenceManifest) replacementRim.get();
+ support.setDeviceName(dv.getNw().getHostname());
+ } else {
+ throw new Exception("Unable to locate support RIM " + replacementRimId);
+ }
+ } else {
+ support = new SupportReferenceManifest(
+ String.format("%s.rimel",
+ defaultClientName),
+ logFile.toByteArray());
+ // this is a validity check
+ new TCGEventLog(support.getRimBytes());
+ // no issues, continue
+ support.setPlatformManufacturer(dv.getHw().getManufacturer());
+ support.setPlatformModel(dv.getHw().getProductName());
+ support.setFileName(String.format("%s_[%s].rimel", defaultClientName,
+ support.getHexDecHash().substring(
+ support.getHexDecHash().length() - NUM_OF_VARIABLES)));
+ }
  support.setDeviceName(dv.getNw().getHostname());
  this.referenceManifestRepository.save(support);
  } else if (support.isArchived()) {