From b838ff69fd14d3adfc9158d5af000eabd2ea6d98 Mon Sep 17 00:00:00 2001 From: Nikita Wootten Date: Thu, 24 Aug 2023 11:15:13 -0400 Subject: [PATCH 1/2] Adjusted language for `metadata:last-modified` --- .../profile-resolution-specml-requirements.xspec | 2 +- .../profile-resolution/profile-resolution-specml-working.xml | 2 +- .../profile-resolution/profile-resolution-specml.xml | 2 +- src/specifications/profile-resolution/resolution-testing.xml | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/src/specifications/profile-resolution/profile-resolution-specml-requirements.xspec b/src/specifications/profile-resolution/profile-resolution-specml-requirements.xspec index f4c64e37e6..9bb0442a8d 100644 --- a/src/specifications/profile-resolution/profile-resolution-specml-requirements.xspec +++ b/src/specifications/profile-resolution/profile-resolution-specml-requirements.xspec @@ -402,7 +402,7 @@ pending="[dev]"/> - diff --git a/src/specifications/profile-resolution/profile-resolution-specml-working.xml b/src/specifications/profile-resolution/profile-resolution-specml-working.xml index a3497f2e6e..0401d8577f 100644 --- a/src/specifications/profile-resolution/profile-resolution-specml-working.xml +++ b/src/specifications/profile-resolution/profile-resolution-specml-working.xml @@ -946,7 +946,7 @@ control:

