Skip to content

Commit

Permalink
Merge pull request #186 from GSA/issue-174-update-objective-status
Browse files Browse the repository at this point in the history 
Fixes in SAR docs and SAR template (objective-status->target and other issues)
  • Loading branch information
@ohsh6o
ohsh6o authored Oct 22, 2021
2 parents edd97e6 + 484cd0e commit 6f99404
Show file tree
Hide file tree
Showing 18 changed files with 175 additions and 206 deletions.
74 changes: 27 additions & 47 deletions dist/content/resources/json/FedRAMP_extensions.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -5,9 +5,9 @@
"uuid": "BA710064-79AC-47D5-8F70-6749B359E7E2",
"metadata": {
"title": "[EXPERIMENTAL] FedRAMP Extensions",
"published": "2021-08-12T12:38:01Z",
"last-modified": "2021-08-12T12:38:01Z",
"version": "fedramp1.1.0-oscal1.0.0",
"published": "2021-10-22T05:55:26Z",
"last-modified": "2021-10-22T05:55:26Z",
"version": "fedramp1.2.1-oscal1.0.0",
"oscal-version": "oscal-1.0.0",
"revisions": {
"revision": [
Expand Down Expand Up @@ -60,6 +60,16 @@
"#text": "6b286b5d-8f07-4fa7-8847-1dd0d88f73fb"
},
"remarks": {"p": "Updated version reviewed for fedramp1.1.0-oscal1.0.0 release."}
},
{
"published": "2021-10-22T05:55:26Z",
"version": "fedramp1.2.1-oscal1.0.0",
"prop": {
"name": "party-uuid",
"ns": "https://fedramp.gov/ns/oscal",
"#text": "6b286b5d-8f07-4fa7-8847-1dd0d88f73fb"
},
"remarks": {"p": "Fix missed updates for target and touch-ups from review for fedramp1.2.1-oscal1.0.0 release."}
}
]
},
Expand Down Expand Up @@ -732,46 +742,6 @@
}
}
},
{
"id": "port",
"extension-name": "port",
"formal-name": "Interconnection Port",
"description": "A port used by the interconnection for the communication.",
"binding": {"pattern": "/o:system-security-plan/o:system-implementation/o:component[@type='interconnection']/o:prop"},
"constraint": {
"matches": {"data-type": "string"},
"has-cardinality": {
"min-occurs": 1,
"max-occurs": "unbounded"
},
"expect": {"test": ".[@class]"}
}
},
{
"id": "transport-type",
"extension-name": "transport-type",
"formal-name": "Transport Type",
"description": "The internet protocol transport type.",
"binding": {"pattern": "o:component[@component-type='service']/o:protocol/o:port-range/@transport"},
"constraint": {
"matches": {"data-type": "token"},
"allowed-values": {
"allow-other": "no",
"enum": [
{
"value": "tcp",
"short-label": "TCP",
"#text": "TCP"
},
{
"value": "udp",
"short-label": "UDP",
"#text": "UDP"
}
]
}
}
},
{
"id": "inventory-item-state",
"extension-name": "inventory-item-state",
Expand Down Expand Up @@ -1111,7 +1081,7 @@
"extension-name": "control-objective-implementation-status",
"formal-name": "Objective Implementation Status",
"description": "Indicates the implementation status of the control objective.",
"binding": {"pattern": "/o:assessment-results/o:results/o:finding/o:objective-status/o:prop"},
"binding": {"pattern": "/o:assessment-results/o:results/o:finding/o:target/o:prop"},
"constraint": {
"matches": {"data-type": "token"},
"has-cardinality": {
Expand Down Expand Up @@ -1175,7 +1145,7 @@
"extension-name": "leveraged-authorization-uuid",
"formal-name": "Leveraged Authorization",
"description": "Indicates a leveraged authorization used for this control.",
"binding": {"pattern": "/o:assessment-results/o:results/o:finding/o:objective-status/o:prop"},
"binding": {"pattern": "/o:assessment-results/o:results/o:finding/o:target/o:prop"},
"constraint": {
"matches": {"data-type": "uuid"},
"has-cardinality": {
Expand Down Expand Up @@ -2200,6 +2170,11 @@
"short-label": "Agreement",
"#text": "Agreement"
},
{
"value": "isa-agreement",
"short-label": "Agreement",
"#text": "Interconnection Security Agreement"
},
{
"value": "incident-response-plan",
"short-label": "IRP",
Expand Down Expand Up @@ -2420,10 +2395,10 @@
}
},
{
"name": "system-operational-status",
"name": "operational-status",
"formal-name": "Operational Status (system)",
"description": "The operational status of the system",
"binding": {"pattern": "/o:system-security-plan/o:system-characteristics/o:status/@state"},
"binding": {"pattern": "o:status/@state"},
"allowed-values": {
"allow-other": "no",
"enum": [
Expand All @@ -2437,6 +2412,11 @@
"short-label": "Development",
"#text": "Under Development"
},
{
"value": "under-major-modification",
"short-label": "Major Mod.",
"#text": "Major Modification"
},
{
"value": "disposition",
"short-label": "Alternative",
Expand Down
16 changes: 13 additions & 3 deletions dist/content/resources/json/fedramp_threats.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -4,9 +4,9 @@
"uuid": "7539047F-158B-4AA0-8FC5-F0530F1CC5CF",
"metadata": {
"title": "FedRAMP Defined Threat Table [Experimental]",
"published": "2021-08-12T12:38:01Z",
"last-modified": "2021-08-12T12:38:01Z",
"version": "fedramp1.1.0-oscal1.0.0",
"published": "2021-10-22T05:55:26Z",
"last-modified": "2021-10-22T05:55:26Z",
"version": "fedramp1.2.1-oscal1.0.0",
"revisions": {
"revision": [
{
Expand Down Expand Up @@ -48,6 +48,16 @@
"#text": "6b286b5d-8f07-4fa7-8847-1dd0d88f73fb"
},
"remarks": {"p": "Updated version reviewed for fedramp1.1.0-oscal1.0.0 releasess."}
},
{
"published": "2021-10-22T05:55:26Z",
"version": "fedramp1.2.1-oscal1.0.0",
"prop": {
"name": "party-uuid",
"ns": "https://fedramp.gov/ns/oscal",
"#text": "6b286b5d-8f07-4fa7-8847-1dd0d88f73fb"
},
"remarks": {"p": "Fix missed updates for target and touch-ups from review for fedramp1.2.1-oscal1.0.0 release."}
}
]
},
Expand Down
63 changes: 21 additions & 42 deletions dist/content/resources/json/fedramp_values.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -4,9 +4,9 @@
"metadata": {
"title": "[EXPERIMENTAL] FedRAMP Defined Identifiers and Accepted Values",
"title-short": "FedRAMP Data Values (Experimental)",
"published": "2021-08-12T12:38:01Z",
"last-modified": "2021-08-12T12:38:01Z",
"version": "fedramp1.1.0-oscal1.0.0",
"published": "2021-10-22T05:55:26Z",
"last-modified": "2021-10-22T05:55:26Z",
"version": "fedramp1.2.1-oscal1.0.0",
"author": "FedRAMP PMO",
"description": "This EXPERIMENTAL file provides the FedRAMP defined identifiers and acceptable values in a machine-readable format.",
"remarks": ""
Expand Down Expand Up @@ -463,10 +463,10 @@
"remarks": "FedRAMP only allows information types defined in NIST SP 800-60v2r1."
},
{
"name": "system-operational-status",
"name": "operational-status",
"formal-name": "Operational Status (system)",
"description": "The operational status of the system",
"binding": {"pattern": "system-characteristics/status/@state"},
"binding": {"pattern": "status/@state"},
"allowed-values": {
"allow-other": "no",
"enum": [
Expand Down Expand Up @@ -498,37 +498,6 @@
]
}
},
{
"name": "component-operational-status",
"formal-name": "Operational Status (component)",
"description": "The operational status of the component",
"binding": {"pattern": "component/status/@state"},
"allowed-values": {
"allow-other": "no",
"enum": [
{
"value": "operational",
"short-label": "Operational",
"#text": "Operational"
},
{
"value": "under-development",
"short-label": "Development",
"#text": "Under Development"
},
{
"value": "disposition",
"short-label": "Alternative",
"#text": "Alternative Implementation"
},
{
"value": "other",
"short-label": "Other",
"#text": "Other"
}
]
}
},
{
"name": "user-type",
"formal-name": "User Type",
Expand Down Expand Up @@ -621,7 +590,7 @@
"name": "interconnection-direction",
"formal-name": "Interconnection Direction",
"description": "Identifies the direction of information flow for the interconnection.",
"binding": {"pattern": "component[@component-type='interconnection']/prop[@name='direction'][@ns='https://fedramp.gov/ns/oscal']"},
"binding": {"pattern": "component[@component-type='interconnection']/prop[@name='interconnection-direction'][@ns='https://fedramp.gov/ns/oscal']"},
"allowed-values": {
"allow-other": "no",
"enum": [
Expand All @@ -647,7 +616,7 @@
"name": "interconnection-security",
"formal-name": "Interconnection Security",
"description": "Identifies the type of security applied to the interconnection.",
"binding": {"pattern": "component[@component-type='interconnection']/prop[@name='connection-security'][@ns='https://fedramp.gov/ns/oscal']/@value"},
"binding": {"pattern": "component[@component-type='interconnection']/prop[@name='interconnection-security'][@ns='https://fedramp.gov/ns/oscal']/@value"},
"allowed-values": {
"allow-other": "no",
"enum": [
Expand All @@ -662,14 +631,19 @@
"#text": "Virtual Private Network"
},
{
"value": "ssl",
"short-label": "SSL",
"#text": "Secure Socket Layer"
"value": "tls",
"short-label": "TLS",
"#text": "Transport-Layer Security"
},
{
"value": "dtls",
"short-label": "TLS",
"#text": "Transport-Layer Security"
},
{
"value": "certificate",
"short-label": "Cert",
"#text": "Certificate"
"#text": "Certificate Authentication Security"
},
{
"value": "secure-file-transfer",
Expand Down Expand Up @@ -1187,6 +1161,11 @@
"short-label": "Agreement",
"#text": "Agreement"
},
{
"value": "isa-agreement",
"short-label": "Agreement",
"#text": "Interconnection Security Agreement"
},
{
"value": "incident-response-plan",
"short-label": "IRP",
Expand Down
16 changes: 13 additions & 3 deletions dist/content/resources/json/information-types.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -4,9 +4,9 @@
"uuid": "157BB1F7-8BE7-4642-9D5B-60B5995684F0",
"metadata": {
"title": "FedRAMP Acceptable Information Types (Experimental)",
"published": "2021-08-12T12:38:01Z",
"last-modified": "2021-08-12T12:38:01Z",
"version": "fedramp1.1.0-oscal1.0.0",
"published": "2021-10-22T05:55:26Z",
"last-modified": "2021-10-22T05:55:26Z",
"version": "fedramp1.2.1-oscal1.0.0",
"revisions": {
"revision": [
{
Expand Down Expand Up @@ -48,6 +48,16 @@
"#text": "6b286b5d-8f07-4fa7-8847-1dd0d88f73fb"
},
"remarks": {"p": "Updated version reviewed for fedramp1.1.0-oscal1.0.0 release."}
},
{
"published": "2021-10-22T05:55:26Z",
"version": "fedramp1.2.1-oscal1.0.0",
"prop": {
"name": "party-uuid",
"ns": "https://fedramp.gov/ns/oscal",
"#text": "6b286b5d-8f07-4fa7-8847-1dd0d88f73fb"
},
"remarks": {"p": "Fix missed updates for target and touch-ups from review for fedramp1.2.1-oscal1.0.0 release."}
}
]
},
Expand Down
Loading

0 comments on commit 6f99404

Please sign in to comment.