add WebSocket server certificate validation for net452 (#231)
* fix a race condition. when multiple call to GetStream happens around the same time, on the same inputIndex, a race condition will cause this.buffers.Add() to throw exception. * add WebSocket server certificate validation support for net 452
This commit is contained in:
committed by
Kubernetes Prow Robot
parent
05273b7db7
commit
29b066286f
@@ -8,6 +8,9 @@ using System.Linq;
|
||||
using System.Net;
|
||||
using System.Net.Http;
|
||||
using System.Net.WebSockets;
|
||||
#if NET452
|
||||
using System.Net.Security;
|
||||
#endif
|
||||
using System.Security.Cryptography.X509Certificates;
|
||||
using System.Threading;
|
||||
using System.Threading.Tasks;
|
||||
@@ -256,6 +259,13 @@ namespace k8s
|
||||
}
|
||||
}
|
||||
|
||||
#if NET452
|
||||
if (this.CaCert != null)
|
||||
{
|
||||
webSocketBuilder.SetServerCertificateValidationCallback(this.ServerCertificateValidationCallback);
|
||||
}
|
||||
#endif
|
||||
|
||||
#if NETCOREAPP2_1
|
||||
if (this.CaCert != null)
|
||||
{
|
||||
@@ -336,8 +346,21 @@ namespace k8s
|
||||
{
|
||||
ServiceClientTracing.Exit(invocationId, null);
|
||||
}
|
||||
#if NET452
|
||||
if (this.CaCert != null)
|
||||
{
|
||||
webSocketBuilder.CleanupServerCertificateValidationCallback(this.ServerCertificateValidationCallback);
|
||||
}
|
||||
#endif
|
||||
}
|
||||
return webSocket;
|
||||
}
|
||||
|
||||
#if NET452
|
||||
internal bool ServerCertificateValidationCallback(object sender, X509Certificate certificate, X509Chain chain, SslPolicyErrors sslPolicyErrors)
|
||||
{
|
||||
return Kubernetes.CertificateValidationCallBack(sender, this.CaCert, certificate, chain, sslPolicyErrors);
|
||||
}
|
||||
#endif
|
||||
}
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user