-
Notifications
You must be signed in to change notification settings - Fork 240
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
Allow policies to be omitted from ScubaGear #1200
Allow policies to be omitted from ScubaGear #1200
Conversation
Feedback on example config fileThe example MS.TEAMS.6.1v1 provided in the sample config file is confusing with respect to the sample rationale. If the service is provided by M365 Defender and the Defender baseline checks for the implementation of this policy, then what is the purpose of having this policy in Teams to begin with? I believe this has a good chance of confusing users. I also recommend that you trim the number of example policy IDs that you have. I think by the time the user gets to policy 7.1 in the example config they will get the point so you could get rid of examples 7.2, 8.1, 8.2 and we wouldn't lose anything. |
Done |
5719c53
to
ee4cb3d
Compare
…onfuse with AAD exclusions in a different section of the documentation
I made a few tweaks to the configuration.md because i felt the term "excluded" could get conflated with AAD conditional access policy exclusions. we should stick with the term "omitted" and omissions. |
In configuration.md, I think we can delete this paragraph. It is confusing and I don't think it adds anything. Do you think anyone is likely to send policy ids as command line arguments to New-Config? It is easier to just modify the yaml config file in my opinion. "Policy omissions can be provided to the |
The expiration date feature is a nice touch! |
What are your thoughts on changing the following? |
Test summary
|
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
I found one bug and left some comments for a couple of other tweaks. If you can address those I think we are in good shape. Nice work. Overall the system behaved as expected under various conditions. Also I asked a related question on Slack which was answered by the team about how the downstream system interprets the outputs from this new functionality.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Testing:
Ran ScubaGear without a config file, runs as expected.
Ran ScubaGear with a config file:
- with valid policy ID, rationale, expiration
- with invalid policy ID
- with null Expiration value (results in skipped omission for given policy)
- with non-string Expiration value (results in skipped omission for given policy)
Verified "OmitPolicy" is included in ProviderSettingsExport
Verified Result: "Omitted" is in individual report json and in combined json with -mergeJson flag
Left one comment to consider but otherwise looks good.
I agree that it's probably easier to reference the example config and modify their config file manually. I'm ok with deleting the paragraph. |
I'm 100% ok with either. If you have a preference for "Test omitted" I'll change it to that. |
Changed |
@nanda-katikaneni Looks like this one is good to go |
🗣 Description
Make it so that policies can be omitted from the ScubaGear reports.
💭 Motivation and context
Closes #740.
Closes #739.
Closes #738.
🧪 Testing
I'd recommend that the reviewers start by reading the documentation I added for this feature, to get a good overview of the approach taken: https://github.com/cisagov/ScubaGear/blob/739-allow-any-given-policy-to-be-ignored/docs/configuration/configuration.md#omit-policies.
Testing I've done:
✅ Pre-approval checklist
✅ Pre-merge checklist
PR passed smoke test check.
Feature branch has been rebased against changes from parent branch, as needed
Use
Rebase branch
button below or use this reference to rebase from the command line.Resolved all merge conflicts on branch
Notified merge coordinator that PR is ready for merge via comment mention
✅ Post-merge checklist