The value of metadata:oscal-version in the target MUST be set with a string that identifies the version of OSCAL used by this tool to resolve the profile (ex. 1.0.0). This value MUST be determined by compiling the oscal-versions from each imported document and the source profile, and taking the most recent minor version. If this version is more recent than what the resolution tool is using, then the value of the output oscal-version MUST be the version that the tool used internally. If any of the above OSCAL versions (imported document versions, source profile version, tool version) are of a different major version (the first digit differs), the tool SHOULD provide an error and cease processing.

  • -

    The value of metadata:last-modified in the target MUST be set with a valid timestamp representing the time the profile resolution completed.

    +

    The value of metadata:last-modified in the target MUST be set with a valid timestamp. This value SHOULD represent the time the profile resolution was initiated.

  • The value of metadata:source-profile in the target SHOULD be set with a valid URI that points to the profile that resulted in this catalog. If there are privacy or security concerns, the value of metadata:source-profile MAY be set to anything, in which case the simple existence of the source-profile property indicates that this is a resolved profile.

    diff --git a/src/specifications/profile-resolution/profile-resolution-specml.xml b/src/specifications/profile-resolution/profile-resolution-specml.xml index a38cbb0581..89945d6a32 100644 --- a/src/specifications/profile-resolution/profile-resolution-specml.xml +++ b/src/specifications/profile-resolution/profile-resolution-specml.xml @@ -1410,7 +1410,7 @@ control:

    The value of metadata:oscal-version in the target MUST be set with a string that identifies the version of OSCAL used by this tool to resolve the profile (ex. 1.0.0). This value MUST be determined by compiling the oscal-versions from each imported document and the source profile, and taking the most recent minor version. If this version is more recent than what the resolution tool is using, then the value of oscal-version MUST be the version that the tool used internally. If any of the above OSCAL versions (imported document versions, source profile version, tool version) are of a different major version (the first digit differs), the tool SHOULD provide an error and cease processing.

  • -

    The value of metadata:last-modified in the target MUST be set with a valid timestamp representing the time the profile resolution completed.

    +

    The value of metadata:last-modified in the target MUST be set with a valid timestamp. This value SHOULD represent the time the profile resolution was initiated.

  • A child prop object with name:source-profile MUST be created. The value object of this prop SHOULD be set with a valid URI that points to the profile that resulted in this catalog. diff --git a/src/specifications/profile-resolution/resolution-testing.xml b/src/specifications/profile-resolution/resolution-testing.xml index f6955e9e33..73db50e67e 100644 --- a/src/specifications/profile-resolution/resolution-testing.xml +++ b/src/specifications/profile-resolution/resolution-testing.xml @@ -325,7 +325,7 @@ If any of the above OSCAL versions (imported document versions, source profile version, tool version) are of a different major version (the first digit differs), the tool SHOULD provide an error and cease processing. - The value of metadata:last-modified in the target MUST be set with a valid timestamp representing the time the profile resolution completed. + The value of metadata:last-modified in the target MUST be set with a valid timestamp. This value SHOULD represent the time the profile resolution was initiated. PENDING develop an external (XPath) test From 09e66e4638accc5cc373fee2b0bfb1274da25a60 Mon Sep 17 00:00:00 2001 From: Nikita Wootten Date: Fri, 25 Aug 2023 11:15:31 -0400 Subject: [PATCH 2/2] Apply suggestions from code review Co-authored-by: A.J. Stein --- .../profile-resolution-specml-requirements.xspec | 2 +- .../profile-resolution/profile-resolution-specml-working.xml | 2 +- .../profile-resolution/profile-resolution-specml.xml | 2 +- src/specifications/profile-resolution/resolution-testing.xml | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/src/specifications/profile-resolution/profile-resolution-specml-requirements.xspec b/src/specifications/profile-resolution/profile-resolution-specml-requirements.xspec index 9bb0442a8d..379efd8c03 100644 --- a/src/specifications/profile-resolution/profile-resolution-specml-requirements.xspec +++ b/src/specifications/profile-resolution/profile-resolution-specml-requirements.xspec @@ -402,7 +402,7 @@ pending="[dev]"/> - diff --git a/src/specifications/profile-resolution/profile-resolution-specml-working.xml b/src/specifications/profile-resolution/profile-resolution-specml-working.xml index 0401d8577f..95aa57f385 100644 --- a/src/specifications/profile-resolution/profile-resolution-specml-working.xml +++ b/src/specifications/profile-resolution/profile-resolution-specml-working.xml @@ -946,7 +946,7 @@ control:

    The value of metadata:oscal-version in the target MUST be set with a string that identifies the version of OSCAL used by this tool to resolve the profile (ex. 1.0.0). This value MUST be determined by compiling the oscal-versions from each imported document and the source profile, and taking the most recent minor version. If this version is more recent than what the resolution tool is using, then the value of the output oscal-version MUST be the version that the tool used internally. If any of the above OSCAL versions (imported document versions, source profile version, tool version) are of a different major version (the first digit differs), the tool SHOULD provide an error and cease processing.

  • -

    The value of metadata:last-modified in the target MUST be set with a valid timestamp. This value SHOULD represent the time the profile resolution was initiated.

    +

    The value of metadata:last-modified in the target MUST be set with a valid timestamp. This value SHOULD represent the time that profile resolution occurred.

  • The value of metadata:source-profile in the target SHOULD be set with a valid URI that points to the profile that resulted in this catalog. If there are privacy or security concerns, the value of metadata:source-profile MAY be set to anything, in which case the simple existence of the source-profile property indicates that this is a resolved profile.

    diff --git a/src/specifications/profile-resolution/profile-resolution-specml.xml b/src/specifications/profile-resolution/profile-resolution-specml.xml index 89945d6a32..993e0ee8d8 100644 --- a/src/specifications/profile-resolution/profile-resolution-specml.xml +++ b/src/specifications/profile-resolution/profile-resolution-specml.xml @@ -1410,7 +1410,7 @@ control:

    The value of metadata:oscal-version in the target MUST be set with a string that identifies the version of OSCAL used by this tool to resolve the profile (ex. 1.0.0). This value MUST be determined by compiling the oscal-versions from each imported document and the source profile, and taking the most recent minor version. If this version is more recent than what the resolution tool is using, then the value of oscal-version MUST be the version that the tool used internally. If any of the above OSCAL versions (imported document versions, source profile version, tool version) are of a different major version (the first digit differs), the tool SHOULD provide an error and cease processing.

  • -

    The value of metadata:last-modified in the target MUST be set with a valid timestamp. This value SHOULD represent the time the profile resolution was initiated.

    +

    The value of metadata:last-modified in the target MUST be set with a valid timestamp. This value SHOULD represent the time that profile resolution occurred.

  • A child prop object with name:source-profile MUST be created. The value object of this prop SHOULD be set with a valid URI that points to the profile that resulted in this catalog. diff --git a/src/specifications/profile-resolution/resolution-testing.xml b/src/specifications/profile-resolution/resolution-testing.xml index 73db50e67e..72a7013638 100644 --- a/src/specifications/profile-resolution/resolution-testing.xml +++ b/src/specifications/profile-resolution/resolution-testing.xml @@ -325,7 +325,7 @@ If any of the above OSCAL versions (imported document versions, source profile version, tool version) are of a different major version (the first digit differs), the tool SHOULD provide an error and cease processing. - The value of metadata:last-modified in the target MUST be set with a valid timestamp. This value SHOULD represent the time the profile resolution was initiated. + The value of metadata:last-modified in the target MUST be set with a valid timestamp. This value SHOULD represent the time that profile resolution occurred. PENDING develop an external (XPath) test