From 968a9a34c739d19dd54484eb78b9f008fe702a09 Mon Sep 17 00:00:00 2001 From: Rene Tshiteya Date: Mon, 28 Oct 2024 15:36:53 -0400 Subject: [PATCH] Fix constraints and constraint test files per issue #773 --- .../content/fedramp-tailoring-profile.xml | 2 +- .../content/profile-all-INVALID.xml | 4 +-- .../constraints/content/ssp-all-VALID.xml | 36 +++++++++---------- .../content/ssp-attachment-type-INVALID.xml | 2 +- .../ssp-authorization-type-INVALID.xml | 2 +- .../ssp-cloud-service-model-INVALID.xml | 2 +- ...-control-implementation-status-INVALID.xml | 2 +- .../content/ssp-deployment-model-INVALID.xml | 2 +- ...-authenticator-assurance-level-INVALID.xml | 2 +- ...-configuration-management-plan-INVALID.xml | 2 +- ...has-federation-assurance-level-INVALID.xml | 2 +- ...p-has-identity-assurance-level-INVALID.xml | 2 +- ...ssp-has-incident-response-plan-INVALID.xml | 2 +- ...mation-system-contingency-plan-INVALID.xml | 2 +- .../ssp-has-rules-of-behavior-INVALID.xml | 2 +- ...as-separation-of-duties-matrix-INVALID.xml | 2 +- .../content/ssp-has-user-guide-INVALID.xml | 2 +- .../ssp-interconnection-direction-INVALID.xml | 4 +-- .../ssp-interconnection-security-INVALID.xml | 4 +-- ...sp-missing-response-components-INVALID.xml | 6 ++-- .../ssp-profile-response-point-INVALID.xml | 4 +-- ...p-resource-has-base64-or-rlink-INVALID.xml | 2 +- .../ssp-resource-has-title-INVALID.xml | 2 +- .../content/ssp-scan-type-INVALID.xml | 2 +- .../fedramp-external-allowed-values.xml | 18 +++++----- .../fedramp-external-constraints.xml | 6 ++-- 26 files changed, 59 insertions(+), 59 deletions(-) diff --git a/src/validations/constraints/content/fedramp-tailoring-profile.xml b/src/validations/constraints/content/fedramp-tailoring-profile.xml index ac28635e8..b5301ab3f 100644 --- a/src/validations/constraints/content/fedramp-tailoring-profile.xml +++ b/src/validations/constraints/content/fedramp-tailoring-profile.xml @@ -20,7 +20,7 @@ - + diff --git a/src/validations/constraints/content/profile-all-INVALID.xml b/src/validations/constraints/content/profile-all-INVALID.xml index de6bfcbb9..5b5bc573a 100644 --- a/src/validations/constraints/content/profile-all-INVALID.xml +++ b/src/validations/constraints/content/profile-all-INVALID.xml @@ -16,8 +16,8 @@ - - + +

This is a test checking that profiles validation fails if more than one response point is specified for a given (control) part.

diff --git a/src/validations/constraints/content/ssp-all-VALID.xml b/src/validations/constraints/content/ssp-all-VALID.xml index 65ae0a7cf..3c03f1622 100644 --- a/src/validations/constraints/content/ssp-all-VALID.xml +++ b/src/validations/constraints/content/ssp-all-VALID.xml @@ -10,7 +10,7 @@ 1.1 1.1.2 SSP-2024-002 - + Document Creator @@ -71,14 +71,14 @@ - F00000001 + F00000001 Enhanced Example System

This is an enhanced example system for demonstration purposes, incorporating more FedRAMP-specific elements.

- - - + + + @@ -175,8 +175,8 @@

Secure connection to an external API for data enrichment.

- - + + 11111111-0000-4000-9000-000000000001 @@ -195,7 +195,7 @@ - + 11111111-0000-4000-9000-000000000001 @@ -210,15 +210,15 @@

Implementation of controls for the Enhanced Example System

- - + +

Access Control Policy and Procedures (AC-1) is fully implemented in our system.

- + 11111111-0000-4000-9000-000000000001 @@ -226,14 +226,14 @@
- +

Information System Component Inventory (CM-8) is partially implemented.

- + 11111111-0000-4000-9000-000000000001 @@ -247,7 +247,7 @@

Detailed access control policy document

- + @@ -328,7 +328,7 @@

Separation of Duties Matrix

- + @@ -344,7 +344,7 @@

Authorization Boundary Diagram

- + @@ -359,7 +359,7 @@

Network Architecture Diagram

- + @@ -374,7 +374,7 @@

Data flow Diagram

