Merge branch 'canary' into constraints/issue-1041

GSA · Jan 9, 2025 · 163e957 · 163e957
2 parents 4c0efa1 + 719cf2c
commit 163e957
Show file tree

Hide file tree

Showing 9 changed files with 77 additions and 0 deletions.
diff --git a/features/fedramp_extensions.feature b/features/fedramp_extensions.feature
@@ -122,6 +122,8 @@ Examples:
   | inventory-item-allows-authenticated-scan |
   | inventory-item-and-component-has-public |
   | inventory-item-has-hardware-model |
+  | inventory-item-has-software-name |
+  | inventory-item-has-software-version |
   | inventory-item-has-valid-mac-address |
   | inventory-item-has-vendor-name |
   | inventory-item-or-component-has-asset-id |
@@ -379,6 +381,10 @@ Examples:
   | inventory-item-and-component-has-public-PASS.yaml |
   | inventory-item-has-hardware-model-FAIL.yaml |
   | inventory-item-has-hardware-model-PASS.yaml |
+  | inventory-item-has-software-name-FAIL.yaml |
+  | inventory-item-has-software-name-PASS.yaml |
+  | inventory-item-has-software-version-FAIL.yaml |
+  | inventory-item-has-software-version-PASS.yaml |
   | inventory-item-has-valid-mac-address-FAIL.yaml |
   | inventory-item-has-valid-mac-address-PASS.yaml |
   | inventory-item-has-vendor-name-FAIL.yaml |

diff --git a/src/content/rev5/examples/ssp/xml/fedramp-ssp-example.oscal.xml b/src/content/rev5/examples/ssp/xml/fedramp-ssp-example.oscal.xml
@@ -2307,6 +2307,7 @@ approved.</p>
       </description>
       <prop name="hardware-model" value="model"/>
       <prop name="asset-id" value="unique-asset-ID-01"/>
+      <prop name="software-version" value="software-version"/>
       <prop name="ipv4-address" value="10.1.1.1"/>
       <prop name="ipv6-address" value="2001:db8:3333:4444:5555:6666:7777:8888"/>
       <prop name="virtual" value="no"/>

diff --git a/src/validations/constraints/content/ssp-inventory-item-has-software-name-INVALID.xml b/src/validations/constraints/content/ssp-inventory-item-has-software-name-INVALID.xml
@@ -0,0 +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="software">
+      <!-- <prop name="software-name" value="software-name"/> Missing software-name in linked component-->
+    </component>
+    <inventory-item uuid="11111111-2222-4000-8000-011000000001">
+      <prop name="asset-type" value="operating-system"/>
+      <!-- <prop name="software-name" value="software-name"/> Missing software-name in inventory-item.-->
+      <implemented-component component-uuid="11111111-2222-4000-8000-009000000007">
+      </implemented-component>
+    </inventory-item>
+  </system-implementation>
+</system-security-plan>
diff --git a/src/validations/constraints/content/ssp-inventory-item-has-software-version-INVALID.xml b/src/validations/constraints/content/ssp-inventory-item-has-software-version-INVALID.xml
@@ -0,0 +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="software">
+      <!-- <prop name="software-version" value="software-version"/> Missing software-version in linked component-->
+    </component>
+    <inventory-item uuid="11111111-2222-4000-8000-011000000001">
+      <prop name="asset-type" value="operating-system"/>
+      <!-- <prop name="software-version" value="software-version"/> Missing software-version in inventory-item.-->
+      <implemented-component component-uuid="11111111-2222-4000-8000-009000000007">
+      </implemented-component>
+    </inventory-item>
+  </system-implementation>
+</system-security-plan>
diff --git a/src/validations/constraints/fedramp-external-constraints.xml b/src/validations/constraints/fedramp-external-constraints.xml
@@ -667,6 +667,14 @@
                 <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>
+            <expect id="inventory-item-has-software-name" target=".[prop[@name='asset-type' and @value=('operating-system', 'container', 'image')] or ../component[uuid=$component-uuid and type='software']]" test="count(prop[@name=('software-name', 'os-name')]) = 1 or count(../component[@uuid=$component-uuid]/prop[@name=('software-name', 'os-name')]) = 1" level="ERROR">
+                <formal-name>Inventory Item Has Software Name</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 include the software name in the inventory item itself or within the linked component.</message>
+            <expect id="inventory-item-has-software-version" target=".[prop[@name='asset-type' and @value=('operating-system', 'container', 'image')] or ../component[uuid=$component-uuid and type='software']]" test="count(prop[@name=('software-version', 'os-version')]) = 1 or count(../component[@uuid=$component-uuid]/prop[@name=('software-version', 'os-version')]) = 1" level="ERROR">
+                <formal-name>Inventory Item Has Software Version</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 include the software version in the inventory item itself or within the linked component.</message>
             </expect>
              <expect id="inventory-item-has-valid-mac-address" target=".[prop[@name='mac-address']]/prop[@name='mac-address']" test="matches(@value, '^([0-9A-Fa-f]{2}[:-]){5}([0-9A-Fa-f]{2})|([0-9a-fA-F]{4}\\.[0-9a-fA-F]{4}\\.[0-9a-fA-F]{4})$')" level="ERROR">
                 <formal-name>Inventory Item Has Valid Mac Address</formal-name>

diff --git a/src/validations/constraints/unit-tests/inventory-item-has-software-name-FAIL.yaml b/src/validations/constraints/unit-tests/inventory-item-has-software-name-FAIL.yaml
@@ -0,0 +1,9 @@
+test-case:
+  name: Negative Test for inventory-item-has-software-name
+  description: >-
+    This test case validates the behavior of constraint
+    inventory-item-has-software-name
+  content: ../content/ssp-inventory-item-has-software-name-INVALID.xml
+  expectations:
+    - constraint-id: inventory-item-has-software-name
+      result: fail
diff --git a/src/validations/constraints/unit-tests/inventory-item-has-software-name-PASS.yaml b/src/validations/constraints/unit-tests/inventory-item-has-software-name-PASS.yaml
@@ -0,0 +1,9 @@
+test-case:
+  name: Positive Test for inventory-item-has-software-name
+  description: >-
+    This test case validates the behavior of constraint
+    inventory-item-has-software-name
+  content: ../../../content/rev5/examples/ssp/xml/fedramp-ssp-example.oscal.xml
+  expectations:
+    - constraint-id: inventory-item-has-software-name
+      result: pass
diff --git a/src/validations/constraints/unit-tests/inventory-item-has-software-version-FAIL.yaml b/src/validations/constraints/unit-tests/inventory-item-has-software-version-FAIL.yaml
@@ -0,0 +1,9 @@
+test-case:
+  name: Negative Test for inventory-item-has-software-version
+  description: >-
+    This test case validates the behavior of constraint
+    inventory-item-has-software-version
+  content: ../content/ssp-inventory-item-has-software-version-INVALID.xml
+  expectations:
+    - constraint-id: inventory-item-has-software-version
+      result: fail
diff --git a/src/validations/constraints/unit-tests/inventory-item-has-software-version-PASS.yaml b/src/validations/constraints/unit-tests/inventory-item-has-software-version-PASS.yaml
@@ -0,0 +1,9 @@
+test-case:
+  name: Positive Test for inventory-item-has-software-version
+  description: >-
+    This test case validates the behavior of constraint
+    inventory-item-has-software-version
+  content: ../../../content/rev5/examples/ssp/xml/fedramp-ssp-example.oscal.xml
+  expectations:
+    - constraint-id: inventory-item-has-software-version
+      result: pass