From 7cf69209553b93a301f36caaa11562de5fffee8f Mon Sep 17 00:00:00 2001 From: Iorga Date: Fri, 13 Oct 2023 21:31:00 -0400 Subject: [PATCH 1/4] Two additional allowed values for catalog/group/part/@name and catalog/group/control/part/@name --- src/metaschema/oscal_catalog_metaschema.xml | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/src/metaschema/oscal_catalog_metaschema.xml b/src/metaschema/oscal_catalog_metaschema.xml index 5a2a9b52fa..c2611cc55c 100644 --- a/src/metaschema/oscal_catalog_metaschema.xml +++ b/src/metaschema/oscal_catalog_metaschema.xml @@ -147,6 +147,9 @@ An introduction to a control or a group of controls. + + A description or requirement for all controls in the group or all groupsstatement of controls. +

Catalogs can use the catalog group construct to organize related controls into a single grouping, such as a family of controls or other logical organizational structure.

@@ -257,6 +260,7 @@ A set of control implementation requirements. Additional information to consider when selecting, implementing, assessing, and monitoring a control. + An example of a control implementation. **(deprecated)** Use 'assessment-method' instead. The part describes a method-based assessment From 1c4accf16a6e86dd73564d378026459c8dec1509 Mon Sep 17 00:00:00 2001 From: Iorga Date: Sun, 22 Oct 2023 17:43:12 -0400 Subject: [PATCH 2/4] aligned the description of group/part@name='statement' and control/part@name='statement' --- src/metaschema/oscal_catalog_metaschema.xml | 8 +++----- 1 file changed, 3 insertions(+), 5 deletions(-) diff --git a/src/metaschema/oscal_catalog_metaschema.xml b/src/metaschema/oscal_catalog_metaschema.xml index c2611cc55c..b15e6b37a9 100644 --- a/src/metaschema/oscal_catalog_metaschema.xml +++ b/src/metaschema/oscal_catalog_metaschema.xml @@ -146,9 +146,7 @@ An introduction to a control or a group of controls. - - - A description or requirement for all controls in the group or all groupsstatement of controls. + A set of implementation requirements. @@ -257,10 +255,10 @@ target="part[has-oscal-namespace('http://csrc.nist.gov/ns/oscal')]/@name"> An introduction to a control or a group of controls. - A set of control implementation requirements. + A set of implementation requirements. Additional information to consider when selecting, implementing, assessing, and monitoring a control. - An example of a control implementation. + An example of an implemented requirement or control statement. **(deprecated)** Use 'assessment-method' instead. The part describes a method-based assessment From af343fa2889999d658d79b0921658d34ad2b1a26 Mon Sep 17 00:00:00 2001 From: Iorga Date: Wed, 29 Nov 2023 02:00:39 -0500 Subject: [PATCH 3/4] Fixed typo in the oscal_ssp_metaschema and updated controversial constraint for group/part in oscal_catalog_metaschema --- src/metaschema/oscal_catalog_metaschema.xml | 4 ++-- src/metaschema/oscal_ssp_metaschema.xml | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/src/metaschema/oscal_catalog_metaschema.xml b/src/metaschema/oscal_catalog_metaschema.xml index b15e6b37a9..2449e80cad 100644 --- a/src/metaschema/oscal_catalog_metaschema.xml +++ b/src/metaschema/oscal_catalog_metaschema.xml @@ -146,7 +146,7 @@ An introduction to a control or a group of controls. - A set of implementation requirements. + An information providing directions for a control or a group of controls. @@ -255,7 +255,7 @@ target="part[has-oscal-namespace('http://csrc.nist.gov/ns/oscal')]/@name"> An introduction to a control or a group of controls. - A set of implementation requirements. + A set of implementation requirements or recommendations. Additional information to consider when selecting, implementing, assessing, and monitoring a control. An example of an implemented requirement or control statement. diff --git a/src/metaschema/oscal_ssp_metaschema.xml b/src/metaschema/oscal_ssp_metaschema.xml index 2cfb9df3c3..2f0d1c613c 100644 --- a/src/metaschema/oscal_ssp_metaschema.xml +++ b/src/metaschema/oscal_ssp_metaschema.xml @@ -156,7 +156,7 @@ The community cloud deployment model as defined by The NIST Definition of Cloud Computing. - The hybrid cloud deployment model as defined by as defined by The NIST Definition of Cloud Computing. + The hybrid cloud deployment model as defined by The NIST Definition of Cloud Computing. A specific type of community-cloud for use only by government services. From 0b7b81efcc1c821124e2d06662a5da3d8b0a29af Mon Sep 17 00:00:00 2001 From: Michaela Iorga Date: Wed, 29 Nov 2023 13:36:29 -0500 Subject: [PATCH 4/4] Update src/metaschema/oscal_catalog_metaschema.xml Fixed grammar. Co-authored-by: Chris Compton --- src/metaschema/oscal_catalog_metaschema.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/metaschema/oscal_catalog_metaschema.xml b/src/metaschema/oscal_catalog_metaschema.xml index 2449e80cad..cf6498f580 100644 --- a/src/metaschema/oscal_catalog_metaschema.xml +++ b/src/metaschema/oscal_catalog_metaschema.xml @@ -146,7 +146,7 @@ An introduction to a control or a group of controls. - An information providing directions for a control or a group of controls. + Information providing directions for a control or a group of controls.