Skip to content

Commit 6aaa799

Browse files
authored
Update CONTRIBUTING.md (#14)
* Update CONTRIBUTING.md * Update SECURITY.md * Update README.md
1 parent 5f47f84 commit 6aaa799

File tree

3 files changed

+71
-53
lines changed

3 files changed

+71
-53
lines changed

CONTRIBUTING.md

Lines changed: 30 additions & 23 deletions
Original file line numberDiff line numberDiff line change
@@ -2,39 +2,42 @@
22

33
We welcome your contributions! There are multiple ways to contribute.
44

5-
## Issues
6-
For bugs or enhancement requests, please file a GitHub issue unless it's security related.
7-
When filing a bug remember that the better written the bug is, the more likely it is to be fixed.
8-
If you think you've found a security vulnerability, do not raise a GitHub issue and follow the
9-
instructions on our [Security Policy](./SECURITY.md).
5+
## Opening issues
106

11-
## Contributing Code
7+
For bugs or enhancement requests, please file a GitHub issue unless it's
8+
security related. When filing a bug remember that the better written the bug is,
9+
the more likely it is to be fixed. If you think you've found a security
10+
vulnerability, do not raise a GitHub issue and follow the instructions in our
11+
[security policy](./SECURITY.md).
1212

13-
We welcome your code contributions.
14-
To get started, you will need to sign the [Oracle Contributor
15-
Agreement](https://www.oracle.com/technetwork/community/oca-486395.html) (OCA).
13+
## Contributing code
1614

17-
For pull requests to be accepted, the bottom of your commit message must have the following line
18-
using the name and e-mail address you used for the OCA.
15+
We welcome your code contributions. Before submitting code via a pull request,
16+
you will need to have signed the [Oracle Contributor Agreement][OCA] (OCA) and
17+
your commits need to include the following line using the name and e-mail
18+
address you used to sign the OCA:
1919

20-
```
20+
```text
2121
Signed-off-by: Your Name <you@example.org>
2222
```
2323

24-
This can be automatically added to pull requests by committing with:
24+
This can be automatically added to pull requests by committing with `--sign-off`
25+
or `-s`, e.g.
2526

26-
```
27+
```text
2728
git commit --signoff
2829
```
2930

30-
Only pull requests from committers that can be verified as having signed the OCA can be accepted.
31+
Only pull requests from committers that can be verified as having signed the OCA
32+
can be accepted.
3133

32-
### Pull request process
34+
## Pull request process
3335

34-
1. Fork this repository.
35-
1. Create a branch in your fork to implement the changes. We recommend using the issue number as
36-
part of your branch name, e.g. `1234-fixes`.
37-
1. Ensure that any documentation is updated with the changes.
36+
1. Ensure there is an issue created to track and discuss the fix or enhancement
37+
you intend to submit.
38+
2. Fork this repository.
39+
3. Create a branch in your fork to implement the changes. We recommend using the issue number as
40+
part of your branch name, e.g. `1234-fixes`.Ensure that any documentation is updated with the changes.
3841
1. Add a test for the new behaviour (or that exercises the bug if a bug fix).
3942
1. Submit the pull request. *Do not leave the pull request text blank*.
4043
Explain exactly what your changes are meant to do and provide simple steps on how to validate your
@@ -43,6 +46,10 @@ Ensure that you reference the issue you created as well.
4346
The PR name will be the name of the squashed commit to main.
4447
1. We will assign the pull request to be reviewed before it is merged.
4548

46-
## Code of Conduct
47-
Follow the [Golden Rule](https://en.wikipedia.org/wiki/Golden_Rule).
48-
More specific guidelines are in the [Contributor Covenant Code of Conduct](./CODE_OF_CONDUCT.md)
49+
## Code of conduct
50+
51+
Follow the [Golden Rule](https://en.wikipedia.org/wiki/Golden_Rule). If you'd
52+
like more specific guidelines, see the [Contributor Covenant Code of Conduct][COC].
53+
54+
[OCA]: https://oca.opensource.oracle.com
55+
[COC]: https://www.contributor-covenant.org/version/1/4/code-of-conduct/

README.md

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -250,6 +250,9 @@ accompanying research paper that has been shared on arXiv:
250250
* "[MACEst: The reliable and trustworthy Model Agnostic Confidence
251251
Estimator](https://arxiv.org/abs/2109.01531). Rhys Green, Matthew Rowe, and Alberto Polleri. 2021."
252252

253+
## Security
254+
255+
Please consult the [security guide](./SECURITY.md) for our responsible security vulnerability disclosure process
253256

254257
## License
255258
Copyright (c) 2021, Oracle and/or its affiliates. All rights reserved.

SECURITY.md

Lines changed: 38 additions & 30 deletions
Original file line numberDiff line numberDiff line change
@@ -1,30 +1,38 @@
1-
# Reporting Security Vulnerabilities
2-
Oracle values the independent security research community and believes that responsible disclosure
3-
of security vulnerabilities helps us ensure the security and privacy of all our users.
4-
5-
Please do NOT raise a GitHub Issue to report a security vulnerability.
6-
If you believe you have found a security vulnerability, please submit a report to
7-
[secalert\_us@oracle.com](mailto:secalert_us@oracle.com) preferably with a proof of concept.
8-
We provide additional information on [how to report security vulnerabilities to
9-
Oracle](https://www.oracle.com/corporate/security-practices/assurance/vulnerability/reporting.html)
10-
which includes public encryption keys for secure email.
11-
12-
We ask that you do not use other channels or contact project contributors directly.
13-
14-
Non-vulnerability related security issues such as new great new ideas for security features are
15-
welcome on GitHub Issues.
16-
17-
### Security Updates, Alerts and Bulletins
18-
Security updates will be released on a regular cadence. Many of our projects will typically release
19-
security fixes in conjunction with the [Oracle Critical Patch
20-
Update](https://www.oracle.com/security-alerts/) program.
21-
Security updates are released on the Tuesday closest to the 17th day of January, April, July and
22-
October.
23-
A pre-release announcement will be published on the Thursday preceding each release.
24-
Additional information, including past advisories, is available on our [Security
25-
Alerts](https://www.oracle.com/security-alerts/) page.
26-
27-
### Security-Related Information
28-
We will provide security related information such as a threat model, considerations for secure use,
29-
or any known security issues in our documentation. Please note that labs and sample code are
30-
intended to demonstrate a concept and may not be sufficiently hardened for production use.
1+
# Reporting security vulnerabilities
2+
3+
Oracle values the independent security research community and believes that
4+
responsible disclosure of security vulnerabilities helps us ensure the security
5+
and privacy of all our users.
6+
7+
Please do NOT raise a GitHub Issue to report a security vulnerability. If you
8+
believe you have found a security vulnerability, please submit a report to
9+
[secalert_us@oracle.com][1] preferably with a proof of concept. Please review
10+
some additional information on [how to report security vulnerabilities to Oracle][2].
11+
We encourage people who contact Oracle Security to use email encryption using
12+
[our encryption key][3].
13+
14+
We ask that you do not use other channels or contact the project maintainers
15+
directly.
16+
17+
Non-vulnerability related security issues including ideas for new or improved
18+
security features are welcome on GitHub Issues.
19+
20+
## Security updates, alerts and bulletins
21+
22+
Security updates will be released on a regular cadence. Many of our projects
23+
will typically release security fixes in conjunction with the
24+
[Oracle Critical Patch Update][3] program. Additional
25+
information, including past advisories, is available on our [security alerts][4]
26+
page.
27+
28+
## Security-related information
29+
30+
We will provide security related information such as a threat model, considerations
31+
for secure use, or any known security issues in our documentation. Please note
32+
that labs and sample code are intended to demonstrate a concept and may not be
33+
sufficiently hardened for production use.
34+
35+
[1]: mailto:secalert_us@oracle.com
36+
[2]: https://www.oracle.com/corporate/security-practices/assurance/vulnerability/reporting.html
37+
[3]: https://www.oracle.com/security-alerts/encryptionkey.html
38+
[4]: https://www.oracle.com/security-alerts/

0 commit comments

Comments
 (0)