ExternalVendorCode/HIRS
1
0
Fork 0
mirror of https://github.com/nsacyber/HIRS.git synced 2025-01-18 18:56:29 +00:00
Code Issues Actions 3 Packages Projects Releases Wiki Activity

The if statement that uses the new ignore policy was improperly

Browse Source 
implemented.  Updated so that any non-revision attribute will save
This commit is contained in:
Cyrus 2024-03-13 20:18:39 -04:00
parent a9e403d1a0
commit 6a13d8dbb1
1 changed files with 14 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
HIRS_AttestationCA/src/main/java/hirs/attestationca/persist/validation/CertificateAttributeScvValidator.java
View File

@ -266,13 +266,16 @@ public class CertificateAttributeScvValidator extends SupplyChainCredentialValid
componentInfos, componentResults); componentInfos, componentResults);
int numOfAttributes = 0; int numOfAttributes = 0;
if (!remainingComponentResults.isEmpty()) { if (!remainingComponentResults.isEmpty()) {
List<ComponentAttributeResult> attributeResults = checkComponentClassMap( List<ComponentAttributeResult> attributeResults = checkComponentClassMap(
componentInfos, remainingComponentResults); componentInfos, remainingComponentResults);
boolean saveAttributeResult;
for (ComponentAttributeResult componentAttributeResult : attributeResults) { for (ComponentAttributeResult componentAttributeResult : attributeResults) {
if (componentAttributeResult.getAttribute().equalsIgnoreCase(ComponentResult.ATTRIBUTE_REVISION) saveAttributeResult = true;
&& !ignoreRevisionAttribute) { if (ignoreRevisionAttribute) {
saveAttributeResult = !componentAttributeResult.getAttribute()
.equalsIgnoreCase(ComponentResult.ATTRIBUTE_REVISION);
}
if (saveAttributeResult) {
componentAttributeResult.setProvisionSessionId(provisionSessionId); componentAttributeResult.setProvisionSessionId(provisionSessionId);
componentAttributeRepository.save(componentAttributeResult); componentAttributeRepository.save(componentAttributeResult);
fieldValidation &= componentAttributeResult.checkMatchedStatus(); fieldValidation &= componentAttributeResult.checkMatchedStatus();
@ -372,11 +375,14 @@ public class CertificateAttributeScvValidator extends SupplyChainCredentialValid
if (!remainingComponentResults.isEmpty()) { if (!remainingComponentResults.isEmpty()) {
List<ComponentAttributeResult> attributeResults = checkComponentClassMap( List<ComponentAttributeResult> attributeResults = checkComponentClassMap(
componentInfos, remainingComponentResults); componentInfos, remainingComponentResults);
boolean saveAttributeResult;
for (ComponentAttributeResult componentAttributeResult : attributeResults) { for (ComponentAttributeResult componentAttributeResult : attributeResults) {
if (componentAttributeResult.getAttribute() saveAttributeResult = true;
.equalsIgnoreCase(ComponentResult.ATTRIBUTE_REVISION) if (ignoreRevisionAttribute) {
&& !ignoreRevisionAttribute) { saveAttributeResult = !componentAttributeResult.getAttribute()
.equalsIgnoreCase(ComponentResult.ATTRIBUTE_REVISION);
}
if (saveAttributeResult) {
componentAttributeResult.setProvisionSessionId(provisionSessionId); componentAttributeResult.setProvisionSessionId(provisionSessionId);
componentAttributeRepository.save(componentAttributeResult); componentAttributeRepository.save(componentAttributeResult);
fieldValidation &= componentAttributeResult.checkMatchedStatus(); fieldValidation &= componentAttributeResult.checkMatchedStatus();