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.

Sign up for GitHub

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

Jump to bottom

Add inventory-item-has-valid-mac-address Constraint #1057

Merged
merged 1 commit into from
Jan 3, 2025
Merged

Add inventory-item-has-valid-mac-address Constraint #1057

merged 1 commit into from
Jan 3, 2025

Conversation

Gabeblis
Copy link
Contributor

Committer Notes

Purpose

This PR aims to add the inventory-item-has-valid-mac-address constraint which ensures that MAC address information is provided is formatted correctly.

Changes

Added constraint:

  • inventory-item-has-valid-mac-address

Added valid/invalid test content:

  • ssp-inventory-item-has-valid-mac-address-INVALID.xml
  • Edited fedramp-ssp-example.oscal.xml to align with constraint

Added yaml files for testing:

  • Pass/fail yaml tests added for each of the above constraints.

All Submissions:

By submitting a pull request, you are agreeing to provide this contribution under the CC0 1.0 Universal public domain dedication.

@Gabeblis Gabeblis self-assigned this Dec 31, 2024
@Gabeblis Gabeblis requested a review from a team as a code owner December 31, 2024 15:16
@Gabeblis Gabeblis linked an issue Dec 31, 2024 that may be closed by this pull request
Inventory - MAC Address #1030
Open
14 tasks
aj-stein-gsa
aj-stein-gsa approved these changes Dec 31, 2024
View reviewed changes
Copy link
Contributor

@aj-stein-gsa aj-stein-gsa left a comment

Choose a reason for hiding this comment

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

At first I was confused by .[prop[@name='mac-address']]/prop[@name='mac-address'], but then I realized this was pretty slick. Nice work.

aj-stein-gsa
aj-stein-gsa reviewed Jan 3, 2025
View reviewed changes
Copy link
Contributor

@aj-stein-gsa aj-stein-gsa left a comment •
edited
Loading

Choose a reason for hiding this comment

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

I was re-reviewing PRs today, and I forgot that this constraint is potentially blocked.

