Skip to content

MCP access part 2: new role options, access checker, role editor #54734

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
greedy52 merged 4 commits into from
May 29, 2025
Merged

MCP access part 2: new role options, access checker, role editor #54734

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
8b1669b
MCP access part 2: new role options, access checker, role editor
greedy52 May 13, 2025
54c6c60
catch unsupported mcp fields
greedy52 May 20, 2025
a2b6655
simplify mcpToolsToModel
greedy52 May 21, 2025
20a8e7f
Merge branch 'master' of github.com:gravitational/teleport into STeve…
greedy52 May 29, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 3 additions & 0 deletions api/constants/constants.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -417,6 +417,9 @@ const (
// TraitGitHubOrgs is the name of the variable to specify the GitHub
// organizations for GitHub integration.
TraitGitHubOrgs = "github_orgs"
// TraitMCPTools is the name of the variable to specify the MCP tools for
// MCP servers.
TraitMCPTools = "mcp_tools"
)

const (
Expand Down
12 changes: 12 additions & 0 deletions api/proto/teleport/legacy/types/types.proto
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3802,6 +3802,9 @@ message RoleConditions {
// WorkloadIdentityLabelsExpression is a predicate expression used to
// allow/deny access to issuing a WorkloadIdentity.
string WorkloadIdentityLabelsExpression = 45 [(gogoproto.jsontag) = "workload_identity_labels_expression,omitempty"];

// MCPPermissions defines MCP servers related permissions.
MCPPermissions MCP = 46 [(gogoproto.jsontag) = "mcp,omitempty"];
}

// IdentityCenterAccountAssignment captures an AWS Identity Center account
Expand All @@ -3816,6 +3819,15 @@ message GitHubPermission {
repeated string organizations = 1 [(gogoproto.jsontag) = "orgs,omitempty"];
}

// MCPPermissions defines MCP servers related permissions.
message MCPPermissions {
// Tools defines the list of tools allowed or denied for this role. Each entry
// can be a literal string, a glob pattern (e.g. "prefix_*"), or a regular
// expression (must start with '^' and end with '$'). If the list is empty, no
// tools are allowed.
repeated string tools = 1;
}

// SPIFFERoleCondition sets out which SPIFFE identities this role is allowed or
// denied to generate. The Path matcher is required, and is evaluated first. If,
// the Path does not match then the other matcher fields are not evaluated.
Expand Down
23 changes: 23 additions & 0 deletions api/types/role.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -298,6 +298,12 @@ type Role interface {
// GetIdentityCenterAccountAssignments sets the allow or deny Account
// Assignments for the role
SetIdentityCenterAccountAssignments(RoleConditionType, []IdentityCenterAccountAssignment)

// GetMCPPermissions returns the allow or deny MCP permissions.
GetMCPPermissions(RoleConditionType) *MCPPermissions
// SetMCPPermissions sets the allow or deny MCP permissions.
SetMCPPermissions(RoleConditionType, *MCPPermissions)

// Clone creats a copy of the role.
Clone() Role
}
Expand Down Expand Up @@ -2275,6 +2281,23 @@ func (r *RoleV6) SetIdentityCenterAccountAssignments(rct RoleConditionType, assi
cond.AccountAssignments = assignments
}

// GetMCPPermissions returns the allow or deny MCP permissions.
func (r *RoleV6) GetMCPPermissions(rct RoleConditionType) *MCPPermissions {
if rct == Allow {
return r.Spec.Allow.MCP
}
return r.Spec.Deny.MCP
}

// SetMCPPermissions sets the allow or deny MCP permissions.
func (r *RoleV6) SetMCPPermissions(rct RoleConditionType, perms *MCPPermissions) {
if rct == Allow {
r.Spec.Allow.MCP = perms
} else {
r.Spec.Deny.MCP = perms
}
}

func (r *RoleV6) Clone() Role {
return utils.CloneProtoMsg(r)
}
Expand Down
5,283 changes: 2,762 additions & 2,521 deletions api/types/types.pb.go
View file
Open in desktop

Large diffs are not rendered by default.

4 changes: 4 additions & 0 deletions constants.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -654,6 +654,10 @@ const (
// TraitInternalGitHubOrgs is the variable used to store allowed GitHub
// organizations for GitHub integrations.
TraitInternalGitHubOrgs = "{{internal.github_orgs}}"

// TraitInternalMCPTools is the variable used to store allowed MCP tools for
// MCP servers.
TraitInternalMCPTools = "{{internal.mcp_tools}}"
)

// SCP is Secure Copy.
Expand Down
28 changes: 28 additions & 0 deletions docs/pages/reference/operator-resources/resources-teleport-dev-roles.mdx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -64,6 +64,7 @@ resource, which you can apply after installing the Teleport Kubernetes operator.
|kubernetes_resources|[][object](#specallowkubernetes_resources-items)|KubernetesResources is the Kubernetes Resources this Role grants access to.|
|kubernetes_users|[]string|KubeUsers is an optional kubernetes users to impersonate|
|logins|[]string|Logins is a list of *nix system logins.|
|mcp|[object](#specallowmcp)|MCPPermissions defines MCP servers related permissions.|
|node_labels|object|NodeLabels is a map of node labels (used to dynamically grant access to nodes).|
|node_labels_expression|string|NodeLabelsExpression is a predicate expression used to allow/deny access to SSH nodes.|
|request|[object](#specallowrequest)||
Expand Down Expand Up @@ -124,6 +125,12 @@ resource, which you can apply after installing the Teleport Kubernetes operator.
|namespace|string|Namespace is the resource namespace. It supports wildcards.|
|verbs|[]string|Verbs are the allowed Kubernetes verbs for the following resource.|

### spec.allow.mcp

|Field|Type|Description|
|---|---|---|
|tools|[]string|Tools defines the list of tools allowed or denied for this role. Each entry can be a literal string, a glob pattern (e.g. "prefix_*"), or a regular expression (must start with '^' and end with '$'). If the list is empty, no tools are allowed.|

### spec.allow.request

|Field|Type|Description|
Expand Down Expand Up @@ -247,6 +254,7 @@ resource, which you can apply after installing the Teleport Kubernetes operator.
|kubernetes_resources|[][object](#specdenykubernetes_resources-items)|KubernetesResources is the Kubernetes Resources this Role grants access to.|
|kubernetes_users|[]string|KubeUsers is an optional kubernetes users to impersonate|
|logins|[]string|Logins is a list of *nix system logins.|
|mcp|[object](#specdenymcp)|MCPPermissions defines MCP servers related permissions.|
|node_labels|object|NodeLabels is a map of node labels (used to dynamically grant access to nodes).|
|node_labels_expression|string|NodeLabelsExpression is a predicate expression used to allow/deny access to SSH nodes.|
|request|[object](#specdenyrequest)||
Expand Down Expand Up @@ -307,6 +315,12 @@ resource, which you can apply after installing the Teleport Kubernetes operator.
|namespace|string|Namespace is the resource namespace. It supports wildcards.|
|verbs|[]string|Verbs are the allowed Kubernetes verbs for the following resource.|

### spec.deny.mcp

|Field|Type|Description|
|---|---|---|
|tools|[]string|Tools defines the list of tools allowed or denied for this role. Each entry can be a literal string, a glob pattern (e.g. "prefix_*"), or a regular expression (must start with '^' and end with '$'). If the list is empty, no tools are allowed.|

### spec.deny.request

|Field|Type|Description|
Expand Down Expand Up @@ -533,6 +547,7 @@ resource, which you can apply after installing the Teleport Kubernetes operator.
|kubernetes_resources|[][object](#specallowkubernetes_resources-items)|KubernetesResources is the Kubernetes Resources this Role grants access to.|
|kubernetes_users|[]string|KubeUsers is an optional kubernetes users to impersonate|
|logins|[]string|Logins is a list of *nix system logins.|
|mcp|[object](#specallowmcp)|MCPPermissions defines MCP servers related permissions.|
|node_labels|object|NodeLabels is a map of node labels (used to dynamically grant access to nodes).|
|node_labels_expression|string|NodeLabelsExpression is a predicate expression used to allow/deny access to SSH nodes.|
|request|[object](#specallowrequest)||
Expand Down Expand Up @@ -593,6 +608,12 @@ resource, which you can apply after installing the Teleport Kubernetes operator.
|namespace|string|Namespace is the resource namespace. It supports wildcards.|
|verbs|[]string|Verbs are the allowed Kubernetes verbs for the following resource.|

### spec.allow.mcp

|Field|Type|Description|
|---|---|---|
|tools|[]string|Tools defines the list of tools allowed or denied for this role. Each entry can be a literal string, a glob pattern (e.g. "prefix_*"), or a regular expression (must start with '^' and end with '$'). If the list is empty, no tools are allowed.|

### spec.allow.request

|Field|Type|Description|
Expand Down Expand Up @@ -716,6 +737,7 @@ resource, which you can apply after installing the Teleport Kubernetes operator.
|kubernetes_resources|[][object](#specdenykubernetes_resources-items)|KubernetesResources is the Kubernetes Resources this Role grants access to.|
|kubernetes_users|[]string|KubeUsers is an optional kubernetes users to impersonate|
|logins|[]string|Logins is a list of *nix system logins.|
|mcp|[object](#specdenymcp)|MCPPermissions defines MCP servers related permissions.|
|node_labels|object|NodeLabels is a map of node labels (used to dynamically grant access to nodes).|
|node_labels_expression|string|NodeLabelsExpression is a predicate expression used to allow/deny access to SSH nodes.|
|request|[object](#specdenyrequest)||
Expand Down Expand Up @@ -776,6 +798,12 @@ resource, which you can apply after installing the Teleport Kubernetes operator.
|namespace|string|Namespace is the resource namespace. It supports wildcards.|
|verbs|[]string|Verbs are the allowed Kubernetes verbs for the following resource.|

### spec.deny.mcp

|Field|Type|Description|
|---|---|---|
|tools|[]string|Tools defines the list of tools allowed or denied for this role. Each entry can be a literal string, a glob pattern (e.g. "prefix_*"), or a regular expression (must start with '^' and end with '$'). If the list is empty, no tools are allowed.|

### spec.deny.request

|Field|Type|Description|
Expand Down
14 changes: 14 additions & 0 deletions docs/pages/reference/operator-resources/resources-teleport-dev-rolesv6.mdx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -64,6 +64,7 @@ resource, which you can apply after installing the Teleport Kubernetes operator.
|kubernetes_resources|[][object](#specallowkubernetes_resources-items)|KubernetesResources is the Kubernetes Resources this Role grants access to.|
|kubernetes_users|[]string|KubeUsers is an optional kubernetes users to impersonate|
|logins|[]string|Logins is a list of *nix system logins.|
|mcp|[object](#specallowmcp)|MCPPermissions defines MCP servers related permissions.|
|node_labels|object|NodeLabels is a map of node labels (used to dynamically grant access to nodes).|
|node_labels_expression|string|NodeLabelsExpression is a predicate expression used to allow/deny access to SSH nodes.|
|request|[object](#specallowrequest)||
Expand Down Expand Up @@ -124,6 +125,12 @@ resource, which you can apply after installing the Teleport Kubernetes operator.
|namespace|string|Namespace is the resource namespace. It supports wildcards.|
|verbs|[]string|Verbs are the allowed Kubernetes verbs for the following resource.|

### spec.allow.mcp

|Field|Type|Description|
|---|---|---|
|tools|[]string|Tools defines the list of tools allowed or denied for this role. Each entry can be a literal string, a glob pattern (e.g. "prefix_*"), or a regular expression (must start with '^' and end with '$'). If the list is empty, no tools are allowed.|

### spec.allow.request

|Field|Type|Description|
Expand Down Expand Up @@ -247,6 +254,7 @@ resource, which you can apply after installing the Teleport Kubernetes operator.
|kubernetes_resources|[][object](#specdenykubernetes_resources-items)|KubernetesResources is the Kubernetes Resources this Role grants access to.|
|kubernetes_users|[]string|KubeUsers is an optional kubernetes users to impersonate|
|logins|[]string|Logins is a list of *nix system logins.|
|mcp|[object](#specdenymcp)|MCPPermissions defines MCP servers related permissions.|
|node_labels|object|NodeLabels is a map of node labels (used to dynamically grant access to nodes).|
|node_labels_expression|string|NodeLabelsExpression is a predicate expression used to allow/deny access to SSH nodes.|
|request|[object](#specdenyrequest)||
Expand Down Expand Up @@ -307,6 +315,12 @@ resource, which you can apply after installing the Teleport Kubernetes operator.
|namespace|string|Namespace is the resource namespace. It supports wildcards.|
|verbs|[]string|Verbs are the allowed Kubernetes verbs for the following resource.|

### spec.deny.mcp

|Field|Type|Description|
|---|---|---|
|tools|[]string|Tools defines the list of tools allowed or denied for this role. Each entry can be a literal string, a glob pattern (e.g. "prefix_*"), or a regular expression (must start with '^' and end with '$'). If the list is empty, no tools are allowed.|

### spec.deny.request

|Field|Type|Description|
Expand Down
14 changes: 14 additions & 0 deletions docs/pages/reference/operator-resources/resources-teleport-dev-rolesv7.mdx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -64,6 +64,7 @@ resource, which you can apply after installing the Teleport Kubernetes operator.
|kubernetes_resources|[][object](#specallowkubernetes_resources-items)|KubernetesResources is the Kubernetes Resources this Role grants access to.|
|kubernetes_users|[]string|KubeUsers is an optional kubernetes users to impersonate|
|logins|[]string|Logins is a list of *nix system logins.|
|mcp|[object](#specallowmcp)|MCPPermissions defines MCP servers related permissions.|
|node_labels|object|NodeLabels is a map of node labels (used to dynamically grant access to nodes).|
|node_labels_expression|string|NodeLabelsExpression is a predicate expression used to allow/deny access to SSH nodes.|
|request|[object](#specallowrequest)||
Expand Down Expand Up @@ -124,6 +125,12 @@ resource, which you can apply after installing the Teleport Kubernetes operator.
|namespace|string|Namespace is the resource namespace. It supports wildcards.|
|verbs|[]string|Verbs are the allowed Kubernetes verbs for the following resource.|

### spec.allow.mcp

|Field|Type|Description|
|---|---|---|
|tools|[]string|Tools defines the list of tools allowed or denied for this role. Each entry can be a literal string, a glob pattern (e.g. "prefix_*"), or a regular expression (must start with '^' and end with '$'). If the list is empty, no tools are allowed.|

### spec.allow.request

|Field|Type|Description|
Expand Down Expand Up @@ -247,6 +254,7 @@ resource, which you can apply after installing the Teleport Kubernetes operator.
|kubernetes_resources|[][object](#specdenykubernetes_resources-items)|KubernetesResources is the Kubernetes Resources this Role grants access to.|
|kubernetes_users|[]string|KubeUsers is an optional kubernetes users to impersonate|
|logins|[]string|Logins is a list of *nix system logins.|
|mcp|[object](#specdenymcp)|MCPPermissions defines MCP servers related permissions.|
|node_labels|object|NodeLabels is a map of node labels (used to dynamically grant access to nodes).|
|node_labels_expression|string|NodeLabelsExpression is a predicate expression used to allow/deny access to SSH nodes.|
|request|[object](#specdenyrequest)||
Expand Down Expand Up @@ -307,6 +315,12 @@ resource, which you can apply after installing the Teleport Kubernetes operator.
|namespace|string|Namespace is the resource namespace. It supports wildcards.|
|verbs|[]string|Verbs are the allowed Kubernetes verbs for the following resource.|

### spec.deny.mcp

|Field|Type|Description|
|---|---|---|
|tools|[]string|Tools defines the list of tools allowed or denied for this role. Each entry can be a literal string, a glob pattern (e.g. "prefix_*"), or a regular expression (must start with '^' and end with '$'). If the list is empty, no tools are allowed.|

### spec.deny.request

|Field|Type|Description|
Expand Down
14 changes: 14 additions & 0 deletions docs/pages/reference/operator-resources/resources-teleport-dev-rolesv8.mdx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -64,6 +64,7 @@ resource, which you can apply after installing the Teleport Kubernetes operator.
|kubernetes_resources|[][object](#specallowkubernetes_resources-items)|KubernetesResources is the Kubernetes Resources this Role grants access to.|
|kubernetes_users|[]string|KubeUsers is an optional kubernetes users to impersonate|
|logins|[]string|Logins is a list of *nix system logins.|
|mcp|[object](#specallowmcp)|MCPPermissions defines MCP servers related permissions.|
|node_labels|object|NodeLabels is a map of node labels (used to dynamically grant access to nodes).|
|node_labels_expression|string|NodeLabelsExpression is a predicate expression used to allow/deny access to SSH nodes.|
|request|[object](#specallowrequest)||
Expand Down Expand Up @@ -124,6 +125,12 @@ resource, which you can apply after installing the Teleport Kubernetes operator.
|namespace|string|Namespace is the resource namespace. It supports wildcards.|
|verbs|[]string|Verbs are the allowed Kubernetes verbs for the following resource.|

### spec.allow.mcp

|Field|Type|Description|
|---|---|---|
|tools|[]string|Tools defines the list of tools allowed or denied for this role. Each entry can be a literal string, a glob pattern (e.g. "prefix_*"), or a regular expression (must start with '^' and end with '$'). If the list is empty, no tools are allowed.|

### spec.allow.request

|Field|Type|Description|
Expand Down Expand Up @@ -247,6 +254,7 @@ resource, which you can apply after installing the Teleport Kubernetes operator.
|kubernetes_resources|[][object](#specdenykubernetes_resources-items)|KubernetesResources is the Kubernetes Resources this Role grants access to.|
|kubernetes_users|[]string|KubeUsers is an optional kubernetes users to impersonate|
|logins|[]string|Logins is a list of *nix system logins.|
|mcp|[object](#specdenymcp)|MCPPermissions defines MCP servers related permissions.|
|node_labels|object|NodeLabels is a map of node labels (used to dynamically grant access to nodes).|
|node_labels_expression|string|NodeLabelsExpression is a predicate expression used to allow/deny access to SSH nodes.|
|request|[object](#specdenyrequest)||
Expand Down Expand Up @@ -307,6 +315,12 @@ resource, which you can apply after installing the Teleport Kubernetes operator.
|namespace|string|Namespace is the resource namespace. It supports wildcards.|
|verbs|[]string|Verbs are the allowed Kubernetes verbs for the following resource.|

### spec.deny.mcp

|Field|Type|Description|
|---|---|---|
|tools|[]string|Tools defines the list of tools allowed or denied for this role. Each entry can be a literal string, a glob pattern (e.g. "prefix_*"), or a regular expression (must start with '^' and end with '$'). If the list is empty, no tools are allowed.|

### spec.deny.request

|Field|Type|Description|
Expand Down
16 changes: 16 additions & 0 deletions docs/pages/reference/terraform-provider/data-sources/role.mdx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -79,6 +79,7 @@ Optional:
- `kubernetes_resources` (Attributes List) KubernetesResources is the Kubernetes Resources this Role grants access to. (see [below for nested schema](#nested-schema-for-specallowkubernetes_resources))
- `kubernetes_users` (List of String) KubeUsers is an optional kubernetes users to impersonate
- `logins` (List of String) Logins is a list of *nix system logins.
- `mcp` (Attributes) MCPPermissions defines MCP servers related permissions. (see [below for nested schema](#nested-schema-for-specallowmcp))
- `node_labels` (Map of List of String) NodeLabels is a map of node labels (used to dynamically grant access to nodes).
- `node_labels_expression` (String) NodeLabelsExpression is a predicate expression used to allow/deny access to SSH nodes.
- `request` (Attributes) (see [below for nested schema](#nested-schema-for-specallowrequest))
Expand Down Expand Up @@ -145,6 +146,13 @@ Optional:
- `verbs` (List of String) Verbs are the allowed Kubernetes verbs for the following resource.


### Nested Schema for `spec.allow.mcp`

Optional:

- `tools` (List of String) Tools defines the list of tools allowed or denied for this role. Each entry can be a literal string, a glob pattern (e.g. "prefix_*"), or a regular expression (must start with '^' and end with '$'). If the list is empty, no tools are allowed.


### Nested Schema for `spec.allow.request`

Optional:
Expand Down Expand Up @@ -279,6 +287,7 @@ Optional:
- `kubernetes_resources` (Attributes List) KubernetesResources is the Kubernetes Resources this Role grants access to. (see [below for nested schema](#nested-schema-for-specdenykubernetes_resources))
- `kubernetes_users` (List of String) KubeUsers is an optional kubernetes users to impersonate
- `logins` (List of String) Logins is a list of *nix system logins.
- `mcp` (Attributes) MCPPermissions defines MCP servers related permissions. (see [below for nested schema](#nested-schema-for-specdenymcp))
- `node_labels` (Map of List of String) NodeLabels is a map of node labels (used to dynamically grant access to nodes).
- `node_labels_expression` (String) NodeLabelsExpression is a predicate expression used to allow/deny access to SSH nodes.
- `request` (Attributes) (see [below for nested schema](#nested-schema-for-specdenyrequest))
Expand Down Expand Up @@ -345,6 +354,13 @@ Optional:
- `verbs` (List of String) Verbs are the allowed Kubernetes verbs for the following resource.


### Nested Schema for `spec.deny.mcp`

Optional:

- `tools` (List of String) Tools defines the list of tools allowed or denied for this role. Each entry can be a literal string, a glob pattern (e.g. "prefix_*"), or a regular expression (must start with '^' and end with '$'). If the list is empty, no tools are allowed.


### Nested Schema for `spec.deny.request`

Optional:
Expand Down
Loading
Loading