From 26b0673066c8ef9b91945d23674732776be900b0 Mon Sep 17 00:00:00 2001
From: Gabeblis <gabriel.rodriguez@gsa.gov>
Date: Fri, 20 Sep 2024 18:47:08 +0000
Subject: [PATCH] Removed 3 constraints that are handled by the schema, and
 cleaned up targets

---
 features/fedramp_extensions.feature                 |  9 ---------
 .../constraints/content/ssp-all-INVALID.xml         |  3 ---
 .../constraints/fedramp-external-constraints.xml    | 13 ++-----------
 .../has-security-objective-availability-FAIL.yaml   |  9 ---------
 .../has-security-objective-availability-PASS.yaml   |  9 ---------
 ...has-security-objective-confidentiality-FAIL.yaml |  9 ---------
 ...has-security-objective-confidentiality-PASS.yaml |  9 ---------
 .../has-security-objective-integrity-FAIL.yaml      |  9 ---------
 .../has-security-objective-integrity-PASS.yaml      |  9 ---------
 9 files changed, 2 insertions(+), 77 deletions(-)
 delete mode 100644 src/validations/constraints/unit-tests/has-security-objective-availability-FAIL.yaml
 delete mode 100644 src/validations/constraints/unit-tests/has-security-objective-availability-PASS.yaml
 delete mode 100644 src/validations/constraints/unit-tests/has-security-objective-confidentiality-FAIL.yaml
 delete mode 100644 src/validations/constraints/unit-tests/has-security-objective-confidentiality-PASS.yaml
 delete mode 100644 src/validations/constraints/unit-tests/has-security-objective-integrity-FAIL.yaml
 delete mode 100644 src/validations/constraints/unit-tests/has-security-objective-integrity-PASS.yaml

diff --git a/features/fedramp_extensions.feature b/features/fedramp_extensions.feature
index 73c64f489..1e4c7433e 100644
--- a/features/fedramp_extensions.feature
+++ b/features/fedramp_extensions.feature
@@ -59,12 +59,6 @@ Examples:
   | has-rules-of-behavior-PASS.yaml |
   | has-security-impact-level-FAIL.yaml |
   | has-security-impact-level-PASS.yaml |
-  | has-security-objective-availability-FAIL.yaml |
-  | has-security-objective-availability-PASS.yaml |
-  | has-security-objective-confidentiality-FAIL.yaml |
-  | has-security-objective-confidentiality-PASS.yaml |
-  | has-security-objective-integrity-FAIL.yaml |
-  | has-security-objective-integrity-PASS.yaml |
   | has-security-sensitivity-level-FAIL.yaml |
   | has-security-sensitivity-level-PASS.yaml |
   | has-separation-of-duties-matrix-FAIL.yaml |
@@ -134,9 +128,6 @@ Examples:
   | has-information-system-contingency-plan |
   | has-rules-of-behavior |
   | has-security-impact-level |
-  | has-security-objective-availability |
-  | has-security-objective-confidentiality |
-  | has-security-objective-integrity |
   | has-security-sensitivity-level |
   | has-separation-of-duties-matrix |
   | has-user-guide |
diff --git a/src/validations/constraints/content/ssp-all-INVALID.xml b/src/validations/constraints/content/ssp-all-INVALID.xml
index 78edb6e56..fc86cdeca 100644
--- a/src/validations/constraints/content/ssp-all-INVALID.xml
+++ b/src/validations/constraints/content/ssp-all-INVALID.xml
@@ -86,9 +86,6 @@
       </information-type>
     </system-information>
     <!-- security-impact-level was removed to ensure that test fails correctly. -->
-    <!-- security-objective-confidentiality was removed to ensure that test fails correctly. -->
-    <!-- security-objective-integrity was removed to ensure that test fails correctly. -->
-    <!-- security-objective-availability was removed to ensure that test fails correctly. -->
     <status state="operational"/>
     
     <authorization-boundary>
diff --git a/src/validations/constraints/fedramp-external-constraints.xml b/src/validations/constraints/fedramp-external-constraints.xml
index 7a55c2a15..f27cb6966 100644
--- a/src/validations/constraints/fedramp-external-constraints.xml
+++ b/src/validations/constraints/fedramp-external-constraints.xml
@@ -71,21 +71,12 @@
             <expect id="has-federation-assurance-level" target="./system-characteristics" test="prop[@name eq 'federation-assurance-level']" level="INFORMATIONAL">
             <message>This FedRAMP SSP does define its NIST SP 800-63 federation assurance level (IAL).</message>
             </expect>
-            <expect id="has-security-sensitivity-level" target="./system-characteristics" test="security-sensitivity-level" level="ERROR">
+            <expect id="has-security-sensitivity-level" target="system-characteristics" test="security-sensitivity-level" level="ERROR">
                 <message>An OSCAL SSP document must specify a FIPS 199 categorization.</message>
             </expect>
-            <expect id="has-security-impact-level" target="./system-characteristics" test="security-impact-level" level="ERROR">
+            <expect id="has-security-impact-level" target="system-characteristics" test="security-impact-level" level="ERROR">
                 <message>An OSCAL SSP document must specify a security impact level.</message>
             </expect>
