Skip to content

Commit cc2b05c

Browse files
author
gitName
committed
Further edits
1 parent 59f758a commit cc2b05c

File tree

5 files changed

+16
-20
lines changed

5 files changed

+16
-20
lines changed

learn-pr/github/manage-sensitive-data-security-policies/includes/2-set-security-policies.md

Lines changed: 6 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
In this unit, you'll learn more about the preventive measures you can take to maintain the health of your GitHub repositories.
22

3-
Suppose you're an administrator who is helping to onboard many new collaborators to your organization. You need to make sure they contribute to the proper repositories and have easy access to assistance if they discover a security threat. To do this, you set security policies.
3+
Suppose you're an administrator who's helping to onboard many new collaborators to your organization. You need to make sure they contribute to the proper repositories and have easy access to assistance if they discover a security threat. To do this, you set security policies.
44

55
:::image type="content" source="../media/setting-security-policies.png" alt-text="Three screenshots stacked on each other, slightly offset, which show community health files in a repository and settings for an organization.":::
66

@@ -63,11 +63,11 @@ GitHub uses and displays these default files for any repository owned by the acc
6363

6464
## Security settings
6565

66-
The other component of creating robust security policies is taking advantage of GitHub's built-in security settings and features. Imagine you're onboarding collaborators whose scope of work varies; some are part of focused teams to implement a feature, while others are responsible for watching over the code base for issues, and a few others might need to assist you with administrative duties. In this section, you'll learn about settings that define user permissions and allow automation of common security tasks.
66+
The other component of creating robust security policies is taking advantage of GitHub's built-in security settings and features. Imagine you're onboarding collaborators whose scope of work varies; some are part of focused teams to implement a feature, while others are responsible for watching over the code base for issues, and a few others might need to assist you with administrative duties. In this section, you'll learn about settings that define user permissions and allow you to automate common security tasks.
6767

6868
### Change settings according to a trust and control position
6969

70-
Every organization has a trust and control position: circumstances that determine how much trust you can safely extend to individual collaborators and teams, and how much control you need to maintain over basic permissions.
70+
Every organization has a trust and control position: circumstances that determine how much trust you can safely extend to individual collaborators and teams and how much control you need to maintain over basic permissions.
7171

7272
If your organization is a new business with a small team, it likely has few moving parts and few areas of potential security vulnerability. After all, when team members work in the same office or in nearby time zones, it's easy to identify who can take specific actions and how to contact them. In this case, you can safely trust most or all collaborators with high levels of access and capability.
7373

@@ -87,22 +87,21 @@ As you can see, settings that Enterprise administrators enforce cascade down to
8787
Changing security settings at the organization level or for all organizations covered by the Enterprise plan is powerful, because it can standardize user capabilities during unusual circumstances. In the preceding example, you might need to restrict capabilities to all but a few users for an organization—or even for the whole enterprise—in response to a security threat. In contrast, you could temporarily allow greater capabilities to all users in an organization during a rare development effort where you need help from extra personnel.
8888

8989
> [!NOTE]
90-
> Available settings and tools differ based on the type of repository. In addition,
91-
> these settings and features differ in their level of required user interaction.
90+
> Available settings and tools differ based on the type of repository. In addition, these settings and features differ in their level of required user interaction.
9291
9392
:::image type="content" source="../media/availability-interaction.png" alt-text="Diagram of a four-quadrant graph, divided by x and y axes, which categorizes security settings by availability to users (x axis) and required level of interaction (y axis).":::
9493

9594
### What kinds of security settings are available to administrators?
9695

9796
Access restrictions, security documentation, advisories, Dependabot alerts and security updates, Dependabot version updates, and the GitHub dependency graph are available for all repositories. Documentation and advisories require the most significant manual interaction, but applying Dependabot to your code base automates parts of the security process, up to and including updating dependencies.
9897

