Skip to content

Commit 7ec8e4e

Browse files
Update Code of Conduct and Security Policy (PowerShell#23811)
Updates the readme, code of conduct and security policy per OSPO request.
1 parent bd8b0bd commit 7ec8e4e

File tree

7 files changed

+83
-36
lines changed

7 files changed

+83
-36
lines changed

.github/CONTRIBUTING.md

+8-7
Original file line numberDiff line numberDiff line change
@@ -73,13 +73,13 @@ made.
7373
In most cases, it means "one clause/idea per line".
7474
* Otherwise, these issues should be treated like any other issue in this repository.
7575

76-
#### Spellchecking documentation
76+
#### Spell checking documentation
7777

7878
Documentation is spellchecked. We use the
7979
[textlint](https://github.com/textlint/textlint/wiki/Collection-of-textlint-rule) command-line tool,
8080
which can be run in interactive mode to correct typos.
8181

82-
To run the spellchecker, follow these steps:
82+
To run the spell checker, follow these steps:
8383

8484
* install [Node.js](https://nodejs.org/en/) (v10 or up)
8585
* install [textlint](https://github.com/textlint/textlint/wiki/Collection-of-textlint-rule) by
@@ -169,7 +169,7 @@ Additional references:
169169
A better example is: "Add Ensure parameter to New-Item cmdlet", with "Fix #5" in the PR's body.
170170
* When you create a pull request,
171171
include a summary about your changes in the PR description.
172-
The description is used to create change logs,
172+
The description is used to create changelogs,
173173
so try to have the first sentence explain the benefit to end users.
174174
If the changes are related to an existing GitHub issue,
175175
please reference the issue in the PR description (e.g. ```Fix #11```).
@@ -234,8 +234,8 @@ Additional references:
234234
* After submitting your pull request,
235235
our [CI system (Azure DevOps Pipelines)][ci-system]
236236
will run a suite of tests and automatically update the status of the pull request.
237-
* Our CI contains automated spellchecking and link checking for Markdown files. If there is any false-positive,
238-
[run the spellchecker command-line tool in interactive mode](#spellchecking-documentation)
237+
* Our CI contains automated spell checking and link checking for Markdown files. If there is any false-positive,
238+
[run the spell checker command-line tool in interactive mode](#spell-checking-documentation)
239239
to add words to the `.spelling` file.
240240
* Our packaging test may not pass and ask you to update `files.wxs` file if you add/remove/update nuget package references or add/remove assert files.
241241

@@ -382,8 +382,8 @@ Once you sign a CLA, all your existing and future pull requests will have the st
382382

383383
## Code of Conduct Enforcement
384384

385-
Reports of abuse will be reviewed by the PS-Committee and if it has been determined that violations of the
386-
Code of Conduct has occurred, then a temporary ban may be imposed.
385+
Reports of abuse will be reviewed by the [PowerShell Committee][ps-committee] and if it has been determined that violations of the
386+
[Code of Conduct](../CODE_OF_CONDUCT.md) has occurred, then a temporary ban may be imposed.
387387
The duration of the temporary ban will depend on the impact and/or severity of the infraction.
388388
This can vary from 1 day, a few days, a week, and up to 30 days.
389389
Repeat offenses may result in a permanent ban from the PowerShell org.
@@ -409,3 +409,4 @@ Repeat offenses may result in a permanent ban from the PowerShell org.
409409
[coding-guidelines]: ../docs/dev-process/coding-guidelines.md
410410
[breaking-changes-contract]: ../docs/dev-process/breaking-change-contract.md
411411
[rfc-process]: https://github.com/PowerShell/PowerShell-RFC
412+
[ps-committee]: ../docs/community/governance.md#powershell-committee

.github/SECURITY.md

+38-9
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,41 @@
1-
# Security Vulnerabilities
1+
<!-- BEGIN MICROSOFT SECURITY.MD V0.0.9 BLOCK -->
22

3-
Security issues are treated very seriously and will, by default,
4-
takes precedence over other considerations including usability, performance,
5-
etc... Best effort will be used to mitigate side effects of a security
6-
change, but PowerShell must be secure by default.
3+
## Security
74

8-
## Reporting a security vulnerability
5+
Microsoft takes the security of our software products and services seriously, which includes all source code repositories managed through our GitHub organizations, which include [Microsoft](https://github.com/Microsoft), [Azure](https://github.com/Azure), [DotNet](https://github.com/dotnet), [AspNet](https://github.com/aspnet), [Xamarin](https://github.com/xamarin) and [PowerShell](https://github.com/PowerShell).
96

10-
If you believe that there is a security vulnerability in PowerShell,
11-
it **must** be reported using [https://aka.ms/secure-at](https://aka.ms/secure-at) to allow for [Coordinated Vulnerability Disclosure](https://technet.microsoft.com/security/dn467923).
12-
**Only** file an issue, if [MSRC](https://www.microsoft.com/en-us/msrc/faqs-report-an-issue?rtc=1) has confirmed filing an issue is appropriate.
7+
If you believe you have found a security vulnerability in any Microsoft-owned repository that meets [Microsoft's definition of a security vulnerability](https://aka.ms/security.md/definition), please report it to us as described below.
8+
9+
## Reporting Security Issues
10+
11+
**Please do not report security vulnerabilities through public GitHub issues.**
12+
13+
Instead, please report them to the Microsoft Security Response Center (MSRC) at [https://msrc.microsoft.com/create-report](https://aka.ms/security.md/msrc/create-report).
14+
15+
If you prefer to submit without logging in, send email to [[email protected]](mailto:[email protected]). If possible, encrypt your message with our PGP key; please download it from the [Microsoft Security Response Center PGP Key page](https://aka.ms/security.md/msrc/pgp).
16+
17+
You should receive a response within 24 hours. If for some reason you do not, please follow up via email to ensure we received your original message. Additional information can be found at [microsoft.com/msrc](https://www.microsoft.com/msrc).
18+
19+
Please include the requested information listed below (as much as you can provide) to help us better understand the nature and scope of the possible issue:
20+
21+
* Type of issue (e.g. buffer overflow, SQL injection, cross-site scripting, etc.)
22+
* Full paths of source file(s) related to the manifestation of the issue
23+
* The location of the affected source code (tag/branch/commit or direct URL)
24+
* Any special configuration required to reproduce the issue
25+
* Step-by-step instructions to reproduce the issue
26+
* Proof-of-concept or exploit code (if possible)
27+
* Impact of the issue, including how an attacker might exploit the issue
28+
29+
This information will help us triage your report more quickly.
30+
31+
If you are reporting for a bug bounty, more complete reports can contribute to a higher bounty award. Please visit our [Microsoft Bug Bounty Program](https://aka.ms/security.md/msrc/bounty) page for more details about our active programs.
32+
33+
## Preferred Languages
34+
35+
We prefer all communications to be in English.
36+
37+
## Policy
38+
39+
Microsoft follows the principle of [Coordinated Vulnerability Disclosure](https://aka.ms/security.md/cvd).
40+
41+
<!-- END MICROSOFT SECURITY.MD BLOCK -->

.markdownlintignore

+1
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
.github/SECURITY.md

CODE_OF_CONDUCT.md

+8-6
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,10 @@
1-
# Code of Conduct
1+
# Microsoft Open Source Code of Conduct
22

3-
This project has adopted the [Microsoft Open Source Code of Conduct][conduct-code].
4-
For more information see the [Code of Conduct FAQ][conduct-FAQ] or contact [[email protected]][conduct-email] with any additional questions or comments.
3+
This project has adopted the [Microsoft Open Source Code of Conduct](https://opensource.microsoft.com/codeofconduct/).
54

6-
[conduct-code]: https://opensource.microsoft.com/codeofconduct/
7-
[conduct-FAQ]: https://opensource.microsoft.com/codeofconduct/faq/
8-
[conduct-email]: mailto:[email protected]
5+
Resources:
6+
7+
- [Microsoft Open Source Code of Conduct](https://opensource.microsoft.com/codeofconduct/)
8+
- [Microsoft Code of Conduct FAQ](https://opensource.microsoft.com/codeofconduct/faq/)
9+
- Contact [[email protected]](mailto:[email protected]) with questions or concerns
10+
- Employees can reach out at [aka.ms/opensource/moderation-support](https://aka.ms/opensource/moderation-support)

README.md

+5-7
Original file line numberDiff line numberDiff line change
@@ -139,12 +139,10 @@ The governance policy for the PowerShell project is described the [PowerShell Go
139139

140140
[gov]: https://github.com/PowerShell/PowerShell/blob/master/docs/community/governance.md
141141

142-
## [Code of Conduct][conduct-md]
142+
## [Code of Conduct](CODE_OF_CONDUCT.md)
143143

144-
This project has adopted the [Microsoft Open Source Code of Conduct][conduct-code].
145-
For more information, see the [Code of Conduct FAQ][conduct-FAQ] or contact [[email protected]][conduct-email] with any additional questions or comments.
144+
Please see our [Code of Conduct](CODE_OF_CONDUCT.md) before participating in this project.
146145

147-
[conduct-code]: https://opensource.microsoft.com/codeofconduct/
148-
[conduct-FAQ]: https://opensource.microsoft.com/codeofconduct/faq/
149-
[conduct-email]: mailto:[email protected]
150-
[conduct-md]: https://github.com/PowerShell/PowerShell/tree/master/CODE_OF_CONDUCT.md
146+
## [Security Policy](.github/SECURITY.md)
147+
148+
For any security issues, please see our [Security Policy](.github/SECURITY.md).

docs/community/governance.md

+19-4
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66
approving [RFCs][RFC-repo], and approving new maintainers/committee members
77
* [**Repository maintainer**](#repository-maintainers): An individual responsible for merging pull requests (PRs) into `master` when all requirements are met (code review, tests, docs, and RFC approval as applicable).
88
Repository Maintainers are the only people with write permissions for the `master` branch.
9-
* [**Working Groups (WGs)**](#working-groups-(wgs)) are collections of contributors responsible for
9+
* [**Working Groups (WGs)**](#working-groups) are collections of contributors responsible for
1010
providing expertise on a specific area of PowerShell in order to help establish consensus within
1111
the community and Committee.
1212
* **Corporation**: The Corporation owns the PowerShell repository and, under extreme circumstances,
@@ -58,15 +58,16 @@ If any Committee Members feels like this behavior is large enough to warrant an
5858

5959
As a PowerShell Committee Member:
6060

61+
1. **DO** enforce the [Code of Conduct][coc] by taking reports of abuse and violations to the committee for resolution
6162
1. **DO** reply to issues and pull requests with design opinions
6263
(this could include offering support for good work or exciting new features)
6364
1. **DO** encourage healthy discussion about the direction of PowerShell
6465
1. **DO** raise "red flags" on PRs that haven't followed the proper RFC process when applicable
6566
1. **DO** contribute to documentation and best practices
66-
1. **DO** maintain a presence in the PowerShell community outside of GitHub (Twitter, blogs, StackOverflow, Reddit, Hacker News, etc.)
67+
1. **DO** maintain a presence in the PowerShell community outside of GitHub (Twitter, blogs, Stack Overflow, Reddit, Hacker News, etc.)
6768
1. **DO** heavily incorporate community feedback into the weight of your decisions
6869
1. **DO** be polite and respectful to a wide variety of opinions and perspectives
69-
1. **DO** make sure contributors are following the [contributor guidelines](../../.github/CONTRIBUTING.md)
70+
1. **DO** make sure contributors are following the [contributing guidelines](../../.github/CONTRIBUTING.md)
7071

7172
1. **DON'T** constantly raise "red flags" for unimportant or minor problems to the point that the progress of the project is being slowed
7273
1. **DON'T** offer up your opinions as the absolute opinion of the PowerShell Committee.
@@ -82,14 +83,27 @@ At any point in time, a Committee Member can nominate a strong community member
8283
Nominations should be submitted in the form of [RFCs][RFC-repo] detailing why that individual is qualified and how they will contribute.
8384
After the RFC has been discussed, a unanimous vote will be required for the new Committee Member to be confirmed.
8485

86+
### PowerShell Committee Code of Conduct Enforcement
87+
88+
As stated in the [contributing guidelines](../../.github/CONTRIBUTING.md#code-of-conduct-enforcement):
89+
90+
Reports of abuse will be reviewed by the PowerShell Committee and if it has been determined that violations of the
91+
[Code of Conduct][coc] has occurred, then a temporary ban may be imposed.
92+
The duration of the temporary ban will depend on the impact and/or severity of the infraction.
93+
This can vary from 1 day, a few days, a week, and up to 30 days.
94+
Repeat offenses may result in a permanent ban from the PowerShell org.
95+
96+
Microsoft employees on the PowerShell committee should review the available support at
97+
[aka.ms/opensource/moderation-support](https://aka.ms/opensource/moderation-support).
98+
8599
## Repository Maintainers
86100

87101
Repository Maintainers are trusted stewards of the PowerShell community/repository responsible for maintaining consistency and quality of PowerShell code.
88102
One of their primary responsibilities is merging pull requests after all requirements have been fulfilled.
89103

90104
For more information on Repository Maintainers--their responsibilities, who they are, and how one becomes a Maintainer--see the [README for Repository Maintainers][maintainers].
91105

92-
## Working Groups (WGs)
106+
## Working Groups
93107

94108
[Working Groups (WGs)][wg] are collections of contributors with knowledge of specific components or
95109
technologies in the PowerShell domain.
@@ -143,6 +157,7 @@ See our [Pull Request Process][pull-request-process]
143157
[pester]: ../testing-guidelines/WritingPesterTests.md
144158
[breaking-changes]: ../dev-process/breaking-change-contract.md
145159
[issue-process]: ../maintainers/issue-management.md
160+
[coc]: ../../CODE_OF_CONDUCT.md
146161
[pull-request-process]: ../../.github/CONTRIBUTING.md#lifecycle-of-a-pull-request
147162
[docs-contributing]: https://github.com/PowerShell/PowerShell-Docs/blob/staging/CONTRIBUTING.md
148163
[maintainers]: ../maintainers/README.md

docs/maintainers/README.md

+4-3
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,6 @@ They have [write access](https://docs.github.com/en/free-pro-team@latest/github/
1515
- [Repository Maintainer Responsibilities](#repository-maintainer-responsibilities)
1616
- [Issue Management Process](#issue-management-process)
1717
- [Pull Request Workflow](#pull-request-workflow)
18-
- [Abandoned Pull Requests](#abandoned-pull-requests)
1918
- [Becoming a Repository Maintainer](#becoming-a-repository-maintainer)
2019

2120
## Current Repository Maintainers
@@ -33,7 +32,7 @@ They have [write access](https://docs.github.com/en/free-pro-team@latest/github/
3332

3433
<!-- please keep in alphabetical order -->
3534

36-
- Andy Schwartzmeyer ([andschwa](https://github.com/andschwa))
35+
- Andy Jordan ([andyleejordan](https://github.com/andyleejordan))
3736
- Jason Shirk ([lzybkr](https://github.com/lzybkr))
3837
- Mike Richmond ([mirichmo](https://github.com/mirichmo))
3938
- Sergei Vorobev ([vors](https://github.com/vors))
@@ -44,6 +43,7 @@ Repository Maintainers enable rapid contributions while maintaining a high level
4443

4544
If you are a Repository Maintainer, you:
4645

46+
1. **MUST** abide by the [Code of Conduct](../../CODE_OF_CONDUCT.md) and report suspected violations to the [PowerShell Committee][ps-committee]
4747
1. **MUST** ensure that each contributor has signed a valid Microsoft Contributor License Agreement (CLA)
4848
1. **MUST** verify compliance with any third party code license terms (e.g., requiring attribution, etc.) if the contribution contains third party code.
4949
1. **MUST** make sure that [any change requiring approval from the PowerShell Committee](../community/governance.md#changes-that-require-an-rfc) has gone through the proper [RFC][RFC-repo] or approval process
@@ -96,10 +96,11 @@ At any point in time, the existing Repository Maintainers can unanimously nomina
9696
Nominations are brought to the PowerShell Committee to understand the reasons and justification.
9797
A simple majority of the PowerShell Committee is required to veto the nomination.
9898
When a nominee has been approved, a PR will be submitted by a current Maintainer to update this document to add the nominee's name to
99-
the [Current Repository Maintainers](#Current-Repository-Maintainers) with justification as the description of the PR to serve as the public announcement.
99+
the [Current Repository Maintainers](#current-repository-maintainers) with justification as the description of the PR to serve as the public announcement.
100100

101101
[RFC-repo]: https://github.com/PowerShell/PowerShell-RFC
102102
[ci-system]: ../testing-guidelines/testing-guidelines.md#ci-system
103103
[issue-management]: issue-management.md
104104
[CONTRIBUTING]: ../../.github/CONTRIBUTING.md
105105
[best-practice]: best-practice.md
106+
[ps-committee]: ../community/governance.md#powershell-committee

0 commit comments

Comments
 (0)