Pass cluster info to exec credential plugins (provideClusterInfo) #1808
+404
−31
There are no files selected for viewing
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -5,6 +5,7 @@ | |
| using System.Net; | ||
| using System.Runtime.InteropServices; | ||
| using System.Text; | ||
| using System.Text.Json.Nodes; | ||
|
|
||
| namespace k8s | ||
| { | ||
|
|
@@ -306,15 +307,16 @@ private void SetClusterDetails(K8SConfiguration k8SConfig, Context activeContext | |
| { | ||
| if (!string.IsNullOrEmpty(clusterDetails.ClusterEndpoint.CertificateAuthorityData)) | ||
| { | ||
| CaData = clusterDetails.ClusterEndpoint.CertificateAuthorityData; | ||
| var pemText = Encoding.UTF8.GetString(Convert.FromBase64String(CaData)); | ||
| SslCaCerts = CertUtils.LoadFromPemText(pemText); | ||
| } | ||
| else if (!string.IsNullOrEmpty(clusterDetails.ClusterEndpoint.CertificateAuthority)) | ||
| { | ||
| var caBytes = File.ReadAllBytes(GetFullPath(k8SConfig, clusterDetails.ClusterEndpoint.CertificateAuthority)); | ||
| CaData = Convert.ToBase64String(caBytes); | ||
| var pemText = Encoding.UTF8.GetString(caBytes); | ||
| SslCaCerts = CertUtils.LoadFromPemText(pemText); | ||
| } | ||
|
mutsaddi-deshaw marked this conversation as resolved.
|
||
| } | ||
| } | ||
|
|
@@ -426,7 +428,25 @@ private void SetUserDetails(K8SConfiguration k8SConfig, Context activeContext) | |
| throw new KubeConfigException("External command execution missing ApiVersion key"); | ||
| } | ||
|
|
||
| ClusterEndpoint clusterEndpoint = null; | ||
| if (userDetails.UserCredentials.ExternalExecution.ProvideClusterInfo) | ||
| { | ||
| var clusterDetails = k8SConfig.Clusters.FirstOrDefault(c => c.Name.Equals( | ||
| activeContext.ContextDetails.Cluster, | ||
| StringComparison.OrdinalIgnoreCase)); | ||
| var rawCluster = clusterDetails?.ClusterEndpoint; | ||
|
|
||
| clusterEndpoint = new ClusterEndpoint | ||
| { | ||
| Server = this.Host, | ||
| SkipTlsVerify = this.SkipTlsVerify, | ||
| TlsServerName = this.TlsServerName, | ||
| CertificateAuthorityData = this.CaData, | ||
| Extensions = rawCluster?.Extensions, | ||
| }; | ||
| } | ||
|
|
||
| var response = ExecuteExternalCommand(userDetails.UserCredentials.ExternalExecution, clusterEndpoint); | ||
| AccessToken = response.Status.Token; | ||
| // When reading ClientCertificateData from a config file it will be base64 encoded, and code later in the system (see CertUtils.GeneratePfx) | ||
| // expects ClientCertificateData and ClientCertificateKeyData to be base64 encoded because of this. However the string returned by external | ||
|
|
@@ -439,7 +459,7 @@ private void SetUserDetails(K8SConfiguration k8SConfig, Context activeContext) | |
| // TODO: support client certificates here too. | ||
| if (AccessToken != null) | ||
| { | ||
| TokenProvider = new ExecTokenProvider(userDetails.UserCredentials.ExternalExecution, clusterEndpoint); | ||
| } | ||
| } | ||
|
|
||
|
|
@@ -450,23 +470,86 @@ private void SetUserDetails(K8SConfiguration k8SConfig, Context activeContext) | |
| } | ||
| } | ||
|
|
||
| /// <summary> | ||
| /// Converts a <see cref="ClusterEndpoint"/> (kubeconfig model) into the | ||
| /// <c>spec.cluster</c> JSON representation defined by the exec credential plugin | ||
| /// protocol (client.authentication.k8s.io/v1). Returns <c>null</c> if | ||
| /// <paramref name="cluster"/> is <c>null</c>. | ||
| /// </summary> | ||
| /// <seealso href="https://kubernetes.io/docs/reference/config-api/client-authentication.v1/#Cluster"/> | ||
| internal static JsonNode ToExecClusterInfo(ClusterEndpoint cluster) | ||
| { | ||
| if (cluster == null) | ||
| { | ||
| return null; | ||
| } | ||
|
|
||
| var node = new JsonObject | ||
| { | ||
| ["server"] = cluster.Server, | ||
| }; | ||
|
|
||
| if (cluster.SkipTlsVerify) | ||
| { | ||
| node["insecure-skip-tls-verify"] = true; | ||
| } | ||
|
|
||
| if (!string.IsNullOrEmpty(cluster.CertificateAuthorityData)) | ||
| { | ||
| node["certificate-authority-data"] = cluster.CertificateAuthorityData; | ||
| } | ||
|
|
||
| if (!string.IsNullOrEmpty(cluster.TlsServerName)) | ||
| { | ||
| node["tls-server-name"] = cluster.TlsServerName; | ||
| } | ||
|
|
||
| var execExtension = cluster.Extensions? | ||
| .FirstOrDefault(e => e.Name == "client.authentication.k8s.io/exec"); | ||
|
mutsaddi-deshaw marked this conversation as resolved.
Outdated
|
||
| if (execExtension != null) | ||
| { | ||
| object extConfig = execExtension.Extension; | ||
| if (extConfig != null) | ||
| { | ||
| node["config"] = JsonNode.Parse(JsonSerializer.Serialize(extConfig)); | ||
| } | ||
|
Comment on lines
+517
to
+521
|
||
| } | ||
|
Comment on lines
+513
to
+522
Author
There was a problem hiding this comment.
mutsaddi-deshaw marked this conversation as resolved.
|
||
|
|
||
| return node; | ||
| } | ||
|
|
||
| public static Process CreateRunnableExternalProcess(ExternalExecution config, EventHandler<DataReceivedEventArgs> captureStdError = null) | ||
| { | ||
| return CreateRunnableExternalProcess(config, captureStdError, null); | ||
| } | ||
|
|
||
| public static Process CreateRunnableExternalProcess(ExternalExecution config, EventHandler<DataReceivedEventArgs> captureStdError, ClusterEndpoint cluster) | ||
| { | ||
| if (config == null) | ||
| { | ||
| throw new ArgumentNullException(nameof(config)); | ||
| } | ||
|
|
||
| var spec = new JsonObject { ["interactive"] = Environment.UserInteractive }; | ||
| if (config.ProvideClusterInfo) | ||
| { | ||
| var clusterNode = ToExecClusterInfo(cluster); | ||
| if (clusterNode != null) | ||
| { | ||
| spec["cluster"] = clusterNode; | ||
| } | ||
| } | ||
|
mutsaddi-deshaw marked this conversation as resolved.
mutsaddi-deshaw marked this conversation as resolved.
|
||
|
|
||
| var execInfo = new JsonObject | ||
| { | ||
| ["apiVersion"] = config.ApiVersion, | ||
| ["kind"] = "ExecCredentials", | ||
| ["spec"] = spec, | ||
| }; | ||
|
|
||
| var process = new Process(); | ||
|
|
||
| process.StartInfo.EnvironmentVariables.Add("KUBERNETES_EXEC_INFO", execInfo.ToJsonString()); | ||
| if (config.EnvironmentVariables != null) | ||
| { | ||
| foreach (var configEnvironmentVariable in config.EnvironmentVariables) | ||
|
|
@@ -510,14 +593,19 @@ public static Process CreateRunnableExternalProcess(ExternalExecution config, Ev | |
| /// The token, client certificate data, and the client key data received from the external command execution | ||
| /// </returns> | ||
| public static ExecCredentialResponse ExecuteExternalCommand(ExternalExecution config) | ||
| { | ||
| return ExecuteExternalCommand(config, null); | ||
| } | ||
|
|
||
| public static ExecCredentialResponse ExecuteExternalCommand(ExternalExecution config, ClusterEndpoint cluster) | ||
| { | ||
| if (config == null) | ||
| { | ||
| throw new ArgumentNullException(nameof(config)); | ||
| } | ||
|
|
||
| var captureStdError = ExecStdError; | ||
| var process = CreateRunnableExternalProcess(config, captureStdError, cluster); | ||
|
|
||
| try | ||
| { | ||
|
|
||
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Oops, something went wrong.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Uh oh!
There was an error while loading. Please reload this page.