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

formal internal review of AAD baseline #421

Merged
merged 20 commits into from
Aug 7, 2023

Conversation

tkol2022
Copy link
Collaborator

@tkol2022 tkol2022 commented Jul 6, 2023

Scope

This PR is designed to facilitate a formal review of the revised AAD baseline from CISA Scuba principals and the Scuba development team. Following this review the AAD baseline should be in a state for sending to the CISA agency formal review process.

Note

We have active development issues against this baseline at the moment, including new policy implementations and tweaks to existing policies. If any changes occur during this baseline review which materially affect the ScubaGear code, it may require a notification to the affected developers.

✅ Pre-approval checklist

  • This PR has an informative and human-readable title.
  • Changes are limited to a single goal - eschew scope creep!
  • All future TODOs are captured in issues, which are referenced
    in code comments.
  • All relevant type-of-change labels have been added.
  • All relevant repo and/or project documentation has been updated
    to reflect the changes in this PR.

✅ Pre-merge checklist

  • Revert dependencies to default branches.
  • Finalize version.

@tkol2022 tkol2022 added blocked This issue or pull request is awaiting the outcome of another issue or pull request baseline-document Issues relating to the text in the baseline documents themselves labels Jul 6, 2023
@tkol2022 tkol2022 added this to the Emerald milestone Jul 6, 2023
@tkol2022 tkol2022 self-assigned this Jul 6, 2023
@schrolla schrolla force-pushed the aad-formal-review-emerald branch from cb00219 to 5552cbd Compare July 7, 2023 16:36
@schrolla schrolla added the code-review This issue or task involves reviewing the code for the assigned script label Jul 10, 2023
@gdasher
Copy link
Collaborator

gdasher commented Jul 19, 2023

I reviewed the content of the AAD baseline on the emerald branch. It is approved from my point of view with these changes:

  • MS.AAD.7.* controls: Clarify that Microsoft AAD PIM qualifies as a pam system and that a non-PIM PAM may be used if it meets the same set of requirements. Terminology from PIM is sprinkled throughout these controls (e.g. permanent active), implying that PIM must be used. Overall, my suggestion is to be explicit that PIM terminology is used through and that another PAM system may be used assuming it meets the requirements, but also that PIM is acceptable to meet the pam requirement in MS.AAD.7.5v1
  • (nit) MS.AAD.4.1v1: please used fixed width font for the log types so that they stand out from the surrounding text

@tkol2022
Copy link
Collaborator Author

@nanda-katikaneni @schrolla @ssatyapal123 Kindly let me know if you have any review comments. thx.

@schrolla schrolla force-pushed the aad-formal-review-emerald branch from 4895031 to f460681 Compare July 31, 2023 15:29
Copy link
Collaborator

@schrolla schrolla left a comment

Choose a reason for hiding this comment

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

No technical issues or findings with the policies themselves, mostly recommendations to bring the baseline document in line with the style guide or conventions used in other baselines OR clarify the intent of the policies.

baselines/aad.md Show resolved Hide resolved
baselines/aad.md Show resolved Hide resolved
baselines/aad.md Show resolved Hide resolved
baselines/aad.md Outdated Show resolved Hide resolved
baselines/aad.md Show resolved Hide resolved
baselines/aad.md Show resolved Hide resolved
baselines/aad.md Outdated Show resolved Hide resolved
baselines/aad.md Outdated Show resolved Hide resolved
baselines/aad.md Show resolved Hide resolved
baselines/aad.md Show resolved Hide resolved
baselines/aad.md Show resolved Hide resolved
baselines/aad.md Outdated Show resolved Hide resolved
baselines/aad.md Show resolved Hide resolved
baselines/aad.md Show resolved Hide resolved
@tkol2022
Copy link
Collaborator Author

tkol2022 commented Aug 3, 2023

I reviewed the content of the AAD baseline on the emerald branch. It is approved from my point of view with these changes:

  • MS.AAD.7. controls*: Clarify that Microsoft AAD PIM qualifies as a pam system and that a non-PIM PAM may be used if it meets the same set of requirements. Terminology from PIM is sprinkled throughout these controls (e.g. permanent active), implying that PIM must be used. Overall, my suggestion is to be explicit that PIM terminology is used through and that another PAM system may be used assuming it meets the requirements, but also that PIM is acceptable to meet the pam requirement in MS.AAD.7.5v1
  • (nit) MS.AAD.4.1v1: please used fixed width font for the log types so that they stand out from the surrounding text