- + diff --git a/src/validations/constraints/content/ssp-attachment-type-INVALID.xml b/src/validations/constraints/content/ssp-attachment-type-INVALID.xml index d06c671c3..bc716ca85 100644 --- a/src/validations/constraints/content/ssp-attachment-type-INVALID.xml +++ b/src/validations/constraints/content/ssp-attachment-type-INVALID.xml @@ -5,7 +5,7 @@ uuid="12345678-1234-4321-8765-123456789012"> - + diff --git a/src/validations/constraints/content/ssp-authorization-type-INVALID.xml b/src/validations/constraints/content/ssp-authorization-type-INVALID.xml index dd2fab6b5..1cd5436ae 100644 --- a/src/validations/constraints/content/ssp-authorization-type-INVALID.xml +++ b/src/validations/constraints/content/ssp-authorization-type-INVALID.xml @@ -4,6 +4,6 @@ xsi:schemaLocation="http://csrc.nist.gov/ns/oscal/1.0 https://github.com/usnistgov/OSCAL/releases/download/v1.1.2/oscal_ssp_schema.xsd" uuid="12345678-1234-4321-8765-123456789012"> - + diff --git a/src/validations/constraints/content/ssp-cloud-service-model-INVALID.xml b/src/validations/constraints/content/ssp-cloud-service-model-INVALID.xml index c44fa26ed..ee2130ab0 100644 --- a/src/validations/constraints/content/ssp-cloud-service-model-INVALID.xml +++ b/src/validations/constraints/content/ssp-cloud-service-model-INVALID.xml @@ -4,6 +4,6 @@ xsi:schemaLocation="http://csrc.nist.gov/ns/oscal/1.0 https://github.com/usnistgov/OSCAL/releases/download/v1.1.2/oscal_ssp_schema.xsd" uuid="12345678-1234-4321-8765-123456789012"> - + diff --git a/src/validations/constraints/content/ssp-control-implementation-status-INVALID.xml b/src/validations/constraints/content/ssp-control-implementation-status-INVALID.xml index 01aea8746..72f9df0bd 100644 --- a/src/validations/constraints/content/ssp-control-implementation-status-INVALID.xml +++ b/src/validations/constraints/content/ssp-control-implementation-status-INVALID.xml @@ -6,7 +6,7 @@ - + diff --git a/src/validations/constraints/content/ssp-deployment-model-INVALID.xml b/src/validations/constraints/content/ssp-deployment-model-INVALID.xml index 03c17a486..71c059105 100644 --- a/src/validations/constraints/content/ssp-deployment-model-INVALID.xml +++ b/src/validations/constraints/content/ssp-deployment-model-INVALID.xml @@ -4,6 +4,6 @@ xsi:schemaLocation="http://csrc.nist.gov/ns/oscal/1.0 https://github.com/usnistgov/OSCAL/releases/download/v1.1.2/oscal_ssp_schema.xsd" uuid="12345678-1234-4321-8765-123456789012"> - + diff --git a/src/validations/constraints/content/ssp-has-authenticator-assurance-level-INVALID.xml b/src/validations/constraints/content/ssp-has-authenticator-assurance-level-INVALID.xml index c44fa26ed..ee2130ab0 100644 --- a/src/validations/constraints/content/ssp-has-authenticator-assurance-level-INVALID.xml +++ b/src/validations/constraints/content/ssp-has-authenticator-assurance-level-INVALID.xml @@ -4,6 +4,6 @@ xsi:schemaLocation="http://csrc.nist.gov/ns/oscal/1.0 https://github.com/usnistgov/OSCAL/releases/download/v1.1.2/oscal_ssp_schema.xsd" uuid="12345678-1234-4321-8765-123456789012"> - + diff --git a/src/validations/constraints/content/ssp-has-configuration-management-plan-INVALID.xml b/src/validations/constraints/content/ssp-has-configuration-management-plan-INVALID.xml index d134e7119..ab9d648ee 100644 --- a/src/validations/constraints/content/ssp-has-configuration-management-plan-INVALID.xml +++ b/src/validations/constraints/content/ssp-has-configuration-management-plan-INVALID.xml @@ -8,7 +8,7 @@

Detailed access control policy document

