Revert "Only run the cert validation on 45 or netstandard 2.0"

This reverts commit 6dcf543.
exceptionless · Sep 4, 2018 · 3ea7632 · 3ea7632
1 parent 6dcf543
commit 3ea7632
Show file tree

Hide file tree

Showing 5 changed files with 15 additions and 21 deletions.
diff --git a/build/sourcelink.props b/build/sourcelink.props
@@ -4,6 +4,6 @@
   </PropertyGroup>
 
   <ItemGroup>
-    <PackageReference Include="SourceLink.Embed.AllSourceFiles" Version="2.8.3" PrivateAssets="all" />
+    <PackageReference Include="SourceLink.Embed.AllSourceFiles" Version="2.8.1" PrivateAssets="all" />
   </ItemGroup>
 </Project>
diff --git a/src/Exceptionless/Configuration/CertificateData.cs b/src/Exceptionless/Configuration/CertificateData.cs
@@ -1,5 +1,4 @@
-#if NET45 || NETSTANDARD2_0
-using System;
+#if !PORTABLE && !NETSTANDARD1_2
 using System.Net.Http;
 using System.Net.Security;
 using System.Security.Cryptography.X509Certificates;
@@ -44,7 +43,9 @@ private CertificateData(X509Chain chain, SslPolicyErrors sslPolicyErrors) {
         /// An object that contains state information for this validation.
         /// </summary>
         public object Sender { get; }
-#else
+#endif
+
+#if !NET45 && !PORTABLE && !NETSTANDARD1_2
         /// <summary>
         /// The request which was sent to the remore party
         /// </summary>

diff --git a/src/Exceptionless/Configuration/ExceptionlessConfiguration.cs b/src/Exceptionless/Configuration/ExceptionlessConfiguration.cs
@@ -277,7 +277,7 @@ public int SubmissionBatchSize {
             }
         }
 
-#if NET45 || NETSTANDARD2_0
+#if !PORTABLE && !NETSTANDARD1_2
         /// <summary>
         /// Callback which is invoked to validate the exceptionless server certificate.
         /// </summary>

diff --git a/src/Exceptionless/Extensions/ExceptionlessConfigurationExtensions.cs b/src/Exceptionless/Extensions/ExceptionlessConfigurationExtensions.cs
@@ -436,17 +436,15 @@ private static string GetEnvironmentalVariable(string name) {
         }
 #endif
 
-#if NET45 || NETSTANDARD2_0
+#if !PORTABLE && !NETSTANDARD1_2
         /// <summary>
         /// Add a custom server certificate validation against the thumbprint of the server certificate.
         /// </summary>
         /// <param name="config">The configuration object you want to apply the attribute settings to.</param>
         /// <param name="thumbprint">Thumbprint of the server certificate. <example>e.g. "86481791CDAF6D7A02BEE9A649EA9F84DE84D22C"</example></param>
         public static void TrustCertificateThumbprint(this ExceptionlessConfiguration config, string thumbprint) {
             config.ServerCertificateValidationCallback = x => {
-                if (x.SslPolicyErrors == SslPolicyErrors.None)
-                    return true;
-
+                if (x.SslPolicyErrors == SslPolicyErrors.None) return true;
                 return x.Certificate != null && thumbprint != null && thumbprint.Equals(x.Certificate.Thumbprint, StringComparison.OrdinalIgnoreCase);
             };
         }
@@ -458,17 +456,12 @@ public static void TrustCertificateThumbprint(this ExceptionlessConfiguration co
         /// <param name="thumbprint">Thumbprint of the ca certificate. <example>e.g. "afe5d244a8d1194230ff479fe2f897bbcd7a8cb4"</example></param>
         public static void TrustCAThumbprint(this ExceptionlessConfiguration config, string thumbprint) {
             config.ServerCertificateValidationCallback = x => {
-                if (x.SslPolicyErrors == SslPolicyErrors.None)
-                    return true;
-
-                if (x.Chain == null || thumbprint == null)
-                    return false;
-
+                if (x.SslPolicyErrors == SslPolicyErrors.None) return true;
+                if (x.Chain == null || thumbprint == null) return false;
                 foreach (var ca in x.Chain.ChainElements) {
                     if (thumbprint.Equals(ca.Certificate.Thumbprint, StringComparison.OrdinalIgnoreCase))
                         return true;
                 }
-
                 return false;
             };
         }

diff --git a/src/Exceptionless/Submission/DefaultSubmissionClient.cs b/src/Exceptionless/Submission/DefaultSubmissionClient.cs
@@ -4,7 +4,7 @@
 using System.Net;
 using System.Net.Http;
 using System.Net.Http.Headers;
-#if NET45 || NETSTANDARD2_0
+#if NET45 || (!PORTABLE && !NETSTANDARD1_2)
 using System.Net.Security;
 using System.Security.Cryptography.X509Certificates;
 #endif
@@ -130,13 +130,13 @@ protected virtual HttpClient CreateHttpClient(ExceptionlessConfiguration config)
 #else
             var handler = new HttpClientHandler { UseDefaultCredentials = true };
 #endif
-#if NET45 || NETSTANDARD2_0
+#if !PORTABLE && !NETSTANDARD1_2
             var callback = config.ServerCertificateValidationCallback;
             if (callback != null) {
 #if NET45
-                handler.ServerCertificateValidationCallback = (s,c,ch,p) => Validate(s,c,ch,p,callback);
+                handler.ServerCertificateValidationCallback = (s,c,ch,p)=>Validate(s,c,ch,p,callback);
 #else
-                handler.ServerCertificateCustomValidationCallback = (m,c,ch,p) => Validate(m,c,ch,p,callback);
+                handler.ServerCertificateCustomValidationCallback = (m,c,ch,p)=>Validate(m,c,ch,p,callback);
 #endif
             }
 #endif
@@ -157,7 +157,7 @@ protected virtual HttpClient CreateHttpClient(ExceptionlessConfiguration config)
             return client;
         }
 
-#if NET45 || NETSTANDARD2_0
+#if !PORTABLE && !NETSTANDARD1_2
 #if NET45
         private bool Validate(object sender, X509Certificate certificate, X509Chain chain, SslPolicyErrors sslPolicyErrors, Func<CertificateData, bool> callback) {
             var certData = new CertificateData(sender, certificate, chain, sslPolicyErrors);