Merge branch 'GSA:master' into master

Rene2mt · Nov 24, 2023 · a339f60 · a339f60
2 parents 916ae4e + 7f3b959
commit a339f60
Show file tree

Hide file tree

Showing 55 changed files with 29,768 additions and 4,771 deletions.
diff --git a/.gitignore b/.gitignore
@@ -29,3 +29,5 @@ 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/.../content/rev4/baselines/json/FedRAMP_rev4_HIGH-baseline-resolved-profile_catalog-min.json b/.../content/rev4/baselines/json/FedRAMP_rev4_HIGH-baseline-resolved-profile_catalog-min.json
@@ -1,10 +1,10 @@
 {
   "catalog": {
-    "uuid": "8a61aa1a-b813-4078-8133-07e34c572946",
+    "uuid": "556c1471-fd77-4b36-951c-45e673862afa",
     "metadata": {
       "title": "FedRAMP Rev 4 High Baseline",
       "published": "2021-02-05T00:00:00.000-04:00",
-      "last-modified": "2023-09-14T14:13:41.989596-04:00",
+      "last-modified": "2023-11-16T17:03:03.573733-05:00",
       "version": "fedramp1.1.1-oscal1.0.4",
       "oscal-version": "1.0.4",
       "links": [

diff --git a/dist/content/rev4/baselines/json/FedRAMP_rev4_HIGH-baseline-resolved-profile_catalog.json b/dist/content/rev4/baselines/json/FedRAMP_rev4_HIGH-baseline-resolved-profile_catalog.json
@@ -1,10 +1,10 @@
 {
   "catalog": {
-    "uuid": "8a61aa1a-b813-4078-8133-07e34c572946",
+    "uuid": "556c1471-fd77-4b36-951c-45e673862afa",
     "metadata": {
       "title": "FedRAMP Rev 4 High Baseline",
       "published": "2021-02-05T00:00:00.000-04:00",
-      "last-modified": "2023-09-14T14:13:41.989596-04:00",
+      "last-modified": "2023-11-16T17:03:03.573733-05:00",
       "version": "fedramp1.1.1-oscal1.0.4",
       "oscal-version": "1.0.4",
       "links": [

diff --git a/...ntent/rev4/baselines/json/FedRAMP_rev4_LI-SaaS-baseline-resolved-profile_catalog-min.json b/...ntent/rev4/baselines/json/FedRAMP_rev4_LI-SaaS-baseline-resolved-profile_catalog-min.json
@@ -1,10 +1,10 @@
 {
   "catalog": {
-    "uuid": "1c40e8e9-cadb-4595-8efa-b7cbbe4540e6",
+    "uuid": "8a97cfdd-fcdf-4532-a624-1a54e910fd86",
     "metadata": {
       "title": "FedRAMP Rev 4 Tailored Low Impact Software as a Service (LI-SaaS) Baseline",
       "published": "2021-02-05T00:00:00.000-04:00",
-      "last-modified": "2023-09-14T14:14:30.448981-04:00",
+      "last-modified": "2023-11-16T17:03:41.340811-05:00",
       "version": "fedramp1.1.1-oscal1.0.4",
       "oscal-version": "1.0.4",
       "links": [

diff --git a/dist/content/rev4/baselines/json/FedRAMP_rev4_LI-SaaS-baseline-resolved-profile_catalog.json b/dist/content/rev4/baselines/json/FedRAMP_rev4_LI-SaaS-baseline-resolved-profile_catalog.json
@@ -1,10 +1,10 @@
 {
   "catalog": {
-    "uuid": "1c40e8e9-cadb-4595-8efa-b7cbbe4540e6",
+    "uuid": "8a97cfdd-fcdf-4532-a624-1a54e910fd86",
     "metadata": {
       "title": "FedRAMP Rev 4 Tailored Low Impact Software as a Service (LI-SaaS) Baseline",
       "published": "2021-02-05T00:00:00.000-04:00",
-      "last-modified": "2023-09-14T14:14:30.448981-04:00",
+      "last-modified": "2023-11-16T17:03:41.340811-05:00",
       "version": "fedramp1.1.1-oscal1.0.4",
       "oscal-version": "1.0.4",
       "links": [

diff --git a/dist/content/rev4/baselines/json/FedRAMP_rev4_LOW-baseline-resolved-profile_catalog-min.json b/dist/content/rev4/baselines/json/FedRAMP_rev4_LOW-baseline-resolved-profile_catalog-min.json
@@ -1,10 +1,10 @@
 {
   "catalog": {
-    "uuid": "00a366ef-1272-44fc-a85b-2e7da2da4a1e",
+    "uuid": "375a07a9-2a67-4092-b1e7-da856937537a",
     "metadata": {
       "title": "FedRAMP Rev 4 Low Baseline",
       "published": "2021-02-05T00:00:00.000-04:00",
-      "last-modified": "2023-09-14T14:14:48.152392-04:00",
+      "last-modified": "2023-11-16T17:03:54.984198-05:00",
       "version": "fedramp1.1.1-oscal1.0.4",
       "oscal-version": "1.0.4",
       "links": [

diff --git a/dist/content/rev4/baselines/json/FedRAMP_rev4_LOW-baseline-resolved-profile_catalog.json b/dist/content/rev4/baselines/json/FedRAMP_rev4_LOW-baseline-resolved-profile_catalog.json
@@ -1,10 +1,10 @@
 {
   "catalog": {
-    "uuid": "00a366ef-1272-44fc-a85b-2e7da2da4a1e",
+    "uuid": "375a07a9-2a67-4092-b1e7-da856937537a",
     "metadata": {
       "title": "FedRAMP Rev 4 Low Baseline",
       "published": "2021-02-05T00:00:00.000-04:00",
-      "last-modified": "2023-09-14T14:14:48.152392-04:00",
+      "last-modified": "2023-11-16T17:03:54.984198-05:00",
       "version": "fedramp1.1.1-oscal1.0.4",
       "oscal-version": "1.0.4",
       "links": [

diff --git a/...tent/rev4/baselines/json/FedRAMP_rev4_MODERATE-baseline-resolved-profile_catalog-min.json b/...tent/rev4/baselines/json/FedRAMP_rev4_MODERATE-baseline-resolved-profile_catalog-min.json
@@ -1,10 +1,10 @@
 {
   "catalog": {
-    "uuid": "414596b3-cfc2-4c5b-932f-07e805723f20",
+    "uuid": "fc8c9285-7fa9-43ae-a966-5acdbfda59f1",
     "metadata": {
       "title": "FedRAMP Rev 4 Moderate Baseline",
       "published": "2021-02-05T00:00:00.000-04:00",
-      "last-modified": "2023-09-14T14:15:16.197702-04:00",
+      "last-modified": "2023-11-16T17:04:17.276909-05:00",
       "version": "fedramp1.1.1-oscal1.0.4",
       "oscal-version": "1.0.4",
       "links": [

diff --git a/.../content/rev4/baselines/json/FedRAMP_rev4_MODERATE-baseline-resolved-profile_catalog.json b/.../content/rev4/baselines/json/FedRAMP_rev4_MODERATE-baseline-resolved-profile_catalog.json
@@ -1,10 +1,10 @@
 {
   "catalog": {
-    "uuid": "414596b3-cfc2-4c5b-932f-07e805723f20",
+    "uuid": "fc8c9285-7fa9-43ae-a966-5acdbfda59f1",
     "metadata": {
       "title": "FedRAMP Rev 4 Moderate Baseline",
       "published": "2021-02-05T00:00:00.000-04:00",
-      "last-modified": "2023-09-14T14:15:16.197702-04:00",
+      "last-modified": "2023-11-16T17:04:17.276909-05:00",
       "version": "fedramp1.1.1-oscal1.0.4",
       "oscal-version": "1.0.4",
       "links": [

diff --git a/dist/content/rev4/baselines/xml/FedRAMP_rev4_HIGH-baseline-resolved-profile_catalog.xml b/dist/content/rev4/baselines/xml/FedRAMP_rev4_HIGH-baseline-resolved-profile_catalog.xml
@@ -1,10 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <catalog xmlns="http://csrc.nist.gov/ns/oscal/1.0"
-         uuid="8a61aa1a-b813-4078-8133-07e34c572946">
+         uuid="556c1471-fd77-4b36-951c-45e673862afa">
    <metadata>
       <title>FedRAMP Rev 4 High Baseline</title>
       <published>2021-02-05T00:00:00.000-04:00</published>
-      <last-modified>2023-09-14T14:13:41.989596-04:00</last-modified>
+      <last-modified>2023-11-16T17:03:03.573733-05:00</last-modified>
       <version>fedramp1.1.1-oscal1.0.4</version>
       <oscal-version>1.0.4</oscal-version>
       <link rel="resolution-source" href="FedRAMP_rev4_HIGH-baseline_profile.xml"/>

diff --git a/dist/content/rev4/baselines/xml/FedRAMP_rev4_LI-SaaS-baseline-resolved-profile_catalog.xml b/dist/content/rev4/baselines/xml/FedRAMP_rev4_LI-SaaS-baseline-resolved-profile_catalog.xml
@@ -1,10 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <catalog xmlns="http://csrc.nist.gov/ns/oscal/1.0"
-         uuid="1c40e8e9-cadb-4595-8efa-b7cbbe4540e6">
+         uuid="8a97cfdd-fcdf-4532-a624-1a54e910fd86">
    <metadata>
       <title>FedRAMP Rev 4 Tailored Low Impact Software as a Service (LI-SaaS) Baseline</title>
       <published>2021-02-05T00:00:00.000-04:00</published>
-      <last-modified>2023-09-14T14:14:30.448981-04:00</last-modified>
+      <last-modified>2023-11-16T17:03:41.340811-05:00</last-modified>
       <version>fedramp1.1.1-oscal1.0.4</version>
       <oscal-version>1.0.4</oscal-version>
       <link rel="resolution-source"

diff --git a/dist/content/rev4/baselines/xml/FedRAMP_rev4_LOW-baseline-resolved-profile_catalog.xml b/dist/content/rev4/baselines/xml/FedRAMP_rev4_LOW-baseline-resolved-profile_catalog.xml
@@ -1,10 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <catalog xmlns="http://csrc.nist.gov/ns/oscal/1.0"
-         uuid="00a366ef-1272-44fc-a85b-2e7da2da4a1e">
+         uuid="375a07a9-2a67-4092-b1e7-da856937537a">
    <metadata>
       <title>FedRAMP Rev 4 Low Baseline</title>
       <published>2021-02-05T00:00:00.000-04:00</published>
-      <last-modified>2023-09-14T14:14:48.152392-04:00</last-modified>
+      <last-modified>2023-11-16T17:03:54.984198-05:00</last-modified>
       <version>fedramp1.1.1-oscal1.0.4</version>
       <oscal-version>1.0.4</oscal-version>
       <link rel="resolution-source" href="FedRAMP_rev4_LOW-baseline_profile.xml"/>

diff --git a/dist/content/rev4/baselines/xml/FedRAMP_rev4_MODERATE-baseline-resolved-profile_catalog.xml b/dist/content/rev4/baselines/xml/FedRAMP_rev4_MODERATE-baseline-resolved-profile_catalog.xml
@@ -1,10 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <catalog xmlns="http://csrc.nist.gov/ns/oscal/1.0"
-         uuid="414596b3-cfc2-4c5b-932f-07e805723f20">
+         uuid="fc8c9285-7fa9-43ae-a966-5acdbfda59f1">
    <metadata>
       <title>FedRAMP Rev 4 Moderate Baseline</title>
       <published>2021-02-05T00:00:00.000-04:00</published>
-      <last-modified>2023-09-14T14:15:16.197702-04:00</last-modified>
+      <last-modified>2023-11-16T17:04:17.276909-05:00</last-modified>
       <version>fedramp1.1.1-oscal1.0.4</version>
       <oscal-version>1.0.4</oscal-version>
       <link rel="resolution-source"

diff --git a/dist/content/rev4/baselines/yaml/FedRAMP_rev4_HIGH-baseline-resolved-profile_catalog.yaml b/dist/content/rev4/baselines/yaml/FedRAMP_rev4_HIGH-baseline-resolved-profile_catalog.yaml
@@ -1,10 +1,10 @@
 ---
 catalog:
-  uuid: 8a61aa1a-b813-4078-8133-07e34c572946
+  uuid: 556c1471-fd77-4b36-951c-45e673862afa
   metadata:
     title: FedRAMP Rev 4 High Baseline
     published: 2021-02-05T00:00:00.000-04:00
-    last-modified: 2023-09-14T14:13:41.989596-04:00
+    last-modified: 2023-11-16T17:03:03.573733-05:00
     version: fedramp1.1.1-oscal1.0.4
     oscal-version: 1.0.4
     links:

diff --git a/dist/content/rev4/baselines/yaml/FedRAMP_rev4_LI-SaaS-baseline-resolved-profile_catalog.yaml b/dist/content/rev4/baselines/yaml/FedRAMP_rev4_LI-SaaS-baseline-resolved-profile_catalog.yaml
@@ -1,10 +1,10 @@
 ---
 catalog:
-  uuid: 1c40e8e9-cadb-4595-8efa-b7cbbe4540e6
+  uuid: 8a97cfdd-fcdf-4532-a624-1a54e910fd86
   metadata:
     title: FedRAMP Rev 4 Tailored Low Impact Software as a Service (LI-SaaS) Baseline
     published: 2021-02-05T00:00:00.000-04:00
-    last-modified: 2023-09-14T14:14:30.448981-04:00
+    last-modified: 2023-11-16T17:03:41.340811-05:00
     version: fedramp1.1.1-oscal1.0.4
     oscal-version: 1.0.4
     links:

diff --git a/dist/content/rev4/baselines/yaml/FedRAMP_rev4_LOW-baseline-resolved-profile_catalog.yaml b/dist/content/rev4/baselines/yaml/FedRAMP_rev4_LOW-baseline-resolved-profile_catalog.yaml
@@ -1,10 +1,10 @@
 ---
 catalog:
-  uuid: 00a366ef-1272-44fc-a85b-2e7da2da4a1e
+  uuid: 375a07a9-2a67-4092-b1e7-da856937537a
   metadata:
     title: FedRAMP Rev 4 Low Baseline
     published: 2021-02-05T00:00:00.000-04:00
-    last-modified: 2023-09-14T14:14:48.152392-04:00
+    last-modified: 2023-11-16T17:03:54.984198-05:00
     version: fedramp1.1.1-oscal1.0.4
     oscal-version: 1.0.4
     links:

diff --git a/.../content/rev4/baselines/yaml/FedRAMP_rev4_MODERATE-baseline-resolved-profile_catalog.yaml b/.../content/rev4/baselines/yaml/FedRAMP_rev4_MODERATE-baseline-resolved-profile_catalog.yaml
@@ -1,10 +1,10 @@
 ---
 catalog:
-  uuid: 414596b3-cfc2-4c5b-932f-07e805723f20
+  uuid: fc8c9285-7fa9-43ae-a966-5acdbfda59f1
   metadata:
     title: FedRAMP Rev 4 Moderate Baseline
     published: 2021-02-05T00:00:00.000-04:00
-    last-modified: 2023-09-14T14:15:16.197702-04:00
+    last-modified: 2023-11-16T17:04:17.276909-05:00
     version: fedramp1.1.1-oscal1.0.4
     oscal-version: 1.0.4
     links:

diff --git a/dist/content/rev4/resources/xml/fedramp_values.xml b/dist/content/rev4/resources/xml/fedramp_values.xml
@@ -515,6 +515,9 @@
             <enum
                 short-label="Int"
                 value="interconnection">Interconnection</enum>
+            <enum
+                short-label="Ls"
+                value="leveraged-system">Leveraged System</enum>
         </allowed-values>
     </value-set>
     <value-set