Updating DLP Policy to Common Controls #469

mdueltgen · 2024-10-09T18:37:35Z

🗣 Description

Now that DLP exists for Chat, Gmail, and DriveDocs we are looking to move all three to common controls.
Would appreciate feedback on implementation steps about how detailed we should be for creating DLP policies

Removed existing sections for DLP from Chat and DriveDocs and added to Common Controls

💭 Motivation and context

Closes #454

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

✅ Pre-merge Checklist

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.

* Fixed numbering issue in instruction for 5.3 * Update baselines/gmail.md End with a period for automation processing reasons. Co-authored-by: David Bui <105074908+buidav@users.noreply.github.com> --------- Co-authored-by: David Bui <105074908+buidav@users.noreply.github.com>

* Added Policy Group 18 * Added Drift Rule for Policy Group 18 * Fixed Table of Contents * Apply suggestions from code review Co-authored-by: Alden Hilton <106177711+adhilto@users.noreply.github.com> Co-authored-by: David Bui <105074908+buidav@users.noreply.github.com> * Fixed Implementation * Added Policy Under Policy Group 16 * Fixed Policy Group 16 Intro * Changed Security to Secure in header * Fixed TOC * Apply suggestions from code review Co-authored-by: Alden Hilton <106177711+adhilto@users.noreply.github.com> * Apply suggestions from code review Co-authored-by: David Bui <105074908+buidav@users.noreply.github.com> * Fixed drift rule files * Update baselines/commoncontrols.md Co-authored-by: David Bui <105074908+buidav@users.noreply.github.com> --------- Co-authored-by: Alden Hilton <106177711+adhilto@users.noreply.github.com> Co-authored-by: David Bui <105074908+buidav@users.noreply.github.com> Co-authored-by: mdueltgen <148897369+mdueltgen@users.noreply.github.com>

* Updated location of setting in instructions and fixed bolding * Update baselines/drive.md Co-authored-by: David Bui <105074908+buidav@users.noreply.github.com> --------- Co-authored-by: David Bui <105074908+buidav@users.noreply.github.com>

* updated location of setting in implementation instructions * adding in periods * Update baselines/commoncontrols.md Co-authored-by: David Bui <105074908+buidav@users.noreply.github.com> * Update baselines/commoncontrols.md removed extra period Co-authored-by: David Bui <105074908+buidav@users.noreply.github.com> * Remove double period in overview --------- Co-authored-by: David Bui <105074908+buidav@users.noreply.github.com>

* Updated location for takeout admin control based on update to data tab in admin console * Update baselines/commoncontrols.md Fixes capitalization of import/export per admin console Co-authored-by: Alden Hilton <106177711+adhilto@users.noreply.github.com> * removing unnecessary save step --------- Co-authored-by: Alden Hilton <106177711+adhilto@users.noreply.github.com>

