From b7bba5caed29a965cc338d15d2b2fd150997fca4 Mon Sep 17 00:00:00 2001
From: Dimitri Zhurkin <dimitri.zhurkin@volpegroup.com>
Date: Wed, 30 Aug 2023 09:55:50 -0600
Subject: [PATCH] Rev 5 SSP - fix ipv4-has-non-placeholder in Schematron and
 XSpec

---
 ...rev5_MODERATE-baseline-resolved-profile_catalog.xml |  6 ------
 src/validations/rules/rev5/ssp.sch                     | 10 +++-------
 src/validations/test/rules/rev5/ssp.xspec              |  4 ++--
 3 files changed, 5 insertions(+), 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
index 6024f1ed4..e86c41cf4 100644
--- 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
index 261d8dcc5..60f28a832 100644
--- 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
index 71dd3c823..b195593f1 100644
--- 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