Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Support additional control-origination props #784 #1460

Merged

Conversation

Compton-US
Copy link
Contributor

Committer Notes

Based on the request in #784, extended the xpath to include control-origination props for:

implemented-requirement/prop
implemented-requirement/by-component/prop
implemented-requirement/statement/prop
implemented-requirement/statement/by-component/prop

The updated xpath selected the following paths from my test case:

" /system-security-plan[1]/control-implementation[1]/implemented-requirement[1]/prop[1]/@name",
" /system-security-plan[1]/control-implementation[1]/implemented-requirement[1]/prop[2]/@name",
" /system-security-plan[1]/control-implementation[1]/implemented-requirement[1]/prop[3]/@name",
" /system-security-plan[1]/control-implementation[1]/implemented-requirement[1]/statement[1]/prop[1]/@name",
" /system-security-plan[1]/control-implementation[1]/implemented-requirement[1]/statement[2]/by-component[1]/prop[1]/@name",
" /system-security-plan[1]/control-implementation[1]/implemented-requirement[2]/prop[1]/@name",
" /system-security-plan[1]/control-implementation[1]/implemented-requirement[2]/prop[2]/@name",
" /system-security-plan[1]/control-implementation[1]/implemented-requirement[2]/prop[3]/@name",
" /system-security-plan[1]/control-implementation[1]/implemented-requirement[2]/by-component[1]/prop[1]/@name",

A note was added that the child context will override the parent control-origination.

aj-stein-nist
aj-stein-nist previously approved these changes Sep 19, 2022
Copy link
Contributor

@aj-stein-nist aj-stein-nist left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Like #1456, I'm A.J. and I approve this message. :-)

@david-waltermire
Copy link
Contributor

david-waltermire commented Sep 20, 2022

What is the value of a prop with name="control-origination"? We should do something to constrain the values.

Copy link
Contributor

@david-waltermire david-waltermire left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I think we need to think more about the value side of this new property.

@Compton-US
Copy link
Contributor Author

What is the value of a prop with name="control-origination"? We should do something to constrain the values.

@david-waltermire-nist Are we wanting to review this list?

At 711:

      <allowed-values target="prop[@name='control-origination']/@value">
        <enum value="organization">The control is implemented by the organization owning the system, but is not specific to the system itself.</enum>
        <enum value="system-specific">The control is implemented specifically to this system.</enum>
        <enum value="customer-configured">The control is provided by the system, but must be configured by the customer.</enum>
        <enum value="customer-provided">The control must be implemented by the customer.</enum>
        <enum value="inherited">This control is inherited from an underlying system.</enum>
      </allowed-values>

@david-waltermire david-waltermire linked an issue Sep 22, 2022 that may be closed by this pull request
5 tasks
Copy link
Contributor

@aj-stein-nist aj-stein-nist left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

It appears I missed this bit, but Dave pointed it out and you merged it in, so now I can approve again with more confidence we met reqs. :-)

Copy link
Contributor

@aj-stein-nist aj-stein-nist left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

OK, I am going to be that guy and retract my approval so we can discuss something? Let me know when you have time to discuss, Chris (and/or others maybe).

src/metaschema/oscal_ssp_metaschema.xml Show resolved Hide resolved
Copy link
Contributor

@aj-stein-nist aj-stein-nist left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Back to my previous state. Will approve this PR and table further conversation of follow-on work until #1502.

Copy link
Contributor

@david-waltermire david-waltermire left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

LGTM. Thanks!

@david-waltermire david-waltermire merged commit eef5369 into usnistgov:develop Oct 17, 2022
aj-stein-nist pushed a commit that referenced this pull request Oct 18, 2022
* Support additional control-origination props #784
* Update recommended path to target additional nodes.

Co-authored-by: David Waltermire <[email protected]>
david-waltermire added a commit that referenced this pull request Oct 31, 2022
* Support additional control-origination props #784
* Update recommended path to target additional nodes.

Co-authored-by: David Waltermire <[email protected]>
aj-stein-nist pushed a commit to aj-stein-nist/OSCAL-forked that referenced this pull request Jan 10, 2023
…#1460)

* Support additional control-origination props usnistgov#784
* Update recommended path to target additional nodes.

Co-authored-by: David Waltermire <[email protected]>
aj-stein-nist pushed a commit to aj-stein-nist/OSCAL-forked that referenced this pull request Feb 6, 2023
…#1460)

* Support additional control-origination props usnistgov#784
* Update recommended path to target additional nodes.

Co-authored-by: David Waltermire <[email protected]>
aj-stein-nist pushed a commit to aj-stein-nist/OSCAL-forked that referenced this pull request Jun 29, 2023
…#1460)

* Support additional control-origination props usnistgov#784
* Update recommended path to target additional nodes.

Co-authored-by: David Waltermire <[email protected]>
aj-stein-nist pushed a commit to aj-stein-nist/OSCAL-forked that referenced this pull request Jul 10, 2023
…#1460)

* Support additional control-origination props usnistgov#784
* Update recommended path to target additional nodes.

Co-authored-by: David Waltermire <[email protected]>
aj-stein-nist pushed a commit to galtm/OSCAL that referenced this pull request Sep 28, 2023
…#1460)

* Support additional control-origination props usnistgov#784
* Update recommended path to target additional nodes.

Co-authored-by: David Waltermire <[email protected]>
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

SSP Control Implementation Scope/Origination
3 participants