- +
diff --git a/src/validations/constraints/content/ssp-has-federation-assurance-level-INVALID.xml b/src/validations/constraints/content/ssp-has-federation-assurance-level-INVALID.xml index 72e6dfad0..24c15bdec 100644 --- a/src/validations/constraints/content/ssp-has-federation-assurance-level-INVALID.xml +++ b/src/validations/constraints/content/ssp-has-federation-assurance-level-INVALID.xml @@ -4,6 +4,6 @@ xsi:schemaLocation="http://csrc.nist.gov/ns/oscal/1.0 https://github.com/usnistgov/OSCAL/releases/download/v1.1.2/oscal_ssp_schema.xsd" uuid="12345678-1234-4321-8765-123456789012"> - + \ No newline at end of file diff --git a/src/validations/constraints/content/ssp-has-identity-assurance-level-INVALID.xml b/src/validations/constraints/content/ssp-has-identity-assurance-level-INVALID.xml index 72e6dfad0..24c15bdec 100644 --- a/src/validations/constraints/content/ssp-has-identity-assurance-level-INVALID.xml +++ b/src/validations/constraints/content/ssp-has-identity-assurance-level-INVALID.xml @@ -4,6 +4,6 @@ xsi:schemaLocation="http://csrc.nist.gov/ns/oscal/1.0 https://github.com/usnistgov/OSCAL/releases/download/v1.1.2/oscal_ssp_schema.xsd" uuid="12345678-1234-4321-8765-123456789012"> - + \ No newline at end of file diff --git a/src/validations/constraints/content/ssp-has-incident-response-plan-INVALID.xml b/src/validations/constraints/content/ssp-has-incident-response-plan-INVALID.xml index d134e7119..ab9d648ee 100644 --- a/src/validations/constraints/content/ssp-has-incident-response-plan-INVALID.xml +++ b/src/validations/constraints/content/ssp-has-incident-response-plan-INVALID.xml @@ -8,7 +8,7 @@

Detailed access control policy document

- + diff --git a/src/validations/constraints/content/ssp-has-information-system-contingency-plan-INVALID.xml b/src/validations/constraints/content/ssp-has-information-system-contingency-plan-INVALID.xml index d134e7119..ab9d648ee 100644 --- a/src/validations/constraints/content/ssp-has-information-system-contingency-plan-INVALID.xml +++ b/src/validations/constraints/content/ssp-has-information-system-contingency-plan-INVALID.xml @@ -8,7 +8,7 @@

Detailed access control policy document

- + diff --git a/src/validations/constraints/content/ssp-has-rules-of-behavior-INVALID.xml b/src/validations/constraints/content/ssp-has-rules-of-behavior-INVALID.xml index d134e7119..ab9d648ee 100644 --- a/src/validations/constraints/content/ssp-has-rules-of-behavior-INVALID.xml +++ b/src/validations/constraints/content/ssp-has-rules-of-behavior-INVALID.xml @@ -8,7 +8,7 @@

Detailed access control policy document

- + diff --git a/src/validations/constraints/content/ssp-has-separation-of-duties-matrix-INVALID.xml b/src/validations/constraints/content/ssp-has-separation-of-duties-matrix-INVALID.xml index d134e7119..ab9d648ee 100644 --- a/src/validations/constraints/content/ssp-has-separation-of-duties-matrix-INVALID.xml +++ b/src/validations/constraints/content/ssp-has-separation-of-duties-matrix-INVALID.xml @@ -8,7 +8,7 @@

Detailed access control policy document

- + diff --git a/src/validations/constraints/content/ssp-has-user-guide-INVALID.xml b/src/validations/constraints/content/ssp-has-user-guide-INVALID.xml index d134e7119..ab9d648ee 100644 --- a/src/validations/constraints/content/ssp-has-user-guide-INVALID.xml +++ b/src/validations/constraints/content/ssp-has-user-guide-INVALID.xml @@ -8,7 +8,7 @@

Detailed access control policy document

- + diff --git a/src/validations/constraints/content/ssp-interconnection-direction-INVALID.xml b/src/validations/constraints/content/ssp-interconnection-direction-INVALID.xml index 1a9a7bc8c..987fe20b7 100644 --- a/src/validations/constraints/content/ssp-interconnection-direction-INVALID.xml +++ b/src/validations/constraints/content/ssp-interconnection-direction-INVALID.xml @@ -9,8 +9,8 @@

Secure connection to an external API for data enrichment.

- - + + 11111111-0000-4000-9000-000000000001 diff --git a/src/validations/constraints/content/ssp-interconnection-security-INVALID.xml b/src/validations/constraints/content/ssp-interconnection-security-INVALID.xml index 1a9a7bc8c..987fe20b7 100644 --- a/src/validations/constraints/content/ssp-interconnection-security-INVALID.xml +++ b/src/validations/constraints/content/ssp-interconnection-security-INVALID.xml @@ -9,8 +9,8 @@

Secure connection to an external API for data enrichment.

