Adjust target

GSA · Feb 14, 2025 · 776d0ff · 776d0ff
1 parent 4a15a00
commit 776d0ff
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 2 deletions.
diff --git a/src/validations/constraints/content/ssp-inventory-item-has-hardware-model-INVALID.xml b/src/validations/constraints/content/ssp-inventory-item-has-hardware-model-INVALID.xml
@@ -1,7 +1,13 @@
 <system-security-plan xmlns="http://csrc.nist.gov/ns/oscal/1.0" uuid="11111111-2222-4000-8000-000000000000">
   <system-implementation>
+    <component uuid="11111111-2222-4000-8000-009000000007" type="hardware">
+      <prop name="asset-type" value="hardware"/>
+      <!-- <prop name="hardware-model" value="model"/> Missing "hardware-model" prop. -->
+    </component>
     <inventory-item uuid="11111111-2222-4000-8000-011000000001">
       <!-- <prop name="hardware-model" value="model"/> Missing "hardware-model" prop. -->
+      <implemented-component component-uuid="11111111-2222-4000-8000-009000000007">
+      </implemented-component>
     </inventory-item>
   </system-implementation>
-</system-security-plan>
+</system-security-plan>
diff --git a/src/validations/constraints/fedramp-external-constraints.xml b/src/validations/constraints/fedramp-external-constraints.xml
@@ -692,7 +692,7 @@
                 <prop namespace="https://docs.oasis-open.org/sarif/sarif/v2.1.0" name="help-url" value="https://automate.fedramp.gov/documentation/ssp/5-attachments/#system-inventory-approach"/>
                 <message>Every inventory-item MUST provide remarks to describe the function of the item, either within the inventory-item itself, or within the component linked by the inventory-item.</message>
             </expect>
-            <expect id="inventory-item-has-hardware-model" target="." test="count(prop[@name='hardware-model' ]) >= 1 or count(../component[@uuid=$component-uuid]/prop[@name='hardware-model' ]) >= 1" level="ERROR">
+            <expect id="inventory-item-has-hardware-model" target=".[../component[@uuid=$component-uuid and (@type='hardware' or prop[@name='asset-type' and @value='hardware'])] or prop[@name='asset-type' and @value='hardware']]" test="count(prop[@name='hardware-model' ]) >= 1 or count(../component[@uuid=$component-uuid]/prop[@name='hardware-model' ]) >= 1" level="ERROR">
                 <formal-name>Inventory Item Has Hardware Model</formal-name>
                 <prop namespace="https://docs.oasis-open.org/sarif/sarif/v2.1.0" name="help-url" value="https://automate.fedramp.gov/documentation/ssp/5-attachments/#system-inventory-approach"/>
                 <message>In a FedRAMP SSP, each inventory item MUST provide the hardware model either in the inventory item itself or within the linked component.</message>