Skip to content

Commit

Permalink
docs: Update docs and e-mail templates to use envoy-security-announce (
Browse files Browse the repository at this point in the history
…#9511)

* docs: Update docs and e-mail templates to use [email protected] mailing list

Signed-off-by: Yan Avlasov <[email protected]>
  • Loading branch information
yanavlasov authored and asraa committed Jan 2, 2020
1 parent 149a130 commit 73fc168
Show file tree
Hide file tree
Showing 4 changed files with 14 additions and 10 deletions.
2 changes: 2 additions & 0 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -41,6 +41,8 @@ to find out more about the origin story and design philosophy of Envoy

* [envoy-announce](https://groups.google.com/forum/#!forum/envoy-announce): Low frequency mailing
list where we will email announcements only.
* [envoy-security-announce](https://groups.google.com/forum/#!forum/envoy-security-announce): Low frequency mailing
list where we will email security related announcements only.
* [envoy-users](https://groups.google.com/forum/#!forum/envoy-users): General user discussion.
* [envoy-dev](https://groups.google.com/forum/#!forum/envoy-dev): Envoy developer discussion (APIs,
feature design, etc.).
Expand Down
8 changes: 5 additions & 3 deletions SECURITY.md
Original file line number Diff line number Diff line change
Expand Up @@ -74,8 +74,9 @@ If a vulnerability does not affect any point release but only master, additional

* If the issue is detected and a fix is available within 5 days of the introduction of the
vulnerability, the fix will be publicly reviewed and landed on master. A courtesy e-mail will be
sent to [email protected], [email protected] and
[email protected] if the severity is medium or greater.
sent to [email protected], [email protected],
[email protected] and [email protected] if
the severity is medium or greater.
* If the vulnerability has been in existence for more than 5 days, we will activate the security
release process for any medium or higher vulnerabilities. Low severity vulnerabilities will still
be merged onto master as soon as a fix is available.
Expand Down Expand Up @@ -131,7 +132,8 @@ or mitigation so that a realistic timeline can be communicated to users.

**Disclosure of Forthcoming Fix to Users** (Completed within 1-7 days of Disclosure)

- The Fix Lead will email [[email protected]](https://groups.google.com/forum/#!forum/envoy-announce)
- The Fix Lead will email [[email protected]](https://groups.google.com/forum/#!forum/envoy-security-announce)
(CC [[email protected]](https://groups.google.com/forum/#!forum/envoy-announce))
informing users that a security vulnerability has been disclosed and that a fix will be made
available at YYYY-MM-DD HH:MM UTC in the future via this list. This time is the Release Date.
- The Fix Lead will include any mitigating steps users can take until a fix is available.
Expand Down
10 changes: 5 additions & 5 deletions security/email-templates.md
Original file line number Diff line number Diff line change
Expand Up @@ -2,12 +2,12 @@

This is a collection of email templates to handle various situations the security team encounters.

## Upcoming security release to [email protected]
## Upcoming security release to envoy-security-[email protected]

```
Subject: Upcoming security release of Envoy $VERSION
To: [email protected]
Cc: [email protected], [email protected]
To: envoy-security-[email protected]
Cc: envoy-[email protected], envoy-[email protected], [email protected]
Hello Envoy Community,
Expand Down Expand Up @@ -105,8 +105,8 @@ $PERSON (on behalf of the Envoy security team and maintainers)

```
Subject: Security release of Envoy $VERSION is now available
To: [email protected]
Cc: [email protected], [email protected]
To: envoy-security-[email protected]
Cc: envoy-[email protected], envoy-[email protected], [email protected]
Hello Envoy Community,
Expand Down
4 changes: 2 additions & 2 deletions security/gh-cve-template.md
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
>This template is for public disclosure of CVE details on Envoy's GitHub. It should be filed
with the public release of a security patch version, and will be linked to in the announcement sent
to [email protected]. The title of this issue should be the CVE identifier and it
should have the `security` label applied.
to envoy-security-[email protected]. The title of this issue should be the CVE identifier
and it should have the `security` label applied.

# CVE-YEAR-ABCDEF

Expand Down

0 comments on commit 73fc168

Please sign in to comment.