From 1f39cfb464737d9e198dc7af36704481928cce27 Mon Sep 17 00:00:00 2001 From: David Redmin Date: Fri, 30 Jun 2023 14:15:05 -0400 Subject: [PATCH 1/3] Replace Trio email addresses and references --- dev_envs/mac-env-setup.md | 2 +- open-source-policy/policy.md | 3 +-- open-source-policy/practice.md | 4 ++-- 3 files changed, 4 insertions(+), 5 deletions(-) diff --git a/dev_envs/mac-env-setup.md b/dev_envs/mac-env-setup.md index 51102c6..0ca6490 100644 --- a/dev_envs/mac-env-setup.md +++ b/dev_envs/mac-env-setup.md @@ -173,7 +173,7 @@ gpg --gen-key ``` Follow the prompts for name and email address, using either your CISA -or Trio email address. The output should look like: +or GWE email address. The output should look like: ```console We need to generate a lot of random bytes. It is a good idea to perform diff --git a/open-source-policy/policy.md b/open-source-policy/policy.md index c78c71d..22bb88c 100644 --- a/open-source-policy/policy.md +++ b/open-source-policy/policy.md @@ -166,5 +166,4 @@ This policy is a living document. CISA expects to make changes to this policy in the future, and we welcome [issues](https://github.com/cisagov/development-guide/issues) and [pull requests](https://github.com/cisagov/development-guide/pulls). To contact us -privately, email -[cisagov-github-group@trio.dhs.gov](mailto:cisagov-github-group@trio.dhs.gov). +privately, email [github@cisa.dhs.gov](mailto:github@cisa.dhs.gov). diff --git a/open-source-policy/practice.md b/open-source-policy/practice.md index 556bffe..42bf606 100644 --- a/open-source-policy/practice.md +++ b/open-source-policy/practice.md @@ -68,7 +68,7 @@ official capacity. 1. See if there is an organizational CLA available 1. Send the agreement to DHS's Office of General Counsel (OGC) for review - Email - [cisagov-github-group@trio.dhs.gov](mailto:cisagov-github-group@trio.dhs.gov) + [github@cisa.dhs.gov](mailto:github@cisa.dhs.gov) to determine the best contact 1. Collect names/emails/GitHub usernames (whatever is needed) for folks you think will be contributing @@ -129,7 +129,7 @@ All CISA team members are expected to make new source code repositories public from the time of creation. This means we often publish drafts in our repos that may change substantially. If you're interested in learning more about the contents of a repo, email -[cisagov-github-group@trio.dhs.gov](mailto:cisagov-github-group@trio.dhs.gov) +[github@cisa.dhs.gov](mailto:github@cisa.dhs.gov) and we'll direct you to the right person or team. ## Protecting sensitive information ## From 42e448b8d58e801ee194622e3d48f33d707155e3 Mon Sep 17 00:00:00 2001 From: David Redmin Date: Fri, 30 Jun 2023 14:15:36 -0400 Subject: [PATCH 2/3] Add GWE domain and alphabetize regex --- config/gitleaks.toml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/config/gitleaks.toml b/config/gitleaks.toml index ca1d275..f5ce574 100644 --- a/config/gitleaks.toml +++ b/config/gitleaks.toml @@ -30,7 +30,7 @@ title = "gitleaks config" tags = ["email"] [rules.allowlist] regexes = ['''(?i)@(github.com|test.org)''', - '''(?i)@(trio.dhs.gov|cisa.dhs.gov|beta.dhs.gov|hq.dhs.gov)''', + '''(?i)@(beta.dhs.gov|cisa.dhs.gov|gwe.cisa.dhs.gov|hq.dhs.gov|trio.dhs.gov)''', '''(?i)(Author|Copyright|Contact|MAINTAINER)'''] pathes = ['''Godeps._workspace'''] From ec8f1935193b38166308009423f3374159d2d43a Mon Sep 17 00:00:00 2001 From: David Redmin Date: Fri, 30 Jun 2023 14:17:51 -0400 Subject: [PATCH 3/3] Simplify regex --- config/gitleaks.toml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/config/gitleaks.toml b/config/gitleaks.toml index f5ce574..3cfbadb 100644 --- a/config/gitleaks.toml +++ b/config/gitleaks.toml @@ -30,7 +30,7 @@ title = "gitleaks config" tags = ["email"] [rules.allowlist] regexes = ['''(?i)@(github.com|test.org)''', - '''(?i)@(beta.dhs.gov|cisa.dhs.gov|gwe.cisa.dhs.gov|hq.dhs.gov|trio.dhs.gov)''', + '''(?i)@(beta|cisa|gwe.cisa|hq|trio).dhs.gov''', '''(?i)(Author|Copyright|Contact|MAINTAINER)'''] pathes = ['''Godeps._workspace''']