Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
22 changes: 20 additions & 2 deletions tool/tsh/common/kube.go
Original file line number Diff line number Diff line change
Expand Up @@ -788,7 +788,18 @@ func (c *kubeCredentialsCommand) issueCert(cf *CLIConf) error {
// via the RBAC rules, but we also need to make sure that the user has
// access to the cluster with at least one kubernetes_user or kubernetes_group
// defined.
if err := checkIfCertsAreAllowedToAccessCluster(k, c.kubeCluster); err != nil {
// This is a safety check in order to print a better message to the user even
// before hitting Teleport Kubernetes Proxy.
// We only enforce this check for root clusters, since we don't have knowledge
// of the RBAC role mappings for remote clusters.
rootClusterName, err := tc.RootClusterName(cf.Context)
if err != nil {
return trace.Wrap(err)
}
if err := checkIfCertsAreAllowedToAccessCluster(k,
rootClusterName,
c.teleportCluster,
c.kubeCluster); err != nil {
return trace.Wrap(err)
}
// Cache the new cert on disk for reuse.
Expand Down Expand Up @@ -819,7 +830,14 @@ func (c *kubeCredentialsCommand) checkLocalProxyRequirement(profile *profile.Pro
// defined. If not, it returns an error.
// This is a safety check in order to print a better message to the user even
// before hitting Teleport Kubernetes Proxy.
func checkIfCertsAreAllowedToAccessCluster(k *client.Key, kubeCluster string) error {
func checkIfCertsAreAllowedToAccessCluster(k *client.Key, rootCluster, teleportCluster, kubeCluster string) error {
// This is a safety check in order to print a better message to the user even
// before hitting Teleport Kubernetes Proxy.
// We only enforce this check for root clusters, since we don't have knowledge
// of the RBAC role mappings for remote clusters.
if rootCluster != teleportCluster {
return nil
}
for k8sCluster, cert := range k.KubeTLSCerts {
if k8sCluster != kubeCluster {
continue
Expand Down
15 changes: 14 additions & 1 deletion tool/tsh/common/kube_proxy.go
Original file line number Diff line number Diff line change
Expand Up @@ -491,7 +491,20 @@ func issueKubeCert(ctx context.Context, tc *client.TeleportClient, proxy *client
return tls.Certificate{}, trace.Wrap(err)
}

if err := checkIfCertsAreAllowedToAccessCluster(key, kubeCluster); err != nil {
// Make sure the cert is allowed to access the cluster.
// At this point we already know that the user has access to the cluster
// via the RBAC rules, but we also need to make sure that the user has
// access to the cluster with at least one kubernetes_user or kubernetes_group
// defined.
rootClusterName, err := tc.RootClusterName(ctx)
if err != nil {
return tls.Certificate{}, trace.Wrap(err)
}
if err := checkIfCertsAreAllowedToAccessCluster(
key,
rootClusterName,
teleportCluster,
kubeCluster); err != nil {
return tls.Certificate{}, trace.Wrap(err)
}

Expand Down