From e49532b7a23135213148e23ba607a6dccea02c15 Mon Sep 17 00:00:00 2001 From: Rob Bos Date: Thu, 15 Jul 2021 20:10:43 +0200 Subject: [PATCH 1/4] Clarified the organizations that get visibility on 'internal' repositories --- .../managing-organizations-in-your-enterprise/index.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/content/admin/user-management/managing-organizations-in-your-enterprise/index.md b/content/admin/user-management/managing-organizations-in-your-enterprise/index.md index 1b0407c865d2..e50af77e5b8e 100644 --- a/content/admin/user-management/managing-organizations-in-your-enterprise/index.md +++ b/content/admin/user-management/managing-organizations-in-your-enterprise/index.md @@ -5,7 +5,7 @@ redirect_from: - /enterprise/admin/categories/admin-bootcamp/ - /enterprise/admin/user-management/organizations-and-teams - /enterprise/admin/user-management/managing-organizations-in-your-enterprise -intro: 'Organizations are great for creating distinct groups of users within your company, such as divisions or groups working on similar projects. {% ifversion ghae %}Internal{% else %}Public and internal{% endif %} repositories that belong to an organization are accessible to users in other organizations, while private repositories are inaccessible to anyone but members of the organization that are granted access.' +intro: 'Organizations are great for creating distinct groups of users within your company, such as divisions or groups working on similar projects. {% ifversion ghae %}Internal{% else %}Public and internal{% endif %} repositories that belong to an organization within the enterprise are accessible to users in other organizations of the enterprise, while private repositories are inaccessible to anyone but members of the organization that are granted access.' versions: ghes: '*' ghae: '*' From a50c999341b226433c873204fc5a03fdff0e053c Mon Sep 17 00:00:00 2001 From: mc <42146119+mchammer01@users.noreply.github.com> Date: Thu, 15 Jul 2021 23:45:50 +0100 Subject: [PATCH 2/4] GHES admin docs explaining how to enable dependency graph now mention the term (#20340) * made a start * more work * polishing * forgot to update for GHES<2.22 Co-authored-by: jmarlena <6732600+jmarlena@users.noreply.github.com> --- ...ependencies-on-github-enterprise-server.md | 27 ++++++++++++------- 1 file changed, 18 insertions(+), 9 deletions(-) diff --git a/content/admin/configuration/managing-connections-between-github-enterprise-server-and-github-enterprise-cloud/enabling-alerts-for-vulnerable-dependencies-on-github-enterprise-server.md b/content/admin/configuration/managing-connections-between-github-enterprise-server-and-github-enterprise-cloud/enabling-alerts-for-vulnerable-dependencies-on-github-enterprise-server.md index 68f9066a554f..ba81fb8abf9d 100644 --- a/content/admin/configuration/managing-connections-between-github-enterprise-server-and-github-enterprise-cloud/enabling-alerts-for-vulnerable-dependencies-on-github-enterprise-server.md +++ b/content/admin/configuration/managing-connections-between-github-enterprise-server-and-github-enterprise-cloud/enabling-alerts-for-vulnerable-dependencies-on-github-enterprise-server.md @@ -1,27 +1,36 @@ --- title: Enabling alerts for vulnerable dependencies on GitHub Enterprise Server -intro: 'You can connect {% data variables.product.product_location %} to {% data variables.product.prodname_ghe_cloud %} and enable {% ifversion ghes > 2.21 %}{% data variables.product.prodname_dependabot %}{% else %}security{% endif %} alerts for vulnerable dependencies in repositories in your instance.' +intro: 'You can connect {% data variables.product.product_location %} to {% data variables.product.prodname_ghe_cloud %} and enable the dependency graph and {% ifversion ghes > 2.21 %}{% data variables.product.prodname_dependabot %}{% else %}security{% endif %} alerts in repositories in your instance.' +shortTitle: Enable alerts for dependencies redirect_from: - /enterprise/admin/installation/enabling-security-alerts-for-vulnerable-dependencies-on-github-enterprise-server - /enterprise/admin/configuration/enabling-security-alerts-for-vulnerable-dependencies-on-github-enterprise-server - /enterprise/admin/configuration/enabling-alerts-for-vulnerable-dependencies-on-github-enterprise-server - /admin/configuration/enabling-alerts-for-vulnerable-dependencies-on-github-enterprise-server -permissions: 'Site administrators for {% data variables.product.prodname_ghe_server %} who are also owners of the connected {% data variables.product.prodname_ghe_cloud %} organization or enterprise account can enable {% ifversion ghes > 2.21 %}{% data variables.product.prodname_dependabot %}{% else %}security{% endif %} alerts for vulnerable dependencies on {% data variables.product.prodname_ghe_server %}.' +permissions: 'Site administrators for {% data variables.product.prodname_ghe_server %} who are also owners of the connected {% data variables.product.prodname_ghe_cloud %} organization or enterprise account can enable the dependency graph and {% ifversion ghes > 2.21 %}{% data variables.product.prodname_dependabot %}{% else %}security{% endif %} alerts on {% data variables.product.prodname_ghe_server %}.' versions: ghes: '*' type: how_to topics: - Enterprise - Security -shortTitle: Enable alerts for dependencies + - Dependency graph + - Dependabot + --- ## About alerts for vulnerable dependencies on {% data variables.product.prodname_ghe_server %} -{% data reusables.repositories.tracks-vulnerabilities %} For more information, see "[About alerts for vulnerable dependencies](/github/managing-security-vulnerabilities/about-alerts-for-vulnerable-dependencies)." +To identify vulnerable dependencies in your repository and receive vulnerability alerts, you can use two security features: +- The dependency graph +- {% ifversion ghes > 2.21 %}{% data variables.product.prodname_dependabot %}{% else %}Security{% endif %} alerts + +For more information, see "[About the dependency graph](/code-security/supply-chain-security/understanding-your-software-supply-chain/about-the-dependency-graph)" and "[About alerts for vulnerable dependencies](/github/managing-security-vulnerabilities/about-alerts-for-vulnerable-dependencies)." + +{% data reusables.repositories.tracks-vulnerabilities %} You can connect {% data variables.product.product_location %} to {% data variables.product.prodname_dotcom_the_website %}, then sync vulnerability data to your instance and generate {% ifversion ghes > 2.21 %}{% data variables.product.prodname_dependabot %}{% else %}security{% endif %} alerts in repositories with a vulnerable dependency. -After connecting {% data variables.product.product_location %} to {% data variables.product.prodname_dotcom_the_website %} and enabling {% ifversion ghes > 2.21 %}{% data variables.product.prodname_dependabot %}{% else %}security{% endif %} alerts for vulnerable dependencies, vulnerability data is synced from {% data variables.product.prodname_dotcom_the_website %} to your instance once every hour. You can also choose to manually sync vulnerability data at any time. No code or information about code from {% data variables.product.product_location %} is uploaded to {% data variables.product.prodname_dotcom_the_website %}. +After connecting {% data variables.product.product_location %} to {% data variables.product.prodname_dotcom_the_website %} and enabling the dependency graph and {% ifversion ghes > 2.21 %}{% data variables.product.prodname_dependabot %}{% else %}security{% endif %} alerts for vulnerable dependencies, vulnerability data is synced from {% data variables.product.prodname_dotcom_the_website %} to your instance once every hour. You can also choose to manually sync vulnerability data at any time. No code or information about code from {% data variables.product.product_location %} is uploaded to {% data variables.product.prodname_dotcom_the_website %}. {% ifversion ghes > 2.21 %}When {% data variables.product.product_location %} receives information about a vulnerability, it will identify repositories in your instance that use the affected version of the dependency and generate {% data variables.product.prodname_dependabot_alerts %}. You can customize how you receive {% data variables.product.prodname_dependabot_alerts %}. For more information, see "[Configuring notifications for vulnerable dependencies](/github/managing-security-vulnerabilities/configuring-notifications-for-vulnerable-dependencies/#configuring-notifications-for-dependabot-alerts)." {% endif %} @@ -30,12 +39,12 @@ After connecting {% data variables.product.product_location %} to {% data variab {% endif %} {% ifversion ghes > 2.21 %} -## Enabling {% data variables.product.prodname_dependabot_alerts %} for vulnerable dependencies on {% data variables.product.prodname_ghe_server %} +## Enabling the dependency graph and {% data variables.product.prodname_dependabot_alerts %} for vulnerable dependencies on {% data variables.product.prodname_ghe_server %} {% else %} -## Enabling security alerts for vulnerable dependencies on {% data variables.product.prodname_ghe_server %} +## Enabling the dependency graph and security alerts for vulnerable dependencies on {% data variables.product.prodname_ghe_server %} {% endif %} -Before enabling {% ifversion ghes > 2.21 %}{% data variables.product.prodname_dependabot %}{% else %}security{% endif %} alerts for vulnerable dependencies on {% data variables.product.product_location %}, you must connect {% data variables.product.product_location %} to {% data variables.product.prodname_dotcom_the_website %}. For more information, see "[Connecting {% data variables.product.prodname_ghe_server %} to {% data variables.product.prodname_ghe_cloud %}](/enterprise/{{ currentVersion }}/admin/guides/installation/connecting-github-enterprise-server-to-github-enterprise-cloud)." +Before enabling the dependency graph and {% ifversion ghes > 2.21 %}{% data variables.product.prodname_dependabot %}{% else %}security{% endif %} alerts for vulnerable dependencies on {% data variables.product.product_location %}, you must connect {% data variables.product.product_location %} to {% data variables.product.prodname_dotcom_the_website %}. For more information, see "[Connecting {% data variables.product.prodname_ghe_server %} to {% data variables.product.prodname_ghe_cloud %}](/enterprise/{{ currentVersion }}/admin/guides/installation/connecting-github-enterprise-server-to-github-enterprise-cloud)." {% ifversion ghes %} @@ -47,7 +56,7 @@ Before enabling {% ifversion ghes > 2.21 %}{% data variables.product.prodname_de {% data reusables.enterprise_site_admin_settings.sign-in %} -1. In the administrative shell, enable the {% ifversion ghes > 2.21 %}{% data variables.product.prodname_dependabot %}{% else %}security{% endif %} alerts for vulnerable dependencies on {% data variables.product.product_location %}: +1. In the administrative shell, enable the dependency graph and {% ifversion ghes > 2.21 %}{% data variables.product.prodname_dependabot %}{% else %}security{% endif %} alerts for vulnerable dependencies on {% data variables.product.product_location %}: ``` shell $ ghe-dep-graph-enable From 800ad0ec10a8b83317d7735fa347e25f3a3d41fe Mon Sep 17 00:00:00 2001 From: Laura Coursen Date: Fri, 16 Jul 2021 03:15:43 -0500 Subject: [PATCH 3/4] Add :nail_care: --- .../managing-organizations-in-your-enterprise/index.md | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/content/admin/user-management/managing-organizations-in-your-enterprise/index.md b/content/admin/user-management/managing-organizations-in-your-enterprise/index.md index e50af77e5b8e..835ac20fe373 100644 --- a/content/admin/user-management/managing-organizations-in-your-enterprise/index.md +++ b/content/admin/user-management/managing-organizations-in-your-enterprise/index.md @@ -5,7 +5,7 @@ redirect_from: - /enterprise/admin/categories/admin-bootcamp/ - /enterprise/admin/user-management/organizations-and-teams - /enterprise/admin/user-management/managing-organizations-in-your-enterprise -intro: 'Organizations are great for creating distinct groups of users within your company, such as divisions or groups working on similar projects. {% ifversion ghae %}Internal{% else %}Public and internal{% endif %} repositories that belong to an organization within the enterprise are accessible to users in other organizations of the enterprise, while private repositories are inaccessible to anyone but members of the organization that are granted access.' +intro: 'Organizations are great for creating distinct groups of users within your company, such as divisions or groups working on similar projects. {% ifversion ghae %}Internal{% else %}Public and internal{% endif %} repositories that belong to an organization are accessible to members of other organizations in the enterprise, while private repositories are inaccessible to anyone but members of the organization that are granted access.' versions: ghes: '*' ghae: '*' @@ -22,4 +22,3 @@ children: - /continuous-integration-using-jenkins shortTitle: Manage organizations --- - From 960356c1eec578e8d6fd63061021b7e748ff1214 Mon Sep 17 00:00:00 2001 From: Grey Baker Date: Fri, 16 Jul 2021 04:28:57 -0400 Subject: [PATCH 4/4] Add Flutterwave API keys to list of supported private repo patterns (#20367) Co-authored-by: Laura Coursen --- .../secret-scanning/partner-secret-list-private-repo.md | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/data/reusables/secret-scanning/partner-secret-list-private-repo.md b/data/reusables/secret-scanning/partner-secret-list-private-repo.md index f64817878319..072ad99af503 100644 --- a/data/reusables/secret-scanning/partner-secret-list-private-repo.md +++ b/data/reusables/secret-scanning/partner-secret-list-private-repo.md @@ -74,6 +74,10 @@ Facebook | Facebook Access Token | facebook_access_token{% endif %} Fastly | Fastly API Token | fastly_api_token{% endif %} {%- ifversion fpt or ghes > 2.22 or ghae-next %} Finicity | Finicity App Key | finicity_app_key{% endif %} +{%- ifversion fpt or ghes > 3.1 or ghae-next %} +Flutterwave | Flutterwave Live API Secret Key | flutterwave_live_api_secret_key{% endif %} +{%- ifversion fpt or ghes > 3.1 or ghae-next %} +Flutterwave | Flutterwave Test API Secret Key | flutterwave_test_api_secret_key{% endif %} {%- ifversion fpt or ghes > 2.22 or ghae-next %} Frame.io | Frame.io JSON Web Token | frameio_jwt{% endif %} {%- ifversion fpt or ghes > 2.22 or ghae-next %}