Added the back ticks so that the logs stand out.

@tkol2022
Copy link
Collaborator Author

tkol2022 commented Aug 3, 2023

Per discussion at stand-up, removed the policy bullets from Appendix A. Left the reference to the Hybrid Identity Solutions document in tact and fixed the URL since it was wrong.

@tkol2022
Copy link
Collaborator Author

tkol2022 commented Aug 3, 2023

@gdasher @schrolla @nanda-katikaneni Made the requested revisions. Take a look if you like and kindly perform the GitHub approval if you are satisfied. Thanks for the diligent review.

Copy link
Collaborator

@gdasher gdasher left a comment

Choose a reason for hiding this comment

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

I skimmed through one more time. Looks good with one small nit.

baselines/aad.md Show resolved Hide resolved
Copy link
Contributor

@ssatyapal123 ssatyapal123 left a comment

Choose a reason for hiding this comment

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

Thanks for the opportunity to review. It looks great.
Small suggestion in Policy
MS.AAD.2.1v1
Users detected as high risk SHALL be blocked
Rationale: By blocking users determined as high risk, compromised accounts are prevented from accessing the tenant.

Suggest changing Rationale to:
Rationale: By blocking users determined as high risk, compromised accounts can be prevented from accessing the tenant.

@schrolla schrolla removed the blocked This issue or pull request is awaiting the outcome of another issue or pull request label Aug 4, 2023
@tkol2022
Copy link
Collaborator Author

tkol2022 commented Aug 4, 2023

Thanks for the opportunity to review. It looks great. Small suggestion in Policy MS.AAD.2.1v1 Users detected as high risk SHALL be blocked Rationale: By blocking users determined as high risk, compromised accounts are prevented from accessing the tenant.

Suggest changing Rationale to: Rationale: By blocking users determined as high risk, compromised accounts can be prevented from accessing the tenant.

Fixed.

Copy link
Collaborator

@schrolla schrolla left a comment

Choose a reason for hiding this comment

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

Resolved all of my remaining issues and a quick look shows the baseline is in good shape and looks ready for merge pending resolution of a few minor comments from others.

Copy link
Collaborator

@nanda-katikaneni nanda-katikaneni left a comment

Choose a reason for hiding this comment

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

Looks good to me.

@ssatyapal123 ssatyapal123 self-requested a review August 4, 2023 15:00
schrolla and others added 18 commits August 7, 2023 12:24
Co-authored-by: Addam Schroll <108814318+schrolla@users.noreply.github.com>
Co-authored-by: Addam Schroll <108814318+schrolla@users.noreply.github.com>
Co-authored-by: Addam Schroll <108814318+schrolla@users.noreply.github.com>
Co-authored-by: Addam Schroll <108814318+schrolla@users.noreply.github.com>
Co-authored-by: Addam Schroll <108814318+schrolla@users.noreply.github.com>
Co-authored-by: Addam Schroll <108814318+schrolla@users.noreply.github.com>
@schrolla schrolla force-pushed the aad-formal-review-emerald branch from 7137bd6 to 6fbeedc Compare August 7, 2023 17:24
@nanda-katikaneni nanda-katikaneni merged commit 8789a88 into emerald Aug 7, 2023
@nanda-katikaneni nanda-katikaneni deleted the aad-formal-review-emerald branch August 7, 2023 17:57
crutchfield pushed a commit that referenced this pull request Aug 23, 2023
* addressed Addam's comments from last PR

* fixed spelling of adapted

* Fix spelling errors

* Updated per Addam's 1st comment

Co-authored-by: Addam Schroll <108814318+schrolla@users.noreply.github.com>

* Updated per Addam's 2nd comment

Co-authored-by: Addam Schroll <108814318+schrolla@users.noreply.github.com>

* Update per Addam's comment 3

Co-authored-by: Addam Schroll <108814318+schrolla@users.noreply.github.com>

* Update per Addam comment 4

Co-authored-by: Addam Schroll <108814318+schrolla@users.noreply.github.com>

* Update per Addam's comment 5

Co-authored-by: Addam Schroll <108814318+schrolla@users.noreply.github.com>

* Updated per Addam's comment 6

Co-authored-by: Addam Schroll <108814318+schrolla@users.noreply.github.com>

* first round of edits per review comments

* Made Addam's suggested revisions

* test cap template style 1

* test cap style 1

* test cap style 3

* test cap style 4

* test cap style 5

* reformatted CAPs per comments

* cap format edit

* update per Nanda's comments