@brian-ruf and @Rene2mt, reviewing the current 1.1.3 models defining such a core property here for inventory-item and component is disallowed in a SSP without the use of a custom namespace (@ns="http://fedramp.gov/ns/oscal). I think we need to add this to the list for usnistgov/OSCAL#2092. I am sorry, disregard this one, I clearly missed some other locations in the model. 🤦

@wandmagic wandmagic merged commit 7018c20 into GSA:develop Jan 3, 2025
6 checks passed
wandmagic added a commit to wandmagic/fedramp-automation that referenced this pull request Jan 10, 2025
@wandmagic
Squashed commit of the following:
cdf2fa6 
commit 7c6b0f2
Merge: f10ace6 26f4f19
Author: ~ . ~ <[email protected]>
Date:   Fri Jan 10 11:49:42 2025 -0500

    Merge branch 'canary' of https://github.com/wandmagic/fedramp-automation into canary

commit f10ace6
Author: ~ . ~ <[email protected]>
Date:   Wed Jan 8 11:06:00 2025 -0500

    use latest server build

commit d7af65c
Author: ~ . ~ <[email protected]>
Date:   Tue Jan 7 22:21:48 2025 -0500

    hotfix missing expect tag

commit ee65d47
Author: ~ . ~ <[email protected]>
Date:   Tue Jan 7 17:17:54 2025 -0500

    use preview versions of oscal tools

commit b9ca17a
Author: Gabeblis <[email protected]>
Date:   Tue Jan 7 13:12:47 2025 -0500

    Add 'inventory-item-has-software-name' constraint and tests (GSA#1038)

commit f556138
Author: Gabeblis <[email protected]>
Date:   Tue Jan 7 13:11:13 2025 -0500

    Add `inventory-item-has-software-version` constraint (GSA#1039)

    * Add 'inventory-item-has-software-version' constraint and tests

    * Add 'inventory-item-has-software-version' constraint and tests

commit 60ba7f7
Author: wandmagic <[email protected]>
Date:   Fri Jan 10 11:15:47 2025 -0500

    add inventory item constraints (GSA#1063)

    * add inventory item constraints

    * update example file

    Co-Authored-By: A.J. Stein <[email protected]>

    * improve scan type constraint

    * massage constraints

    * improve constraint content

    * Update src/validations/constraints/fedramp-external-constraints.xml

    Co-authored-by: Gabeblis <[email protected]>

    * Update src/validations/constraints/fedramp-external-constraints.xml

    Co-authored-by: Gabeblis <[email protected]>

    * Update fedramp-external-constraints.xml

    * Update fedramp-external-constraints.xml

    * Squashed commit of the following:

    commit d7b0623
    Author: wandmagic <[email protected]>
    Date:   Tue Jan 7 14:47:44 2025 -0500

        fix constraints (GSA#1070)

    commit fc50a42
    Author: wandmagic <[email protected]>
    Date:   Fri Jan 3 14:21:47 2025 -0500

        hotfix develop (GSA#1064)

    * Squashed commit of the following:

    commit 18a02c9
    Author: wandmagic <[email protected]>
    Date:   Wed Jan 8 09:37:15 2025 -0500

        Hotfix styles (GSA#1076)

        * style guide hotfix

        * Update fedramp-external-constraints.xml

    commit 60b3c50
    Author: DimitriZhurkin <[email protected]>
    Date:   Wed Jan 8 07:14:14 2025 -0700

        Add the inter-boundary-component-has-information-type constraint (GSA#1066)

        * Add the inter-boundary-component-has-information-type constraint

        * clean up ssp-inter-boundary-component-has-information-type-INVALID.xml

    commit d7b0623
    Author: wandmagic <[email protected]>
    Date:   Tue Jan 7 14:47:44 2025 -0500

        fix constraints (GSA#1070)

    commit fc50a42
    Author: wandmagic <[email protected]>
    Date:   Fri Jan 3 14:21:47 2025 -0500

        hotfix develop (GSA#1064)

    * Squashed commit of the following:

    commit 8c1a343
    Author: Gabeblis <[email protected]>
    Date:   Thu Jan 9 11:45:37 2025 -0500

        Add new metapath target to 'security-level' constraint (GSA#1079)

    commit 608080d
    Author: wandmagic <[email protected]>
    Date:   Thu Jan 9 09:29:17 2025 -0500

        add additional sample content (GSA#1081)

    commit 1f55a73
    Author: Gabeblis <[email protected]>
    Date:   Thu Jan 9 09:22:28 2025 -0500

        Correct constraint message. (GSA#1085)

    commit 18a02c9
    Author: wandmagic <[email protected]>
    Date:   Wed Jan 8 09:37:15 2025 -0500

        Hotfix styles (GSA#1076)

        * style guide hotfix

        * Update fedramp-external-constraints.xml

    commit 60b3c50
    Author: DimitriZhurkin <[email protected]>
    Date:   Wed Jan 8 07:14:14 2025 -0700

        Add the inter-boundary-component-has-information-type constraint (GSA#1066)

        * Add the inter-boundary-component-has-information-type constraint

        * clean up ssp-inter-boundary-component-has-information-type-INVALID.xml

    commit d7b0623
    Author: wandmagic <[email protected]>
    Date:   Tue Jan 7 14:47:44 2025 -0500

        fix constraints (GSA#1070)

    commit fc50a42
    Author: wandmagic <[email protected]>
    Date:   Fri Jan 3 14:21:47 2025 -0500

        hotfix develop (GSA#1064)

    ---------

    Co-authored-by: A.J. Stein <[email protected]>
    Co-authored-by: Gabeblis <[email protected]>

commit 5e3f386
Author: wandmagic <[email protected]>
Date:   Fri Jan 10 09:25:07 2025 -0500

    make build (GSA#1080)

commit 8c1a343
Author: Gabeblis <[email protected]>
Date:   Thu Jan 9 11:45:37 2025 -0500

    Add new metapath target to 'security-level' constraint (GSA#1079)

commit 608080d
Author: wandmagic <[email protected]>
Date:   Thu Jan 9 09:29:17 2025 -0500

    add additional sample content (GSA#1081)

commit 1f55a73
Author: Gabeblis <[email protected]>
Date:   Thu Jan 9 09:22:28 2025 -0500

    Correct constraint message. (GSA#1085)

commit 26f4f19
Author: ~ . ~ <[email protected]>
Date:   Wed Jan 8 11:06:00 2025 -0500

    use latest server build

commit 18a02c9
Author: wandmagic <[email protected]>
Date:   Wed Jan 8 09:37:15 2025 -0500

    Hotfix styles (GSA#1076)

    * style guide hotfix

    * Update fedramp-external-constraints.xml

commit 60b3c50
Author: DimitriZhurkin <[email protected]>
Date:   Wed Jan 8 07:14:14 2025 -0700

    Add the inter-boundary-component-has-information-type constraint (GSA#1066)

    * Add the inter-boundary-component-has-information-type constraint

    * clean up ssp-inter-boundary-component-has-information-type-INVALID.xml

commit dd20034
Author: ~ . ~ <[email protected]>
Date:   Tue Jan 7 22:21:48 2025 -0500

    hotfix missing expect tag

commit b4d3df5
Author: ~ . ~ <[email protected]>
Date:   Tue Jan 7 17:17:54 2025 -0500

    use preview versions of oscal tools

commit d7b0623
Author: wandmagic <[email protected]>
Date:   Tue Jan 7 14:47:44 2025 -0500

    fix constraints (GSA#1070)

commit 719cf2c
Author: Gabeblis <[email protected]>
Date:   Tue Jan 7 13:12:47 2025 -0500

    Add 'inventory-item-has-software-name' constraint and tests (GSA#1038)

commit ec7affc
Author: Gabeblis <[email protected]>
Date:   Tue Jan 7 13:11:13 2025 -0500

    Add `inventory-item-has-software-version` constraint (GSA#1039)

    * Add 'inventory-item-has-software-version' constraint and tests

    * Add 'inventory-item-has-software-version' constraint and tests

commit fc50a42
Author: wandmagic <[email protected]>
Date:   Fri Jan 3 14:21:47 2025 -0500

    hotfix develop (GSA#1064)

commit d8a9ec9
Author: DimitriZhurkin <[email protected]>
Date:   Fri Jan 3 11:20:23 2025 -0700

    Add connection-security constraint (issue GSA#961) (GSA#1021)

    * Add connection-security constraint (issue GSA#961)

    * change fedramp ns to http

    * Add help-url

commit 1648871
Author: Kylie Hunter <[email protected]>
Date:   Fri Jan 3 13:02:59 2025 -0500

    Image has checksum (GSA#1053)

    * test scaffolds added

    * initial attempt at writing pass and fail content

    * feature file

    * revised target to appropriate place

    * removed old target

    * added in proper ns

    * Update src/validations/constraints/fedramp-external-constraints.xml

    Co-authored-by: A.J. Stein <[email protected]>

    * AJ suggestion for more complete example

    * added comments

    ---------

    Co-authored-by: A.J. Stein <[email protected]>

commit 962a9c0
Author: Gabeblis <[email protected]>
Date:   Fri Jan 3 12:31:04 2025 -0500

    Add 'inventory-item-or-component-has-asset-id' constraint and tests (GSA#1056)

commit 836b224
Author: Rene Tshiteya <[email protected]>
Date:   Fri Jan 3 12:25:35 2025 -0500

    Fix implemented-component component-uuid references (GSA#1059)

    Fix component issues

commit 7018c20
Author: Gabeblis <[email protected]>
Date:   Fri Jan 3 12:24:47 2025 -0500

    Add 'inventory-item-has-valid-mac-address' constraint and tests (GSA#1057)
wandmagic added a commit to wandmagic/fedramp-automation that referenced this pull request Jan 13, 2025
@wandmagic
Squashed commit of the following:
042a250 
commit 719cf2c
Author: Gabeblis <[email protected]>
Date:   Tue Jan 7 13:12:47 2025 -0500

    Add 'inventory-item-has-software-name' constraint and tests (GSA#1038)

commit ec7affc
Author: Gabeblis <[email protected]>
Date:   Tue Jan 7 13:11:13 2025 -0500

    Add `inventory-item-has-software-version` constraint (GSA#1039)

    * Add 'inventory-item-has-software-version' constraint and tests

    * Add 'inventory-item-has-software-version' constraint and tests

commit fc50a42
Author: wandmagic <[email protected]>
Date:   Fri Jan 3 14:21:47 2025 -0500

    hotfix develop (GSA#1064)

commit d8a9ec9
Author: DimitriZhurkin <[email protected]>
Date:   Fri Jan 3 11:20:23 2025 -0700

    Add connection-security constraint (issue GSA#961) (GSA#1021)

    * Add connection-security constraint (issue GSA#961)

    * change fedramp ns to http

    * Add help-url

commit 1648871
Author: Kylie Hunter <[email protected]>
Date:   Fri Jan 3 13:02:59 2025 -0500

    Image has checksum (GSA#1053)

    * test scaffolds added

    * initial attempt at writing pass and fail content

    * feature file

    * revised target to appropriate place

    * removed old target

    * added in proper ns

    * Update src/validations/constraints/fedramp-external-constraints.xml

    Co-authored-by: A.J. Stein <[email protected]>

    * AJ suggestion for more complete example

    * added comments

    ---------

    Co-authored-by: A.J. Stein <[email protected]>

commit 962a9c0
Author: Gabeblis <[email protected]>
Date:   Fri Jan 3 12:31:04 2025 -0500

    Add 'inventory-item-or-component-has-asset-id' constraint and tests (GSA#1056)

commit 836b224
Author: Rene Tshiteya <[email protected]>
Date:   Fri Jan 3 12:25:35 2025 -0500

    Fix implemented-component component-uuid references (GSA#1059)

    Fix component issues

commit 7018c20
Author: Gabeblis <[email protected]>
Date:   Fri Jan 3 12:24:47 2025 -0500

    Add 'inventory-item-has-valid-mac-address' constraint and tests (GSA#1057)
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@aj-stein-gsa aj-stein-gsa aj-stein-gsa approved these changes

@Rene2mt Rene2mt Rene2mt approved these changes

Assignees

@Gabeblis Gabeblis

Labels
None yet
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.

Inventory - MAC Address
4 participants
@Gabeblis @Rene2mt @aj-stein-gsa @wandmagic