From d6cb191be5b8eddc98cf7c99ffed36e03fcff7a8 Mon Sep 17 00:00:00 2001 From: Xin Yan Date: Tue, 14 May 2019 09:43:18 -0700 Subject: [PATCH] add websocket auth support for .net standard 2.0 support (#281) * add websocket auth support for .net standard 2.0 support * format file --- src/KubernetesClient/Kubernetes.WebSocket.cs | 9 +++++---- src/KubernetesClient/WebSocketBuilder.cs | 4 ++-- 2 files changed, 7 insertions(+), 6 deletions(-) diff --git a/src/KubernetesClient/Kubernetes.WebSocket.cs b/src/KubernetesClient/Kubernetes.WebSocket.cs index 58cd95b..0aa354e 100644 --- a/src/KubernetesClient/Kubernetes.WebSocket.cs +++ b/src/KubernetesClient/Kubernetes.WebSocket.cs @@ -8,7 +8,7 @@ using System.Linq; using System.Net; using System.Net.Http; using System.Net.WebSockets; -#if NET452 +#if (NET452 || NETSTANDARD2_0) using System.Net.Security; #endif using System.Security.Cryptography.X509Certificates; @@ -281,7 +281,7 @@ namespace k8s } } -#if NET452 +#if (NET452 || NETSTANDARD2_0) if (this.CaCerts != null) { webSocketBuilder.SetServerCertificateValidationCallback(this.ServerCertificateValidationCallback); @@ -368,7 +368,8 @@ namespace k8s { ServiceClientTracing.Exit(invocationId, null); } -#if NET452 + +#if (NET452 || NETSTANDARD2_0) if (this.CaCerts != null) { webSocketBuilder.CleanupServerCertificateValidationCallback(this.ServerCertificateValidationCallback); @@ -378,7 +379,7 @@ namespace k8s return webSocket; } -#if NET452 +#if (NET452 || NETSTANDARD2_0) internal bool ServerCertificateValidationCallback(object sender, X509Certificate certificate, X509Chain chain, SslPolicyErrors sslPolicyErrors) { return Kubernetes.CertificateValidationCallBack(sender, this.CaCerts, certificate, chain, sslPolicyErrors); diff --git a/src/KubernetesClient/WebSocketBuilder.cs b/src/KubernetesClient/WebSocketBuilder.cs index 3e9ad3c..ec33eba 100644 --- a/src/KubernetesClient/WebSocketBuilder.cs +++ b/src/KubernetesClient/WebSocketBuilder.cs @@ -1,7 +1,7 @@ using System; using System.Collections.Generic; using System.Net.WebSockets; -#if NET452 +#if (NET452 || NETSTANDARD2_0) using System.Net.Security; #endif using System.Security.Cryptography.X509Certificates; @@ -39,7 +39,7 @@ namespace k8s return this; } -#if NET452 +#if (NET452 || NETSTANDARD2_0) public WebSocketBuilder SetServerCertificateValidationCallback(RemoteCertificateValidationCallback validationCallback) { System.Net.ServicePointManager.ServerCertificateValidationCallback += validationCallback;