99-
Code scanning alerts, secret scanning alerts, and dependency review provide further automation to the security process. Enabling these GitHub features will flag vulnerabilities in code submitted to a repository, highlighting suspicious code. However, these features are only available for private repositories with an Advanced Security license or public repositories.
98+
Code scanning alerts, secret scanning alerts, and dependency review provide further automation to the security process. Enabling these GitHub features flags vulnerabilities in code submitted to a repository, highlighting suspicious code. However, these features are only available for private repositories with an Advanced Security license or public repositories.
10099

101100
If you have a security vulnerability, you can create a security advisory to privately discuss and fix the vulnerability.
102101

103102
## Security advisories
104103

105-
You've been vigilant in your efforts to maintain healthy code, establishing clear policies and enacting settings to help collaborators work within their scope. But despite your team's efforts, someone identified a vulnerability in published code. This happens to every team sooner or later--no one is perfect.
104+
You've been vigilant in your efforts to maintain healthy code, establishing clear policies and enacting settings to help collaborators work within their scope. But despite your team's efforts, someone identified a vulnerability in published code. This happens to every team sooner or later; no one is perfect.
106105

107106
When you identify a security threat, your team's response will go beyond patching offending sections of code. In this section, you'll learn the basics of the GitHub security advisory tools that allow you to draft and publish comprehensive documentation on the nature of the threat.
108107

learn-pr/github/manage-sensitive-data-security-policies/includes/3-scrub-sensitive-data-from-repository.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -36,7 +36,7 @@ To create a ruleset:
3636

3737
:::image type="content" source="../media/new-branch-ruleset.png" alt-text="Create a new branch ruleset page from the left hand navigation bar.":::
3838

39-
When creating a ruleset you can grant bypass permissions, choose which branches or tags to target, and select the rules to include.
39+
When creating a ruleset, you can grant bypass permissions, choose which branches or tags to target, and select the rules to include.
4040

4141
## Manage a ruleset
4242

@@ -66,7 +66,7 @@ A ruleset doesn't have a priority. Instead, if multiple rulesets target the same
6666
For example, consider the following situation for the `my-feature` branch of the `octo-org/octo-repo` repository:
6767

6868
- A repository administrator has set up a ruleset targeting the `my-feature` branch. This ruleset requires signed commits, and three reviews on pull requests before they can be merged.
69-
- An existing branch protection rule for the `my-feature` branch requires a linear commit history, and two reviews on pull requests before they can be merged.
69+
- An existing branch protection rule for the `my-feature` branch requires a linear commit history and two reviews on pull requests before they can be merged.
7070

7171
The rules from each source are aggregated, and all rules apply. Where multiple different versions of the same rule exist, the result is that the most restrictive version of the rule applies. Therefore, the `my-feature` branch requires signed commits and a linear commit history, and pull requests targeting the branch will require three reviews before they can be merged.
7272

learn-pr/github/manage-sensitive-data-security-policies/includes/4-report-log.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -6,13 +6,13 @@ Here you'll learn what your organization's audit log records, and how to access
66

77
## What are log records?
88

9-
Your organization's log records actions taken by organization members. The log is available to organization owners, and records information about actions that affect the organization including:
9+
Your organization's log records actions taken by organization members. The log is available to organization owners, and records information about actions that affect the organization, including:
1010

1111
- The repository in which the action was performed.
1212
- The user that performed the action.
1313
- The action that was performed.
1414
- Which country/region in which the action took place.
15-
- The date and time of the action.
15+
- The action date and time.
1616

1717
You can access the audit log through GitHub.com, GitHub Enterprise Server, or GitHub AE to review actions from the past 90 days. However, interacting with the audit log using either the GraphQL API or the Rest API can allow easy retrieval of specific information types, with other limitations.
1818

learn-pr/github/manage-sensitive-data-security-policies/includes/5-exercise.md

