ExternalVendorCode/HIRS
1
0
Fork 0
mirror of https://github.com/nsacyber/HIRS.git synced 2025-03-13 07:53:54 +00:00
Code Issues Actions 9 Packages Projects Releases Wiki Activity

Changed the look up for support rim hash from base [no ci]

Browse Source
This commit is contained in:
Cyrus 2023-05-25 09:07:58 -04:00
parent 8ee74ca135
commit 2526808e5c
2 changed files with 18 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
HIRS_AttestationCAPortal/src/main/java/hirs/attestationca/portal/page/controllers/ReferenceManifestPageController.java
View File

@ -251,8 +251,10 @@ public class ReferenceManifestPageController
.getRIMs()); .getRIMs());
allSupports.stream().forEach((support) -> { allSupports.stream().forEach((support) -> {
if (!support.isUpdated() && payloadHashMap.containsKey(support.getHexDecHash())) { BaseReferenceManifest dbBaseRim = BaseReferenceManifest
BaseReferenceManifest dbBaseRim = payloadHashMap.get(support.getHexDecHash()); .select(referenceManifestManager)
.byRimLink(support.getHexDecHash()).getRIM();
if (dbBaseRim != null) {
support.setSwidTagVersion(dbBaseRim.getSwidTagVersion()); support.setSwidTagVersion(dbBaseRim.getSwidTagVersion());
support.setPlatformManufacturer(dbBaseRim.getPlatformManufacturer()); support.setPlatformManufacturer(dbBaseRim.getPlatformManufacturer());
support.setPlatformModel(dbBaseRim.getPlatformModel()); support.setPlatformModel(dbBaseRim.getPlatformModel());

14
HIRS_Utils/src/main/java/hirs/data/persist/BaseReferenceManifest.java
View File

@ -43,6 +43,10 @@ public class BaseReferenceManifest extends ReferenceManifest {
* Holds the name of the 'base64Hash' field. * Holds the name of the 'base64Hash' field.
*/ */
public static final String BASE_64_HASH_FIELD = "base64Hash"; public static final String BASE_64_HASH_FIELD = "base64Hash";
/**
* Holds the name of the 'base64Hash' field.
*/
public static final String RIM_LINK_FIELD = "rimLinkHash";
private static JAXBContext jaxbContext; private static JAXBContext jaxbContext;
@ -171,6 +175,16 @@ public class BaseReferenceManifest extends ReferenceManifest {
return this; return this;
} }
/**
* Specify the RIM hash associated with the base RIM.
* @param rimLinkHash the hash of the file associated with the rim
* @return this instance
*/
public Selector byRimLink(final String rimLinkHash) {
setFieldValue(RIM_LINK_FIELD, rimLinkHash);
return this;
}
/** /**
* Specify the RIM hash associated with the base RIM. * Specify the RIM hash associated with the base RIM.
* @param hexDecHash the hash of the file associated with the rim * @param hexDecHash the hash of the file associated with the rim