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

Adding Gmail 10.2 MAY Policy as a note to 10.1 #580

Merged
merged 3 commits into from
Jan 31, 2025
Merged

Adding Gmail 10.2 MAY Policy as a note to 10.1 #580

merged 3 commits into from
Jan 31, 2025

Conversation

bnewlin-MITRE
Copy link
Collaborator

@bnewlin-MITRE bnewlin-MITRE commented Jan 28, 2025 •
edited by mdueltgen
Loading

🗣 Description

Moving Gmail 10.2 MAY to Gmail 10.1 as a note

💭 Motivation and context

Closes #579

🧪 Testing

✅ 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.

@bnewlin-MITRE bnewlin-MITRE added this to the Eel milestone Jan 28, 2025
@bnewlin-MITRE bnewlin-MITRE self-assigned this Jan 28, 2025
@mdueltgen mdueltgen added Gmail and removed High labels Jan 28, 2025
@bnewlin-MITRE bnewlin-MITRE changed the title 579 convert gmail 102 to a should 579 Convert Gmail 10.2 MAY to SHOULD Jan 28, 2025
buidav
buidav requested changes Jan 28, 2025
View reviewed changes
Copy link
Collaborator

@buidav buidav left a comment

Choose a reason for hiding this comment

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

Just to reiterate old conversations.
I thought the decision was to remove 10.2 and add it as a note to 10.1?

"In one of the sessions, a topic came up that one remaining Policy is MAY statement (GMAIL 10.2)...."Google Workspace Sync MAY be enabled on a per-user basis as needed" ......Should we consider relooking at the language for this one, thus making them all SHOULDs / SHALL" - Pat

Thanks for bringing that up again, definitely. The approach we've taken in the past that I think would work well in this case too is to remove 10.2 entirely and add it as a note to 10.1. GWS.GMAIL.9.1 is a great example of that actually. - Alden
image(2)

I agree, removing it and converting it to a note in 10.1 - Max

@mdueltgen mdueltgen self-assigned this Jan 30, 2025
@mdueltgen mdueltgen changed the title 579 Convert Gmail 10.2 MAY to SHOULD Adding Gmail 10.2 MAY Policy as a note to 10.1 Jan 30, 2025
@mdueltgen mdueltgen requested a review from buidav January 30, 2025 20:45
@adhilto adhilto mentioned this pull request Jan 31, 2025
Open
2 tasks
@adhilto
Copy link
Collaborator

adhilto commented Jan 31, 2025

Created #585 to track corresponding code change.

@adhilto adhilto merged commit 772e181 into eel Jan 31, 2025
9 of 11 checks passed
@adhilto adhilto deleted the 579-convert-gmail-102-to-a-should branch January 31, 2025 19:44
@adhilto adhilto mentioned this pull request Jan 31, 2025
Closed
buidav pushed a commit that referenced this pull request Feb 10, 2025
@bnewlin-MITRE @mdueltgen @buidav
Adding Gmail 10.2 MAY Policy as a note to 10.1 (#580)
18e93de 
* Update GWS Drift Monitoring Rules - Gmail.csv

* Update gmail.md

* added 10.2 as a note for 10.1

---------

Co-authored-by: mdueltgen <[email protected]>
buidav pushed a commit that referenced this pull request Feb 10, 2025
@bnewlin-MITRE @mdueltgen @buidav
Adding Gmail 10.2 MAY Policy as a note to 10.1 (#580)
4c214e8 
* Update GWS Drift Monitoring Rules - Gmail.csv

* Update gmail.md

* added 10.2 as a note for 10.1

---------

Co-authored-by: mdueltgen <[email protected]>
buidav added a commit that referenced this pull request Feb 12, 2025
@mdueltgen @jkaufman-mitre
@adhilto @bnewlin-MITRE @buidav
Redefining privileged account to be based on privileges in Common Con…
9b036fe 
…trols 6.x (#588)

* Change Common Controls 7.1 to SHOULD and update Common Controls Policy Group 17 resource link (#558)

* Changed 7.1 to SHOULD and Fixed CC 17 Resource Link

* Updated Drift Rules

* Updated Date

* Change CommonControls 7.1 to SHOULD in rego

---------

Co-authored-by: Alden Hilton <[email protected]>

* Adding Gmail 10.2 MAY Policy as a note to 10.1 (#580)

* Update GWS Drift Monitoring Rules - Gmail.csv

* Update gmail.md

* added 10.2 as a note for 10.1

---------

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

* Updating Common Controls 1.2 to be at most 1 Week (#584)

* Changing language to at most 1 week

* at least 1 day, at most 1 week update

* fixes to implementation steps

* Update scubagoggles/baselines/commoncontrols.md

Co-authored-by: David Bui <[email protected]>

---------

Co-authored-by: jkaufman-mitre <[email protected]>
Co-authored-by: David Bui <[email protected]>

* first stab at adding in highly privledged account being definded by permission level.

* grammar

* fix

* draft for admin privledge accounts rewrite

* add back in initial commits from review

* solve the other merge conflicts

* Apply suggestions from code review/update admin wording to fit guidelines

Co-authored-by: David Bui <[email protected]>

---------

Co-authored-by: jkaufman-mitre <[email protected]>
Co-authored-by: Alden Hilton <[email protected]>
Co-authored-by: bnewlin-MITRE <[email protected]>
Co-authored-by: David Bui <[email protected]>
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@buidav buidav buidav approved these changes

@adhilto adhilto adhilto approved these changes

Assignees

@mdueltgen mdueltgen

@bnewlin-MITRE bnewlin-MITRE

Labels
Baseline Revision eel Gmail
Projects
None yet
Milestone
Eel
Development

Successfully merging this pull request may close these issues.
4 participants
@bnewlin-MITRE @adhilto @buidav @mdueltgen