Lines changed: 2 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -9,11 +9,8 @@ Here are some helpful tips before you begin the exercise:
99
- To see the results of your exercise, navigate to the **Actions** tab of your cloned repository and select the most recent run on the **Grading** workflow.
1010
- Stuck on what to do? Revisit the content in the last unit or check out the **Useful resources** section in the exercise's repository README for more resources.
1111

12-
>[!Note]
13-
> A grading script exists under *.github/workflows/grading.yml*.
14-
> You don't need to modify this workflow to complete this exercise.
15-
> **Altering the contents in this workflow can break the exercise's**
16-
> **ability to validate your actions, provide feedback, or grade the results**.
12+
> [!NOTE]
13+
> A grading script exists under *.github/workflows/grading.yml*. You don't need to modify this workflow to complete this exercise. **Altering the contents in this workflow can break the exercise's ability to validate your actions, provide feedback, or grade the results**.
1714
1815
This exercise is a challenge based on content covered in this module. It might take several attempts to complete the exercise, you can revisit previous content in this module, or navigate to some of the other resources provided as many times as you want to find the solution.
1916

learn-pr/github/manage-sensitive-data-security-policies/includes/7-summary.md

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -23,14 +23,14 @@ This module explained how to create a new GitHub repository in a way that limits
2323
- [Creating a security advisory](https://docs.github.com/code-security/security-advisories/working-with-repository-security-advisories/creating-a-repository-security-advisory)
2424
- [GitHub security features](https://docs.github.com/code-security/getting-started/github-security-features)
2525
- [Quickstart for securing your repository](https://docs.github.com/code-security/getting-started/quickstart-for-securing-your-repository)
26-
- [Quickstart for securing your organization](https://docs.github.com/code-security/getting-started/quickstart-for-securing-your-organization)
26+
- [Quickstart for securing your organization](https://docs.github.com/[email protected]/code-security/getting-started/quickstart-for-securing-your-organization)
2727
- [Managing rulesets for a repository](https://docs.github.com/repositories/configuring-branches-and-merges-in-your-repository/managing-rulesets)
28-
- [Ignoring files](https://docs.github.com/get-started/getting-started-with-git/ignoring-files)
28+
- [Ignoring files](https://docs.github.com/get-started/git-basics/ignoring-files)
2929
- [Best practices for preventing data leaks in your organization](https://docs.github.com/code-security/getting-started/best-practices-for-preventing-data-leaks-in-your-organization)
3030
- [Reviewing the audit log for your organization](https://docs.github.com/organizations/keeping-your-organization-secure/managing-security-settings-for-your-organization/reviewing-the-audit-log-for-your-organization)
3131
- [Audit log events for your organization](https://docs.github.com/organizations/keeping-your-organization-secure/managing-security-settings-for-your-organization/audit-log-events-for-your-organization)
3232
- [Reference for working with an audit log using the GraphQL API](https://docs.github.com/graphql)
33-
- [Reference for working with an audit log using a Rest API](https://docs.github.com//rest)
33+
- [Reference for working with an audit log using a Rest API](https://docs.github.com/rest)
3434
- [git-filter-repo Manual Page](https://htmlpreview.github.io/?https://github.com/newren/git-filter-repo/blob/docs/html/git-filter-repo.html)
3535

3636
### Resource Links
@@ -41,4 +41,4 @@ This module explained how to create a new GitHub repository in a way that limits
4141
- [git filter-repo INSTALL.md](https://github.com/newren/git-filter-repo/blob/main/INSTALL.md)
4242
- [Cloning a repository](https://docs.github.com/repositories/creating-and-managing-repositories/cloning-a-repository)
4343
- [About Releases](https://docs.github.com/repositories/releasing-projects-on-github/about-releases)
44-
- [GitHub Community Guidelines](https://docs.github.com/en/github/site-policy/github-community-guidelines#doxxing-and-invasion-of-privacy)
44+
- [GitHub Community Guidelines](https://docs.github.com/site-policy/github-terms/github-community-guidelines)

0 commit comments

Comments
 (0)