diff options
author | Rigel Kent <sendmemail@rigelk.eu> | 2018-10-09 10:42:14 +0200 |
---|---|---|
committer | Rigel Kent <sendmemail@rigelk.eu> | 2018-10-09 10:42:14 +0200 |
commit | aa8c7956741ff5ee25282df91d269210b729f4bb (patch) | |
tree | 09e540c8c7b926430db9eb00b6c910549312289d | |
parent | e1d7b98bc762bf3a5e6590f827f67187713fb27e (diff) | |
download | PeerTube-aa8c7956741ff5ee25282df91d269210b729f4bb.tar.gz PeerTube-aa8c7956741ff5ee25282df91d269210b729f4bb.tar.zst PeerTube-aa8c7956741ff5ee25282df91d269210b729f4bb.zip |
update SECURITY.md
-rw-r--r-- | SECURITY.md | 15 |
1 files changed, 9 insertions, 6 deletions
diff --git a/SECURITY.md b/SECURITY.md index 5c668a2a3..b80f8ad00 100644 --- a/SECURITY.md +++ b/SECURITY.md | |||
@@ -1,8 +1,6 @@ | |||
1 | **Introduction** | ||
2 | |||
3 | Security is core to our values, and we value the input of hackers acting in good faith to help us maintain a high standard for the security and privacy for our users. This includes encouraging responsible vulnerability research and disclosure. This policy sets out our definition of good faith in the context of finding and reporting vulnerabilities, as well as what you can expect from us in return. | 1 | Security is core to our values, and we value the input of hackers acting in good faith to help us maintain a high standard for the security and privacy for our users. This includes encouraging responsible vulnerability research and disclosure. This policy sets out our definition of good faith in the context of finding and reporting vulnerabilities, as well as what you can expect from us in return. |
4 | 2 | ||
5 | **Expectations** | 3 | ## Expectations |
6 | 4 | ||
7 | When working with us according to this policy, you can expect us to: | 5 | When working with us according to this policy, you can expect us to: |
8 | - Extend Safe Harbor (see below) for your vulnerability research that is related to this policy; | 6 | - Extend Safe Harbor (see below) for your vulnerability research that is related to this policy; |
@@ -10,7 +8,7 @@ When working with us according to this policy, you can expect us to: | |||
10 | - Work to remediate discovered vulnerabilities in a timely manner; and | 8 | - Work to remediate discovered vulnerabilities in a timely manner; and |
11 | - Recognize your contribution to improving our security if you are the first to report a unique vulnerability, and your report triggers a code or configuration change. | 9 | - Recognize your contribution to improving our security if you are the first to report a unique vulnerability, and your report triggers a code or configuration change. |
12 | 10 | ||
13 | **Safe Harbor** | 11 | ## Safe Harbor |
14 | 12 | ||
15 | When conducting vulnerability research according to this policy, we consider this research to be: | 13 | When conducting vulnerability research according to this policy, we consider this research to be: |
16 | - Authorized in accordance with the law, and we will not initiate or support legal action against you for accidental, good faith violations of this policy; | 14 | - Authorized in accordance with the law, and we will not initiate or support legal action against you for accidental, good faith violations of this policy; |
@@ -22,7 +20,7 @@ You are expected, as always, to comply with all applicable laws. | |||
22 | 20 | ||
23 | If at any time you have concerns or are uncertain whether your security research is consistent with this policy, please submit a report through one of our Official Channels before going any further. | 21 | If at any time you have concerns or are uncertain whether your security research is consistent with this policy, please submit a report through one of our Official Channels before going any further. |
24 | 22 | ||
25 | **Ground Rules** | 23 | ## Ground Rules |
26 | 24 | ||
27 | To encourage vulnerability research and to avoid any confusion between good-faith hacking and malicious attack, we ask that you: | 25 | To encourage vulnerability research and to avoid any confusion between good-faith hacking and malicious attack, we ask that you: |
28 | - Play by the rules. This includes following this policy, as well as any other relevant agreements. If there is any inconsistency between this policy and any other relevant terms, the terms of this policy will prevail. | 26 | - Play by the rules. This includes following this policy, as well as any other relevant agreements. If there is any inconsistency between this policy and any other relevant terms, the terms of this policy will prevail. |
@@ -35,10 +33,15 @@ To encourage vulnerability research and to avoid any confusion between good-fait | |||
35 | - You should only interact with test accounts you own or with explicit permission from the account holder. | 33 | - You should only interact with test accounts you own or with explicit permission from the account holder. |
36 | - Do not engage in extortion. | 34 | - Do not engage in extortion. |
37 | 35 | ||
38 | **Official Channels** | 36 | ## Disclosure Terms |
37 | |||
38 | The vulnerability is kept private until a majority of instances known on instances.joinpeertube.org have updated to a safe version of PeerTube or applied a hotfix. The PeerTube development team coordinates efforts to update once the patch is issued. | ||
39 | |||
40 | ## Official Channels | ||
39 | 41 | ||
40 | To help us receive vulnerability submissions we use the following official reporting channels: | 42 | To help us receive vulnerability submissions we use the following official reporting channels: |
41 | - chocobozzz@cpy.re (GPG: [583A612D890159BE](https://keybase.io/chocobozzz/pgp_keys.asc?fingerprint=c44aad638367912ca93edd57583a612d890159be)) | 43 | - chocobozzz@cpy.re (GPG: [583A612D890159BE](https://keybase.io/chocobozzz/pgp_keys.asc?fingerprint=c44aad638367912ca93edd57583a612d890159be)) |
44 | - sendmemail@rigelk.eu (GPG: [EA12971B0E438F36](https://api.github.com/users/rigelk/gpg_keys)) | ||
42 | 45 | ||
43 | If you think you have found a vulnerability, please include the following details with your report and be as descriptive as possible: | 46 | If you think you have found a vulnerability, please include the following details with your report and be as descriptive as possible: |
44 | - The location and nature of the vulnerability, | 47 | - The location and nature of the vulnerability, |