From 1004b5dc3e22a0a238f5445b1447c4c2ed5d673c Mon Sep 17 00:00:00 2001
From: Dimitri Zhurkin <dimitri.zhurkin@volpegroup.com>
Date: Thu, 16 Nov 2023 14:36:31 -0700
Subject: [PATCH] Rev 5 SAR - revise other-than-satisfied validations
 (issue-481)

---
 .gitignore                                |  1 +
 src/validations/rules/rev5/sar.sch        |  4 ++--
 src/validations/test/rules/rev5/sar.xspec | 12 ++++++------
 3 files changed, 9 insertions(+), 8 deletions(-)

diff --git a/.gitignore b/.gitignore
index 39b360381..95677ec70 100644
--- a/.gitignore
+++ b/.gitignore
@@ -30,3 +30,4 @@ src/validations/test/rules/xspec
 src/validations/test/rules/rev5/ssp-result.html
 src/validations/test/rules/rev4/ssp-result.html
 src/validations/test/rules/rev5/poam-result.html
+src/validations/test/rules/rev5/sar-result.html
diff --git a/src/validations/rules/rev5/sar.sch b/src/validations/rules/rev5/sar.sch
index a3f3d25f3..8a5b13603 100644
--- a/src/validations/rules/rev5/sar.sch
+++ b/src/validations/rules/rev5/sar.sch
@@ -384,7 +384,7 @@
 
             <sch:let
                 name="pl-2-other-than-satisfied-findings"
-                value="oscal:finding/oscal:target[@type = 'objective-id'][oscal:status ne 'satisfied'][matches(@target-id, '^pl-2\.')]/@target-id" />
+                value="oscal:finding/oscal:target[@type = 'objective-id'][oscal:status eq 'not-satisfied'][matches(@target-id, '^pl-2\.')]/@target-id" />
 
             <sch:let
                 name="pl-2-profile-objectives"
@@ -511,7 +511,7 @@
 
             <sch:let
                 name="satisfaction-status"
-                value="'satisfied', 'other-than-satisfied'" />
+                value="'satisfied', 'not-satisfied'" />
             <sch:assert
                 diagnostics="has-satisfaction-status-diagnostic"
                 doc:guide-reference="Guide to OSCAL-based FedRAMP Security Assessment Results (SAR) §4.3"
diff --git a/src/validations/test/rules/rev5/sar.xspec b/src/validations/test/rules/rev5/sar.xspec
index d05deba46..c91d3ec5b 100644
--- a/src/validations/test/rules/rev5/sar.xspec
+++ b/src/validations/test/rules/rev5/sar.xspec
@@ -1086,7 +1086,7 @@
                                             target-id="pl-2.a.1_obj"
                                             type="objective-id">
                                             <status
-                                                state="other-than-satisfied" />
+                                                state="not-satisfied" />
                                         </target>
                                     </finding>
                                 </result>
@@ -1108,7 +1108,7 @@
                                             target-id="pl-2.a.1_obj"
                                             type="objective-id">
                                             <status
-                                                state="other-than-satisfied" />
+                                                state="not-satisfied" />
                                         </target>
                                     </finding>
                                     <finding
@@ -1117,7 +1117,7 @@
                                             target-id="pl-2.a.2_obj"
                                             type="objective-id">
                                             <status
-                                                state="other-than-satisfied" />
+                                                state="not-satisfied" />
                                         </target>
                                     </finding>
                                 </result>
@@ -1811,7 +1811,7 @@
                                             target-id="ac-1.a.1_obj.1"
                                             type="objective-id">
                                             <status
-                                                state="other-than-satisfied" />
+                                                state="not-satisfied" />
                                         </target>
                                     </finding>
                                 </result>
@@ -1856,7 +1856,7 @@
                                                 target-id="ac-1.a.1_obj.1"
                                                 type="objective-id">
                                                 <status
-                                                    state="other-than-satisfied" />
+                                                    state="satisfied" />
                                             </target>
                                         </finding>
                                     </result>
@@ -1879,7 +1879,7 @@
                                                 target-id="ac-1.a.1_obj.1"
                                                 type="objective-id">
                                                 <status
-                                                    state="not-satisfied" />
+                                                    state="other-than-satisfied" />
                                             </target>
                                         </finding>
                                     </result>