* Edit requests by Grant and Shanti

---------

Co-authored-by: Addam Schroll <aschroll@mitre.org>
Co-authored-by: Addam Schroll <108814318+schrolla@users.noreply.github.com>
schrolla added a commit that referenced this pull request Sep 1, 2023
* addressed Addam's comments from last PR

* fixed spelling of adapted

* Fix spelling errors

* Updated per Addam's 1st comment

Co-authored-by: Addam Schroll <108814318+schrolla@users.noreply.github.com>

* Updated per Addam's 2nd comment

Co-authored-by: Addam Schroll <108814318+schrolla@users.noreply.github.com>

* Update per Addam's comment 3

Co-authored-by: Addam Schroll <108814318+schrolla@users.noreply.github.com>

* Update per Addam comment 4

Co-authored-by: Addam Schroll <108814318+schrolla@users.noreply.github.com>

* Update per Addam's comment 5

Co-authored-by: Addam Schroll <108814318+schrolla@users.noreply.github.com>

* Updated per Addam's comment 6

Co-authored-by: Addam Schroll <108814318+schrolla@users.noreply.github.com>

* first round of edits per review comments

* Made Addam's suggested revisions

* test cap template style 1

* test cap style 1

* test cap style 3

* test cap style 4

* test cap style 5

* reformatted CAPs per comments

* cap format edit

* update per Nanda's comments

* Edit requests by Grant and Shanti

---------

Co-authored-by: Addam Schroll <aschroll@mitre.org>
Co-authored-by: Addam Schroll <108814318+schrolla@users.noreply.github.com>
schrolla added a commit that referenced this pull request Nov 2, 2023
* addressed Addam's comments from last PR

* fixed spelling of adapted

* Fix spelling errors

* Updated per Addam's 1st comment

Co-authored-by: Addam Schroll <108814318+schrolla@users.noreply.github.com>

* Updated per Addam's 2nd comment

Co-authored-by: Addam Schroll <108814318+schrolla@users.noreply.github.com>

* Update per Addam's comment 3

Co-authored-by: Addam Schroll <108814318+schrolla@users.noreply.github.com>

* Update per Addam comment 4

Co-authored-by: Addam Schroll <108814318+schrolla@users.noreply.github.com>

* Update per Addam's comment 5

Co-authored-by: Addam Schroll <108814318+schrolla@users.noreply.github.com>

* Updated per Addam's comment 6

Co-authored-by: Addam Schroll <108814318+schrolla@users.noreply.github.com>

* first round of edits per review comments

* Made Addam's suggested revisions

* test cap template style 1

* test cap style 1

* test cap style 3

* test cap style 4

* test cap style 5

* reformatted CAPs per comments

* cap format edit

* update per Nanda's comments

* Edit requests by Grant and Shanti

---------

Co-authored-by: Addam Schroll <aschroll@mitre.org>
Co-authored-by: Addam Schroll <108814318+schrolla@users.noreply.github.com>
schrolla added a commit that referenced this pull request Nov 2, 2023
* addressed Addam's comments from last PR

* fixed spelling of adapted

* Fix spelling errors

* Updated per Addam's 1st comment

Co-authored-by: Addam Schroll <108814318+schrolla@users.noreply.github.com>

* Updated per Addam's 2nd comment

Co-authored-by: Addam Schroll <108814318+schrolla@users.noreply.github.com>

* Update per Addam's comment 3

Co-authored-by: Addam Schroll <108814318+schrolla@users.noreply.github.com>

* Update per Addam comment 4

Co-authored-by: Addam Schroll <108814318+schrolla@users.noreply.github.com>

* Update per Addam's comment 5

Co-authored-by: Addam Schroll <108814318+schrolla@users.noreply.github.com>

* Updated per Addam's comment 6

Co-authored-by: Addam Schroll <108814318+schrolla@users.noreply.github.com>

* first round of edits per review comments

* Made Addam's suggested revisions

* test cap template style 1

* test cap style 1

* test cap style 3

* test cap style 4

* test cap style 5

* reformatted CAPs per comments

* cap format edit

* update per Nanda's comments

* Edit requests by Grant and Shanti

---------

Co-authored-by: Addam Schroll <aschroll@mitre.org>
Co-authored-by: Addam Schroll <108814318+schrolla@users.noreply.github.com>
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
baseline-document Issues relating to the text in the baseline documents themselves code-review This issue or task involves reviewing the code for the assigned script
Projects
None yet
Development

Successfully merging this pull request may close these issues.

5 participants