…teps. (#418)

* udpated location of setting for data regions in instructions * Update baselines/commoncontrols.md removed S in compliances Co-authored-by: David Bui <105074908+buidav@users.noreply.github.com> --------- Co-authored-by: David Bui <105074908+buidav@users.noreply.github.com>

* Added Policy 15.2 and renamed previous 15.2 to 15.3 * adding drift rule for 15.2 * Added TTP Mappings * Apply suggestions from code review Co-authored-by: Alden Hilton <106177711+adhilto@users.noreply.github.com> * Update drift-rules/GWS Drift Monitoring Rules - Common Controls as of 11-14-23.csv Co-authored-by: Alden Hilton <106177711+adhilto@users.noreply.github.com> * Apply suggestions from code review Co-authored-by: David Bui <105074908+buidav@users.noreply.github.com> --------- Co-authored-by: mdueltgen <148897369+mdueltgen@users.noreply.github.com> Co-authored-by: Alden Hilton <106177711+adhilto@users.noreply.github.com> Co-authored-by: David Bui <105074908+buidav@users.noreply.github.com>

* Updated Resource Link for DriveDocs 3.1 (#400) * Fixes Numbering Issue in GMAIL 5.3 Instructions (#399) * Fixed numbering issue in instruction for 5.3 * Update baselines/gmail.md End with a period for automation processing reasons. Co-authored-by: David Bui <105074908+buidav@users.noreply.github.com> --------- Co-authored-by: David Bui <105074908+buidav@users.noreply.github.com> * Updating Classroom 1.2 Instructions (#407) * New Common Controls policy for Early Access App Access controls (#371) * Added Policy Group 18 * Added Drift Rule for Policy Group 18 * Fixed Table of Contents * Apply suggestions from code review Co-authored-by: Alden Hilton <106177711+adhilto@users.noreply.github.com> Co-authored-by: David Bui <105074908+buidav@users.noreply.github.com> * Fixed Implementation * Added Policy Under Policy Group 16 * Fixed Policy Group 16 Intro * Changed Security to Secure in header * Fixed TOC * Apply suggestions from code review Co-authored-by: Alden Hilton <106177711+adhilto@users.noreply.github.com> * Apply suggestions from code review Co-authored-by: David Bui <105074908+buidav@users.noreply.github.com> * Fixed drift rule files * Update baselines/commoncontrols.md Co-authored-by: David Bui <105074908+buidav@users.noreply.github.com> --------- Co-authored-by: Alden Hilton <106177711+adhilto@users.noreply.github.com> Co-authored-by: David Bui <105074908+buidav@users.noreply.github.com> Co-authored-by: mdueltgen <148897369+mdueltgen@users.noreply.github.com> * Updated Location of Setting in DriveDocs 6.1 Instructions (#404) * Updated location of setting in instructions and fixed bolding * Update baselines/drive.md Co-authored-by: David Bui <105074908+buidav@users.noreply.github.com> --------- Co-authored-by: David Bui <105074908+buidav@users.noreply.github.com> * Updating Common Controls 11.2 Implementation Instructions #375 (#411) * updated location of setting in implementation instructions * adding in periods * Update baselines/commoncontrols.md Co-authored-by: David Bui <105074908+buidav@users.noreply.github.com> * Update baselines/commoncontrols.md removed extra period Co-authored-by: David Bui <105074908+buidav@users.noreply.github.com> * Remove double period in overview --------- Co-authored-by: David Bui <105074908+buidav@users.noreply.github.com> * Updating Common Controls 12.1 Implementation Steps (#414) * Updated location for takeout admin control based on update to data tab in admin console * Update baselines/commoncontrols.md Fixes capitalization of import/export per admin console Co-authored-by: Alden Hilton <106177711+adhilto@users.noreply.github.com> * removing unnecessary save step --------- Co-authored-by: Alden Hilton <106177711+adhilto@users.noreply.github.com> * Update location of rules setting in admin console in implementation steps. (#418) * Updating Common Controls 15.1 Implementation Steps (#420) * udpated location of setting for data regions in instructions * Update baselines/commoncontrols.md removed S in compliances Co-authored-by: David Bui <105074908+buidav@users.noreply.github.com> --------- Co-authored-by: David Bui <105074908+buidav@users.noreply.github.com> * Fixed backslashes/forwardslashes bug in Common Controls Baseline (#426) * Changed Early Access to Early Access Apps (#428) * Add Data at Rest processing policy to Common Controls baseline (#434) * Added Policy 15.2 and renamed previous 15.2 to 15.3 * adding drift rule for 15.2 * Added TTP Mappings * Apply suggestions from code review Co-authored-by: Alden Hilton <106177711+adhilto@users.noreply.github.com> * Update drift-rules/GWS Drift Monitoring Rules - Common Controls as of 11-14-23.csv Co-authored-by: Alden Hilton <106177711+adhilto@users.noreply.github.com> * Apply suggestions from code review Co-authored-by: David Bui <105074908+buidav@users.noreply.github.com> --------- Co-authored-by: mdueltgen <148897369+mdueltgen@users.noreply.github.com> Co-authored-by: Alden Hilton <106177711+adhilto@users.noreply.github.com> Co-authored-by: David Bui <105074908+buidav@users.noreply.github.com> * updating implementation steps for 13.1 to clarify editting rules * fixed numbering and removed old language about having to click show more which doesn't exist anymore in the admin consle. * Apply suggestions from code review Co-authored-by: Alden Hilton <106177711+adhilto@users.noreply.github.com> * Update baselines/commoncontrols.md Co-authored-by: Alden Hilton <106177711+adhilto@users.noreply.github.com> --------- Co-authored-by: David Bui <105074908+buidav@users.noreply.github.com> Co-authored-by: jkaufman-mitre <135844572+jkaufman-mitre@users.noreply.github.com> Co-authored-by: Alden Hilton <106177711+adhilto@users.noreply.github.com>

baselines/commoncontrols.md

mitchelbaker-cisa · 2024-10-10T18:43:21Z

One other thing -- the smoke tests are failing because we've added the new policies to the markdown but not in the rego. Can we create issues to track the rego implementation of common controls 18.1, 18.2, and 18.3 and mark them as follow-up todos after driftwood is merged into main?

adhilto · 2024-10-10T22:03:43Z

@mdueltgen don't forget to update the table of contents entries.

mdueltgen · 2024-10-14T19:56:31Z

One other thing -- the smoke tests are failing because we've added the new policies to the markdown but not in the rego. Can we create issues to track the rego implementation of common controls 18.1, 18.2, and 18.3 and mark them as follow-up todos after driftwood is merged into main?

Issue #473 for tracking code changes.

mdueltgen · 2024-10-14T20:00:36Z

Added in changes for table of contents, policy group description, and clarification of manage rules button. I would like to discuss on Thursday the group's thoughts on implementation steps based on comments above.

mitchelbaker-cisa

Looks great!

adhilto

Most of the comments that I added to the 18.1 implementation steps also apply to 18.2 and 18.3. Rather than repeat myself I thought I'd just add these comments, then you could add the changes for 18.2 and 18.3 too if you agree with them.

baselines/chat.md

baselines/drive.md

baselines/commoncontrols.md

Co-authored-by: Alden Hilton <106177711+adhilto@users.noreply.github.com>

baselines/commoncontrols.md

Co-authored-by: David Bui <105074908+buidav@users.noreply.github.com> Co-authored-by: Alden Hilton <106177711+adhilto@users.noreply.github.com>

adhilto

Looks good!

baselines/commoncontrols.md

Parity w/ m365 and scubagear 3rd party DLP options license info Co-authored-by: David Bui <105074908+buidav@users.noreply.github.com>

baselines/commoncontrols.md

buidav

Align the Group title with the TOC.

baselines/commoncontrols.md

Co-authored-by: David Bui <105074908+buidav@users.noreply.github.com>

mdueltgen and others added 13 commits October 3, 2024 07:05

Updated Resource Link for DriveDocs 3.1 (#400)

02f956a

Update location of rules setting in admin console in implementation s…

ecb789e

…teps. (#418)

Fixed backslashes/forwardslashes bug in Common Controls Baseline (#426)

af5ff55

Changed Early Access to Early Access Apps (#428)

5101fdd

first draft of new DLP changes

75f2657

mdueltgen added Internal Discussion Common Controls Baseline Revision labels Oct 9, 2024

mdueltgen added this to the Driftwood milestone Oct 9, 2024

mdueltgen requested review from buidav, adhilto, jkaufman-mitre, prodjom and mitchelbaker-cisa October 9, 2024 18:37

mdueltgen self-assigned this Oct 9, 2024

jkaufman-mitre approved these changes Oct 10, 2024

View reviewed changes

mitchelbaker-cisa requested changes Oct 10, 2024

View reviewed changes

baselines/commoncontrols.md Outdated Show resolved Hide resolved

baselines/commoncontrols.md Outdated Show resolved Hide resolved

baselines/commoncontrols.md Outdated Show resolved Hide resolved

baselines/commoncontrols.md Outdated Show resolved Hide resolved

TOC update, group description, clarifying implementation steps

b2ff3f5

mitchelbaker-cisa approved these changes Oct 24, 2024

View reviewed changes

adhilto requested changes Oct 24, 2024

View reviewed changes

mdueltgen and others added 5 commits October 25, 2024 11:15

updated TOC for chat/drive

5b5271b

adding in drift rules

a61248b

Apply suggestions from code review

bb895bc

Co-authored-by: Alden Hilton <106177711+adhilto@users.noreply.github.com>

code changes based on comments

55cc005

code changes udpating implementation steps across policy group 18

f4f71f7

mdueltgen requested a review from adhilto October 28, 2024 16:32

buidav requested changes Oct 29, 2024

View reviewed changes

baselines/commoncontrols.md Outdated Show resolved Hide resolved

baselines/commoncontrols.md Outdated Show resolved Hide resolved

baselines/commoncontrols.md Outdated Show resolved Hide resolved

baselines/commoncontrols.md Outdated Show resolved Hide resolved

adhilto requested changes Oct 29, 2024

View reviewed changes

baselines/commoncontrols.md Outdated Show resolved Hide resolved

baselines/commoncontrols.md Outdated Show resolved Hide resolved

mdueltgen and others added 2 commits October 29, 2024 11:09

Apply suggestions from code review

0267c7c

Co-authored-by: David Bui <105074908+buidav@users.noreply.github.com> Co-authored-by: Alden Hilton <106177711+adhilto@users.noreply.github.com>

replacing add instead of actions

2ab1024

mdueltgen requested review from buidav, jkaufman-mitre and adhilto October 29, 2024 15:12

adhilto approved these changes Oct 29, 2024

View reviewed changes

jkaufman-mitre approved these changes Oct 29, 2024

View reviewed changes

buidav requested changes Oct 29, 2024

View reviewed changes

Apply suggestions from code review

4fa81ac

Parity w/ m365 and scubagear 3rd party DLP options license info Co-authored-by: David Bui <105074908+buidav@users.noreply.github.com>

buidav self-requested a review October 29, 2024 19:11

buidav requested changes Oct 29, 2024

View reviewed changes

baselines/commoncontrols.md Outdated Show resolved Hide resolved

updating TOC

a933c0c

mdueltgen requested a review from buidav October 29, 2024 19:31

buidav requested changes Oct 29, 2024

View reviewed changes

baselines/commoncontrols.md Outdated Show resolved Hide resolved

baselines/commoncontrols.md Outdated Show resolved Hide resolved

Apply suggestions from code review

757ce65

Co-authored-by: David Bui <105074908+buidav@users.noreply.github.com>

mdueltgen requested a review from buidav October 29, 2024 19:37

buidav approved these changes Oct 29, 2024

View reviewed changes

buidav merged commit ef2decc into driftwood Oct 29, 2024
3 checks passed

buidav mentioned this pull request Oct 29, 2024

DLP Policy Moving to Common Controls #454

Closed

buidav deleted the 454-dlp-policy-moving-to-common-controls branch October 29, 2024 19:49

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Updating DLP Policy to Common Controls #469

Updating DLP Policy to Common Controls #469

mdueltgen commented Oct 9, 2024 •

edited by buidav

Loading

mitchelbaker-cisa commented Oct 10, 2024

adhilto commented Oct 10, 2024

mdueltgen commented Oct 14, 2024

mdueltgen commented Oct 14, 2024

mitchelbaker-cisa left a comment

adhilto left a comment

adhilto left a comment

buidav left a comment

Updating DLP Policy to Common Controls #469

Updating DLP Policy to Common Controls #469

Conversation

mdueltgen commented Oct 9, 2024 • edited by buidav Loading

🗣 Description

💭 Motivation and context

🧪 Testing

✅ Pre-approval checklist

✅ Pre-merge Checklist

✅ Post-merge Checklist

mitchelbaker-cisa commented Oct 10, 2024

adhilto commented Oct 10, 2024

mdueltgen commented Oct 14, 2024

mdueltgen commented Oct 14, 2024

mitchelbaker-cisa left a comment

Choose a reason for hiding this comment

adhilto left a comment

Choose a reason for hiding this comment

adhilto left a comment

Choose a reason for hiding this comment

buidav left a comment

Choose a reason for hiding this comment

mdueltgen commented Oct 9, 2024 •

edited by buidav

Loading