Skip to content

Fix: Exec provider potential deadlock #1457

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
merged 3 commits into from
Feb 1, 2024
Merged

Fix: Exec provider potential deadlock #1457

Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
f3f1f03
Fix: Exec Process deadlock
avin3sh Nov 18, 2023
0380f95
Non-blocking standard output stream parsing
avin3sh Nov 20, 2023
6000c7b
Force buffer flush for non-infinite timeout
avin3sh Nov 28, 2023
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
28 changes: 22 additions & 6 deletions src/KubernetesClient/KubernetesClientConfiguration.ConfigFile.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,7 @@
using System.Net;
using System.Runtime.InteropServices;
using System.Security.Cryptography.X509Certificates;
using System.Text;

namespace k8s
{
Expand Down Expand Up @@ -537,12 +538,29 @@ public static ExecCredentialResponse ExecuteExternalCommand(ExternalExecution co

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");
}

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)
{
throw new KubeConfigException(
Expand All @@ -553,10 +571,8 @@ public static ExecCredentialResponse ExecuteExternalCommand(ExternalExecution co
{
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)
{
Expand Down