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

Fix: Exec provider potential deadlock (#1457)

Browse Source 
* Fix: Exec Process deadlock

WaitForExit should have been called after all other methods are called on the process

* Non-blocking standard output stream parsing

* Force buffer flush for non-infinite timeout
This commit is contained in:
Avinesh Singh
2024-02-02 03:23:23 +05:30
committed by GitHub
parent 37d8e3d81a
commit 140d7de7be
1 changed files with 22 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -5,6 +5,7 @@ using System.Diagnostics;
using System.Net; using System.Net;
using System.Runtime.InteropServices; using System.Runtime.InteropServices;
using System.Security.Cryptography.X509Certificates; using System.Security.Cryptography.X509Certificates;
using System.Text;
namespace k8s namespace k8s
{ {
@@ -537,12 +538,29 @@ namespace k8s
try try
{ {
if (!process.WaitForExit((int)(ExecTimeout.TotalMilliseconds))) var output = new StringBuilder();
process.OutputDataReceived += (_, args) =>
{
if (args.Data != null)
{
output.Append(args.Data);
}
};
process.BeginOutputReadLine();
if (!process.WaitForExit((int)ExecTimeout.TotalMilliseconds))
{ {
throw new KubeConfigException("external exec failed due to timeout"); throw new KubeConfigException("external exec failed due to timeout");
} }
var responseObject = KubernetesJson.Deserialize<ExecCredentialResponse>(process.StandardOutput.ReadToEnd()); // Force flush the output buffer to avoid case of missing data
if (ExecTimeout != Timeout.InfiniteTimeSpan)
{
process.WaitForExit();
}
var responseObject = KubernetesJson.Deserialize<ExecCredentialResponse>(output.ToString());
if (responseObject == null || responseObject.ApiVersion != config.ApiVersion) if (responseObject == null || responseObject.ApiVersion != config.ApiVersion)
{ {
throw new KubeConfigException( throw new KubeConfigException(
@@ -553,11 +571,9 @@ namespace k8s
{ {
return responseObject; return responseObject;
} }
else
{
throw new KubeConfigException($"external exec failed missing token or clientCertificateData field in plugin output"); throw new KubeConfigException($"external exec failed missing token or clientCertificateData field in plugin output");
} }
}
catch (JsonException ex) catch (JsonException ex)
{ {
throw new KubeConfigException($"external exec failed due to failed deserialization process: {ex}"); throw new KubeConfigException($"external exec failed due to failed deserialization process: {ex}");