- - + + 11111111-0000-4000-9000-000000000001 diff --git a/src/validations/constraints/content/ssp-missing-response-components-INVALID.xml b/src/validations/constraints/content/ssp-missing-response-components-INVALID.xml index 9af07aea0..805e44bb2 100644 --- a/src/validations/constraints/content/ssp-missing-response-components-INVALID.xml +++ b/src/validations/constraints/content/ssp-missing-response-components-INVALID.xml @@ -8,14 +8,14 @@

Implementation of controls for the Enhanced Example System

- - + + - + diff --git a/src/validations/constraints/content/ssp-profile-response-point-INVALID.xml b/src/validations/constraints/content/ssp-profile-response-point-INVALID.xml index b4839d067..d83e672c0 100644 --- a/src/validations/constraints/content/ssp-profile-response-point-INVALID.xml +++ b/src/validations/constraints/content/ssp-profile-response-point-INVALID.xml @@ -93,8 +93,8 @@ - - + + diff --git a/src/validations/constraints/content/ssp-resource-has-base64-or-rlink-INVALID.xml b/src/validations/constraints/content/ssp-resource-has-base64-or-rlink-INVALID.xml index d134e7119..ab9d648ee 100644 --- a/src/validations/constraints/content/ssp-resource-has-base64-or-rlink-INVALID.xml +++ b/src/validations/constraints/content/ssp-resource-has-base64-or-rlink-INVALID.xml @@ -8,7 +8,7 @@

Detailed access control policy document

- + diff --git a/src/validations/constraints/content/ssp-resource-has-title-INVALID.xml b/src/validations/constraints/content/ssp-resource-has-title-INVALID.xml index d134e7119..ab9d648ee 100644 --- a/src/validations/constraints/content/ssp-resource-has-title-INVALID.xml +++ b/src/validations/constraints/content/ssp-resource-has-title-INVALID.xml @@ -8,7 +8,7 @@

Detailed access control policy document

- + diff --git a/src/validations/constraints/content/ssp-scan-type-INVALID.xml b/src/validations/constraints/content/ssp-scan-type-INVALID.xml index 4e64d0cbf..4c6c62b54 100644 --- a/src/validations/constraints/content/ssp-scan-type-INVALID.xml +++ b/src/validations/constraints/content/ssp-scan-type-INVALID.xml @@ -5,7 +5,7 @@ uuid="12345678-1234-4321-8765-123456789012"> - + diff --git a/src/validations/constraints/fedramp-external-allowed-values.xml b/src/validations/constraints/fedramp-external-allowed-values.xml index 4b5ae3b06..c0da0b0c2 100644 --- a/src/validations/constraints/fedramp-external-allowed-values.xml +++ b/src/validations/constraints/fedramp-external-allowed-values.xml @@ -15,13 +15,13 @@ - + FedRAMP Version Identifies the FedRAMP version of the document. FedRAMP Version - + Attachment Type Identifies the type of attachment. Law or Statute @@ -91,7 +91,7 @@ Not Applicable - + Interconnection Direction Identifies the direction of information flow for the interconnection. Incoming @@ -99,7 +99,7 @@ Bi-Directional - + Interconnection Security Identifies the type of security applied to the interconnection. IPsec @@ -111,7 +111,7 @@ Other - + Scan Type Identifies the type of scan. Infrastructure and Operating System Scan @@ -129,14 +129,14 @@ - + Authorization Type The FedRAMP Authorization Type FedRAMP JAB P-ATO FedRAMP Agency ATO FedRAMP Tailored for LI-SaaS - + Deployment Model The cloud deployment model. Public Cloud @@ -145,7 +145,7 @@ Hybrid Other - + Authorization Type The FedRAMP Authorization Type FedRAMP JAB P-ATO @@ -173,7 +173,7 @@ No Access - + Cloud Service Model The cloud service model used by the system. Infrastructure as a Service diff --git a/src/validations/constraints/fedramp-external-constraints.xml b/src/validations/constraints/fedramp-external-constraints.xml index dd1b78c23..a59de02b7 100644 --- a/src/validations/constraints/fedramp-external-constraints.xml +++ b/src/validations/constraints/fedramp-external-constraints.xml @@ -8,7 +8,7 @@ - + Duplicate response point at '{ path(.) }'. @@ -21,7 +21,7 @@ - + A FedRAMP document's metadata MUST define a valid FedRAMP version. @@ -156,7 +156,7 @@ Each FedRAMP SSP data flow diagram must have a link rel attribute with the value "diagram". - + A FedRAMP SSP must have a FedRAMP system identifier.