Merge pull request #484 from GSA/rev5-ssp-sch-xspec-ipv4-has-non-plac…

…eholder Rev 5 SSP - fix ipv4-has-non-placeholder in Schematron and XSpec
GSA · Aug 30, 2023 · 5f12e5c · 5f12e5c
2 parents c203f7a + b7bba5c
commit 5f12e5c
Show file tree

Hide file tree

Showing 3 changed files with 5 additions and 15 deletions.
diff --git a/dist/content/rev5/baselines/xml/FedRAMP_rev5_MODERATE-baseline-resolved-profile_catalog.xml b/dist/content/rev5/baselines/xml/FedRAMP_rev5_MODERATE-baseline-resolved-profile_catalog.xml
@@ -57,12 +57,6 @@
          <param id="ac-1_prm_1">
             <label>organization-defined personnel or roles</label>
          </param>
-         <param id="ac-01_odp.01">
-            <label>personnel or roles</label>
-            <guideline>
-               <p>personnel or roles to whom the access control policy is to be disseminated is/are defined;</p>
-            </guideline>
-         </param>
          <param id="ac-01_odp.02">
             <label>personnel or roles</label>
             <guideline>

diff --git a/src/validations/rules/rev5/ssp.sch b/src/validations/rules/rev5/ssp.sch
@@ -2309,13 +2309,9 @@
                 feddoc:documentation-reference="OMB Mandate M-21-07"
                 id="ipv4-has-non-placeholder"
                 role="error"
-                test="
-                    if (oscal:prop[@name eq 'ipv4-address'])
-                    then
-                        (oscal:prop[matches(@value, '0.0.0.0')])
-                    else
-                        (false())"><xsl:value-of
-                    select="oscal:prop[@name = 'asset-id']/@value" /> must have an appropriate IPv4 value.</sch:assert>
+                test="oscal:prop[@name eq 'ipv4-address']/@value ne '0.0.0.0'">
+                    <xsl:value-of 
+                        select="oscal:prop[@name = 'asset-id']/@value" /> must have an appropriate IPv4 value.</sch:assert>
             <sch:let
                 name="IPv6-regex"
                 value="

diff --git a/src/validations/test/rules/rev5/ssp.xspec b/src/validations/test/rules/rev5/ssp.xspec
@@ -6288,7 +6288,7 @@
                             xmlns="http://csrc.nist.gov/ns/oscal/1.0">
                             <prop
                                 name="ipv4-address"
-                                value="0.0.0.0" />
+                                value="10.2.2.2" />
                         </inventory-item>
                     </x:context>
                     <x:expect-not-assert
@@ -6303,7 +6303,7 @@
                             xmlns="http://csrc.nist.gov/ns/oscal/1.0">
                             <prop
                                 name="ipv4-address"
-                                value="10.2.2.2" />
+                                value="0.0.0.0" />
                         </inventory-item>
                     </x:context>
                     <x:expect-assert