kubernetes-client/csharp
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Parse clientCertificateData/clientKeyData from auth plugins (#479)

Browse Source 
* Parse clientCertificateData/clientKeyData from auth plugins

Currently ExecuteExternalCommand crashes with a key not found error if
it runs a certificate based (rather than token based) plugin. This
commit will now return either the token string, or the certificate and
key strings which are then used to set the relevant fields on the
configuration object.

* Fix formatting

* Use new return style
This commit is contained in:
Fraser Waters
2020-09-19 05:56:28 +01:00
committed by GitHub
parent 2d5c7c0317
commit c47babf203
1 changed files with 24 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

29
src/KubernetesClient/KubernetesClientConfiguration.ConfigFile.cs
View File

@@ -389,8 +389,10 @@ namespace k8s
throw new KubeConfigException("External command execution missing ApiVersion key"); throw new KubeConfigException("External command execution missing ApiVersion key");
} }
var token = ExecuteExternalCommand(userDetails.UserCredentials.ExternalExecution); var (accessToken, clientCertificateData, clientCertificateKeyData) = ExecuteExternalCommand(userDetails.UserCredentials.ExternalExecution);
AccessToken = token; AccessToken = accessToken;
ClientCertificateData = clientCertificateData;
ClientCertificateKeyData = clientCertificateKeyData;
userCredentialsFound = true; userCredentialsFound = true;
} }
@@ -458,8 +460,10 @@ namespace k8s
/// https://github.com/kubernetes-client/python-base/blob/master/config/exec_provider.py /// https://github.com/kubernetes-client/python-base/blob/master/config/exec_provider.py
/// </summary> /// </summary>
/// <param name="config">The external command execution configuration</param> /// <param name="config">The external command execution configuration</param>
/// <returns>The token received from the external command execution</returns> /// <returns>
public static string ExecuteExternalCommand(ExternalExecution config) /// The token, client certificate data, and the client key data received from the external command execution
/// </returns>
public static (string, string, string) ExecuteExternalCommand(ExternalExecution config)
{ {
var process = CreateRunnableExternalProcess(config); var process = CreateRunnableExternalProcess(config);
@@ -491,7 +495,22 @@ namespace k8s
$"external exec failed because api version {responseObject.ApiVersion} does not match {config.ApiVersion}"); $"external exec failed because api version {responseObject.ApiVersion} does not match {config.ApiVersion}");
} }
return responseObject.Status["token"]; if (responseObject.Status.ContainsKey("token"))
{
return (responseObject.Status["token"], null, null);
}
else if (responseObject.Status.ContainsKey("clientCertificateData"))
{
if (!responseObject.Status.ContainsKey("clientKeyData"))
{
throw new KubeConfigException($"external exec failed missing clientKeyData field in plugin output");
}
return (null, responseObject.Status["clientCertificateData"], responseObject.Status["clientKeyData"]);
}
else
{
throw new KubeConfigException($"external exec failed missing token or clientCertificateData field in plugin output");
}
} }
catch (JsonSerializationException ex) catch (JsonSerializationException ex)
{ {