Skip to content

Commit f10b171

Browse files
authored
Merge pull request #44710 from github/repo-sync
Repo sync
2 parents 3d9b9e0 + 8755e44 commit f10b171

37 files changed

Lines changed: 603 additions & 529 deletions

File tree

content/code-security/tutorials/secure-your-organization/respond-to-a-security-incident.md

Lines changed: 5 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -101,16 +101,18 @@ There are several containment actions you can choose to perform to limit the att
101101

102102
For exposed or exploited credentials, the most immediate action you can take is to revoke the affected credentials to prevent further misuse.
103103

104-
{% ifversion fpt or ghec or ghes > 3.17 %}
104+
{% ifversion fpt or ghec %}
105+
105106
* **Revoke via the API**
106107

107108
If the token is one of the following types, and the literal value of the token is known, you (or anybody) can revoke it by **submitting a request via the REST API**. See [AUTOTITLE](/rest/credentials/revoke?apiVersion=2022-11-28#revoke-a-list-of-credentials).
108109

109110
* {% data variables.product.pat_v1_caps %}
110-
* {% data variables.product.pat_v2_caps %}{% ifversion fpt or ghec or ghes > 3.20 %}
111+
* {% data variables.product.pat_v2_caps %}
111112
* {% data variables.product.prodname_oauth_app %} access token
112113
* {% data variables.product.prodname_github_app %} user access token
113-
* {% data variables.product.prodname_github_app %} refresh token{% endif %}
114+
* {% data variables.product.prodname_github_app %} refresh token
115+
114116
{% endif %}
115117

116118
* **Revocation and containment options**

content/copilot/concepts/agents/about-enterprise-plugin-standards.md

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@ redirect_from:
1717

1818
> [!NOTE] This feature is in {% data variables.release-phases.public_preview %} and subject to change.
1919
20-
Enterprise-managed plugin standards allow administrators to **define and enforce policies for plugin availability**. By configuring a `settings.json` file in the enterprise's `.github-private` repository, administrators can specify which plugin marketplaces are available to users and which plugins are installed automatically.
20+
Enterprise-managed plugin standards allow administrators to **define and enforce policies for plugin availability**. By configuring a `{% data variables.copilot.managed_setting_file %}` file in the enterprise's `.github-private` repository, administrators can specify which plugin marketplaces are available to users and which plugins are installed automatically.
2121

2222
## Where plugin standards apply
2323

@@ -30,14 +30,14 @@ Users must upgrade to a supported client version for these standards to be appli
3030

3131
## How plugin standards work
3232

33-
Enterprise plugin standards use a configuration file stored in your enterprise's `.github-private` repository. The configuration is defined in a `settings.json` file at the following path: `.github/copilot/settings.json`.
33+
Enterprise plugin standards use a configuration file stored in your enterprise's `.github-private` repository. The configuration is defined in a `{% data variables.copilot.managed_setting_file %}` file at the following path: `.github/copilot/{% data variables.copilot.managed_setting_file %}`. This file was previously called `settings.json`, which is still supported.
3434

3535
For plugin standards, the file can define:
3636

3737
* **Known marketplaces**. Plugin marketplaces that are available to users for browsing and installing plugins.
3838
* **Default-enabled plugins**. Specific plugins that are automatically installed when users authenticate.
3939

40-
When a user authenticates to {% data variables.product.prodname_copilot_short %} in a supported client, the client queries an API endpoint that reads the `settings.json` from the enterprise's `.github-private` repository. The policies defined in the file are then applied to the user's session.
40+
When a user authenticates to {% data variables.product.prodname_copilot_short %} in a supported client, the client queries an API endpoint that reads the `{% data variables.copilot.managed_setting_file %}` file. The policies defined in the file are then applied to the user's session.
4141

4242
## Why use enterprise-managed plugin standards
4343

content/copilot/how-tos/administer-copilot/manage-for-enterprise/manage-agents/configure-enterprise-plugin-standards.md

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
title: Configuring enterprise plugin standards
33
shortTitle: Configure plugin standards
44
allowTitleToDifferFromFilename: true
5-
intro: 'Configure enterprise plugin standards by defining a `settings.json` file in your enterprise''s `.github-private` repository.'
5+
intro: 'Configure enterprise plugin standards by defining a `{% data variables.copilot.managed_setting_file %}` file in your enterprise''s `.github-private` repository.'
66
permissions: Enterprise owners
77
versions:
88
feature: copilot
@@ -16,9 +16,8 @@ category:
1616
1717
You can apply settings to control users' available plugin marketplaces and default-installed plugins. These settings apply to users on your enterprise's {% data variables.product.prodname_copilot_short %} plan. For more information, see [AUTOTITLE](/copilot/concepts/agents/about-enterprise-plugin-standards).
1818

19-
1. In your enterprise's `.github-private` repository, navigate to the `.github/copilot/` directory. If you don't have a `.github-private` repository yet, see [AUTOTITLE](/copilot/how-tos/administer-copilot/manage-for-enterprise/manage-agents/prepare-for-custom-agents).
20-
1. Create or edit the `settings.json` file at `.github/copilot/settings.json`.
21-
1. Add your plugin policy configuration to the file. The `settings.json` file supports the following top-level properties:
19+
{% data reusables.copilot.create-managed-settings %}
20+
1. Add your plugin policy configuration to the file. The `{% data variables.copilot.managed_setting_file %}` file supports the following top-level properties:
2221

2322
```json copy
2423
{
Lines changed: 36 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,36 @@
1+
---
2+
title: Disabling automatic command approval in Copilot clients
3+
shortTitle: Disable automatic commands
4+
allowTitleToDifferFromFilename: true
5+
intro: 'Disable yolo mode to stop agents from running commands without approval.'
6+
permissions: Enterprise owners
7+
versions:
8+
feature: copilot
9+
contentType: how-tos
10+
category:
11+
- Configure Copilot
12+
- Manage Copilot for a team
13+
---
14+
15+
> [!NOTE] This feature is in {% data variables.release-phases.public_preview %} and subject to change.
16+
17+
You can prevent users from using modes that enable automatic approval of agent commands in {% data variables.copilot.copilot_cli_short %} and {% data variables.product.prodname_vscode_shortname %}. The `disableBypassPermissionsMode` setting is defined in your enterprise's `{% data variables.copilot.managed_setting_file %}` file and applies to users on your enterprise's {% data variables.product.prodname_copilot_short %} plan.
18+
19+
This setting blocks users from using:
20+
21+
* The `--yolo` or `--allow-all` flag
22+
* The `/yolo` or `/allow-all` command
23+
* All runtime paths that enable combined bypass mode
24+
25+
This setting does **not** block individual flags such as `--allow-all-tools` or `--allow-all-paths`.
26+
27+
{% data reusables.copilot.create-managed-settings %}
28+
1. Add the following property.
29+
30+
```json copy
31+
{
32+
"permissions": {
33+
"disableBypassPermissionsMode": "disable"
34+
}
35+
}
36+
```

content/copilot/how-tos/administer-copilot/manage-for-enterprise/manage-agents/index.md

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,7 @@ versions:
77
children:
88
- /prepare-for-custom-agents
99
- /configure-enterprise-plugin-standards
10+
- /disable-automatic-commands
1011
- /monitor-agentic-activity
1112
- /enable-copilot-cloud-agent
1213
- /block-agentic-features

content/copilot/how-tos/copilot-cli/set-up-copilot-cli/configure-copilot-cli.md

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -267,7 +267,9 @@ This flag combines:
267267
* `--allow-all-paths` (disable path verification).
268268
* `--allow-all-urls` (disables URL verification).
269269

270-
> [!TIP] During an interactive session, you can also enable all permissions with the `/allow-all` or `/yolo` slash commands.
270+
During an interactive session, you can also enable all permissions with the `/allow-all` or `/yolo` slash commands.
271+
272+
{% data reusables.copilot.disable-bypass %}
271273

272274
## Further reading
273275

content/copilot/how-tos/copilot-cli/use-copilot-cli/allowing-tools.md

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -79,6 +79,8 @@ For details of the supported tool kinds, see [AUTOTITLE](/copilot/reference/copi
7979

8080
The following command-line options give {% data variables.copilot.copilot_cli_short %} permission to use all available tools.
8181

82+
{% data reusables.copilot.disable-bypass %}
83+
8284
* `--allow-all-tools` — Full access to the available tools.
8385

8486
* `--allow-all` or `--yolo` — Equivalent to using all of the `--allow-all-tools`, `--allow-all-paths`, and `--allow-all-urls` options when starting the CLI.

content/organizations/managing-programmatic-access-to-your-organization/github-credential-types.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -38,7 +38,7 @@ The following sections describe revocation options for each credential type base
3838

3939
* If the token **belongs to you**, you can delete it via your personal account settings. See [AUTOTITLE](/authentication/keeping-your-account-and-data-secure/managing-your-personal-access-tokens#deleting-a-personal-access-token).
4040
{% data reusables.credentials.revoke-via-api %}
41-
* **Organization owners** and **enterprise owners** do not have direct visibility into or control over individual tokens. However, they can:{% ifversion fpt or ghec or ghes > 3.17 %}
41+
* **Organization owners** and **enterprise owners** do not have direct visibility into or control over individual tokens. However, they can:{% ifversion fpt or ghec %}
4242
* Revoke them using the REST API, if the actual token value is known. See [AUTOTITLE](/rest/credentials/revoke?apiVersion=2022-11-28#revoke-a-list-of-credentials).{% endif %}
4343
* Restrict the access of {% data variables.product.pat_generic_plural %} to the organization or enterprise entirely. See [AUTOTITLE](/organizations/managing-programmatic-access-to-your-organization/setting-a-personal-access-token-policy-for-your-organization) and [AUTOTITLE](/admin/enforcing-policies/enforcing-policies-for-your-enterprise/enforcing-policies-for-personal-access-tokens-in-your-enterprise).
4444
* **Organization owners and enterprise owners** on {% data variables.product.prodname_ghe_cloud %} with SSO enforced can revoke the SSO authorization for a specific {% data variables.product.pat_v1 %}. See [Revoking SSO authorization](#revoking-sso-authorization) for details.
@@ -49,7 +49,7 @@ The following sections describe revocation options for each credential type base
4949
* If the token **belongs to you**, you can delete it via your personal account settings. See [AUTOTITLE](/authentication/keeping-your-account-and-data-secure/managing-your-personal-access-tokens#deleting-a-personal-access-token).
5050
{% data reusables.credentials.revoke-via-api %}
5151
* **Organization owners**: Can view and revoke individual tokens. Note, however, that when an organization owner revokes a {% data variables.product.pat_v2 %}, any SSH keys created by the token will continue to work and the token will still be able to read public resources within the organization. The revocation changes the resource owner from the organization to the user, and the user can reassign it back. See [AUTOTITLE](/organizations/managing-programmatic-access-to-your-organization/reviewing-and-revoking-personal-access-tokens-in-your-organization).
52-
* **Organization owners** and **enterprise owners** can:{% ifversion fpt or ghec or ghes > 3.17 %}
52+
* **Organization owners** and **enterprise owners** can:{% ifversion fpt or ghec %}
5353
* Revoke the token using the REST API. See [AUTOTITLE](/rest/credentials/revoke?apiVersion=2022-11-28#revoke-a-list-of-credentials).{% endif %}
5454
* Restrict the access of {% data variables.product.pat_generic_plural %} to the organization or enterprise entirely. See [AUTOTITLE](/organizations/managing-programmatic-access-to-your-organization/setting-a-personal-access-token-policy-for-your-organization) and [AUTOTITLE](/admin/enforcing-policies/enforcing-policies-for-your-enterprise/enforcing-policies-for-personal-access-tokens-in-your-enterprise).
5555
* **Revoked automatically** if pushed to a public repository or gist, or if unused for one year. See [AUTOTITLE](/authentication/keeping-your-account-and-data-secure/token-expiration-and-revocation).

content/rest/credentials/revoke.md

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,6 @@ intro: >-
77
versions: # DO NOT MANUALLY EDIT. CHANGES WILL BE OVERWRITTEN BY A 🤖
88
fpt: '*'
99
ghec: '*'
10-
ghes: '>=3.18'
1110
autogenerated: rest
1211
allowTitleToDifferFromFilename: true
1312
category:
Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,2 @@
1+
1. In your enterprise's `.github-private` repository, navigate to the `.github/copilot/` directory. If you haven't set a `.github-private` repository as your enterprise's source of agent configuration, see [AUTOTITLE](/copilot/how-tos/administer-copilot/manage-for-enterprise/manage-agents/prepare-for-custom-agents).
2+
1. Create or edit the `{% data variables.copilot.managed_setting_file %}` file. (This file was previously named `settings.json`, which is also supported.)

0 commit comments

Comments
 (0)