-            <expect id="has-security-objective-confidentiality" target="./system-characteristics"  test="security-impact-level/security-objective-confidentiality" level="ERROR">
-                <message>An OSCAL SSP must specify a confidentiality security objective.</message>
-            </expect>
-            <expect id="has-security-objective-integrity" target="./system-characteristics"  test="security-impact-level/security-objective-integrity" level="ERROR">
-                <message>An OSCAL SSP must specify an integrity security objective.</message>
-            </expect>
-            <expect id="has-security-objective-availability" target="./system-characteristics"  test="security-impact-level/security-objective-availability" level="ERROR">
-                <message>An OSCAL SSP must specify an availability security objective.</message>
-            </expect>
         </constraints>
     </context>
     <context>
diff --git a/src/validations/constraints/unit-tests/has-security-objective-availability-FAIL.yaml b/src/validations/constraints/unit-tests/has-security-objective-availability-FAIL.yaml
deleted file mode 100644
index 3d2cbe5b6..000000000
--- a/src/validations/constraints/unit-tests/has-security-objective-availability-FAIL.yaml
+++ /dev/null
@@ -1,9 +0,0 @@
-test-case:
-  name: Negative Test for has-security-objective-availability
-  description: >-
-    This test case validates the behavior of constraint
-    has-security-objective-availability
-  content: ../content/ssp-all-INVALID.xml
-  expectations:
-    - constraint-id: has-security-objective-availability
-      result: fail
diff --git a/src/validations/constraints/unit-tests/has-security-objective-availability-PASS.yaml b/src/validations/constraints/unit-tests/has-security-objective-availability-PASS.yaml
deleted file mode 100644
index 44c596ae1..000000000
--- a/src/validations/constraints/unit-tests/has-security-objective-availability-PASS.yaml
+++ /dev/null
@@ -1,9 +0,0 @@
-test-case:
-  name: Positive Test for has-security-objective-availability
-  description: >-
-    This test case validates the behavior of constraint
-    has-security-objective-availability
-  content: ../content/ssp-all-VALID.xml
-  expectations:
-    - constraint-id: has-security-objective-availability
-      result: pass
diff --git a/src/validations/constraints/unit-tests/has-security-objective-confidentiality-FAIL.yaml b/src/validations/constraints/unit-tests/has-security-objective-confidentiality-FAIL.yaml
deleted file mode 100644
index eece5be1b..000000000
--- a/src/validations/constraints/unit-tests/has-security-objective-confidentiality-FAIL.yaml
+++ /dev/null
@@ -1,9 +0,0 @@
-test-case:
-  name: Negative Test for has-security-objective-confidentiality
-  description: >-
-    This test case validates the behavior of constraint
-    has-security-objective-confidentiality
-  content: ../content/ssp-all-INVALID.xml
-  expectations:
-    - constraint-id: has-security-objective-confidentiality
-      result: fail
diff --git a/src/validations/constraints/unit-tests/has-security-objective-confidentiality-PASS.yaml b/src/validations/constraints/unit-tests/has-security-objective-confidentiality-PASS.yaml
deleted file mode 100644
index 67bacc8f8..000000000
--- a/src/validations/constraints/unit-tests/has-security-objective-confidentiality-PASS.yaml
+++ /dev/null
@@ -1,9 +0,0 @@
-test-case:
-  name: Positive Test for has-security-objective-confidentiality
-  description: >-
-    This test case validates the behavior of constraint
-    has-security-objective-confidentiality
-  content: ../content/ssp-all-VALID.xml
-  expectations:
-    - constraint-id: has-security-objective-confidentiality
-      result: pass
diff --git a/src/validations/constraints/unit-tests/has-security-objective-integrity-FAIL.yaml b/src/validations/constraints/unit-tests/has-security-objective-integrity-FAIL.yaml
deleted file mode 100644
index cdbc8be6d..000000000
--- a/src/validations/constraints/unit-tests/has-security-objective-integrity-FAIL.yaml
+++ /dev/null
@@ -1,9 +0,0 @@
-test-case:
-  name: Negative Test for has-security-objective-integrity
-  description: >-
-    This test case validates the behavior of constraint
-    has-security-objective-integrity
-  content: ../content/ssp-all-INVALID.xml
-  expectations:
-    - constraint-id: has-security-objective-integrity
-      result: fail
diff --git a/src/validations/constraints/unit-tests/has-security-objective-integrity-PASS.yaml b/src/validations/constraints/unit-tests/has-security-objective-integrity-PASS.yaml
deleted file mode 100644
index c509dc75c..000000000
--- a/src/validations/constraints/unit-tests/has-security-objective-integrity-PASS.yaml
+++ /dev/null
@@ -1,9 +0,0 @@
-test-case:
-  name: Positive Test for has-security-objective-integrity
-  description: >-
-    This test case validates the behavior of constraint
-    has-security-objective-integrity
-  content: ../content/ssp-all-VALID.xml
-  expectations:
-    - constraint-id: has-security-objective-integrity
-      result: pass