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

Indicate SubOU Hierarchy in Report for Sub+SubOUs #640

Open
wants to merge 1 commit into
base: main
Choose a base branch
from

Conversation

rlxdev
Copy link
Collaborator

@rlxdev rlxdev commented Mar 10, 2025

🗣 Description

This change makes it clear where SubOUs belong in the orgunit hierarchy when reporting baseline conformance. It was identified that subOUs within the hierarchy are currently only listed by their name (without the hierarchy). It's possible that two subOUs in different parts of the hierarchy may have the same name. This change adds to the displayed subOU name the path to subOUs below the 1st level of subOUs in the hierarchy. This change disambiguates cases where subOU names match, but also helps locate subOUs when the hierarchy is relatively deep.

Reporting of orgunits in the hierarchy is handled as follows:

The 1st level of orgunits below the top-level are identified only by name:

CISA VM Team:
2SV Exempt:

Any orgunit under these 1st level subOUs show the name followed by the path where they belong:

Sub alden test ou (in Alden's test OU):
1-1-1-1 (in 1/1-1/1-1-1): 

For the top-level orgunit, only the name is displayed:

DHS-CISA

Closes #623

🧪 Testing

Ran ScubaGoggles on scubagws.org tenant with baseline conformance failures in a variety of orgunits and sub-orgunits.
Confirmed that the orgunits were displayed as described above, either without the hierarchy for the top-level orgunit and 1st level orgunits, or with the hierarchy for all other subOUs.

✅ Pre-approval checklist

  • This PR has an informative and human-readable title.
  • Changes are limited to a single goal - eschew scope creep!
  • If applicable, All future TODOs are captured in issues, which are referenced in the PR description.
  • The relevant issues PR resolves are linked preferably via closing keywords.
  • All relevant type-of-change labels have been added.
  • I have read and agree to the CONTRIBUTING.md document.
  • These code changes follow cisagov code standards.
  • All relevant repo and/or project documentation has been updated to reflect the changes in this PR.
  • Tests have been added and/or modified to cover the changes in this PR.
  • All new and existing tests pass.

✅ Pre-merge Checklist

  • This PR has been smoke tested to ensure main is in a functional state when this PR is merged.
  • Squash all commits into one PR level commit using the Squash and merge button.

✅ Post-merge Checklist

  • Delete the branch to clean up.
  • Close issues resolved by this PR if the closing keywords did not activate.

Sorry, something went wrong.

@rlxdev rlxdev self-assigned this Mar 11, 2025
@rlxdev rlxdev added the bug This issue or pull request addresses broken functionality label Mar 18, 2025
@snarve snarve added this to the Eel milestone Mar 20, 2025
@rlxdev rlxdev marked this pull request as ready for review March 28, 2025 14:34
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
bug This issue or pull request addresses broken functionality
Projects
None yet
Development

Successfully merging this pull request may close these issues.

ScubaGoggles does not properly handle sub-OUs with the same name
2 participants