Move Existing ServerCertificateValidation Classes to Shared

opentelemetry-dotnet-contrib.sln

@@ -283,6 +283,9 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Shared", "Shared", "{1FCC8E
 		src\Shared\PropertyFetcher.cs = src\Shared\PropertyFetcher.cs
 		src\Shared\ResourceSemanticConventions.cs = src\Shared\ResourceSemanticConventions.cs
 		src\Shared\SemanticConventions.cs = src\Shared\SemanticConventions.cs
+		src\Shared\ServerCertificateValidationEventSource.cs = src\Shared\ServerCertificateValidationEventSource.cs
+		src\Shared\ServerCertificateValidationHandler.cs = src\Shared\ServerCertificateValidationHandler.cs
+		src\Shared\ServerCertificateValidationProvider.cs = src\Shared\ServerCertificateValidationProvider.cs
 		src\Shared\ServiceProviderExtensions.cs = src\Shared\ServiceProviderExtensions.cs
 		src\Shared\SpanAttributeConstants.cs = src\Shared\SpanAttributeConstants.cs
 		src\Shared\SpanHelper.cs = src\Shared\SpanHelper.cs

src/OpenTelemetry.ResourceDetectors.AWS/AWSEKSResourceDetector.cs

@@ -7,7 +7,6 @@
 using System.Collections.Generic;
 using System.Net.Http;
 using System.Text;
-using OpenTelemetry.ResourceDetectors.AWS.Http;
 using OpenTelemetry.ResourceDetectors.AWS.Models;
 using OpenTelemetry.Resources;
 
@@ -31,7 +30,7 @@ public sealed class AWSEKSResourceDetector : IResourceDetector
     public Resource Detect()
     {
         var credentials = GetEKSCredentials(AWSEKSCredentialPath);
-        using var httpClientHandler = Handler.Create(AWSEKSCertificatePath);
+        using var httpClientHandler = ServerCertificateValidationHandler.Create(AWSEKSCertificatePath);
 
         if (credentials == null || !IsEKSProcess(credentials, httpClientHandler))
         {

src/OpenTelemetry.ResourceDetectors.AWS/AWSResourcesEventSource.cs

@@ -26,10 +26,4 @@ public void FailedToExtractResourceAttributes(string format, string exception)
     {
         this.WriteEvent(3, format, exception);
     }
-
-    [Event(2, Message = "Failed to validate certificate in format: '{0}', error: '{1}'.", Level = EventLevel.Warning)]
-    public void FailedToValidateCertificate(string format, string error)
-    {
-        this.WriteEvent(4, format, error);
-    }
 }

src/OpenTelemetry.ResourceDetectors.AWS/OpenTelemetry.ResourceDetectors.AWS.csproj

@@ -23,6 +23,9 @@
 
   <ItemGroup>
     <Compile Include="$(RepoRoot)\src\Shared\Guard.cs" Link="Includes\Guard.cs" />
+    <Compile Include="$(RepoRoot)\src\Shared\ServerCertificateValidationHandler.cs" Link="Includes\ServerCertificateValidationHandler.cs" />
+    <Compile Include="$(RepoRoot)\src\Shared\ServerCertificateValidationProvider.cs" Link="Includes\ServerCertificateValidationProvider.cs" />
+    <Compile Include="$(RepoRoot)\src\Shared\ServerCertificateValidationEventSource.cs" Link="Includes\ServerCertificateValidationEventSource.cs" />
   </ItemGroup>
 
 </Project>

src/Shared/ServerCertificateValidationEventSource.cs

@@ -0,0 +1,28 @@
+// Copyright The OpenTelemetry Authors
+// SPDX-License-Identifier: Apache-2.0
+
+#if !NETFRAMEWORK
+
+using System.Diagnostics.Tracing;
+
+namespace OpenTelemetry.ResourceDetectors;
+
+[EventSource(Name = "OpenTelemetry-ResourceDetectors-Http")]
+internal class ServerCertificateValidationEventSource : EventSource
+{
+    public static ServerCertificateValidationEventSource Log = new();
+
+    [Event(1, Message = "Failed to extract resource attributes in '{0}'.", Level = EventLevel.Warning)]
+    public void FailedToExtractResourceAttributes(string format, string exception)
+    {
+        this.WriteEvent(3, format, exception);
+    }
+
+    [Event(2, Message = "Failed to validate certificate in format: '{0}', error: '{1}'.", Level = EventLevel.Warning)]
+    public void FailedToValidateCertificate(string format, string error)
+    {
+        this.WriteEvent(4, format, error);
+    }
+}
+
+#endif

src/Shared/ServerCertificateValidationHandler.cs

@@ -0,0 +1,42 @@
+// Copyright The OpenTelemetry Authors
+// SPDX-License-Identifier: Apache-2.0
+
+#if !NETFRAMEWORK
+
+using System;
+using System.Net.Http;
+using OpenTelemetry.Internal;
+
+namespace OpenTelemetry.ResourceDetectors;
+
+internal class ServerCertificateValidationHandler
+{
+    public static HttpClientHandler? Create(string certificateFile)
+    {
+        try
+        {
+            ServerCertificateValidationProvider? serverCertificateValidationProvider = ServerCertificateValidationProvider.FromCertificateFile(certificateFile);
+
+            if (serverCertificateValidationProvider == null)
+            {
+                ServerCertificateValidationEventSource.Log.FailedToValidateCertificate(nameof(ServerCertificateValidationHandler), "Failed to Load the certificate file into trusted collection");
+                return null;
+            }
+
+            var clientHandler = new HttpClientHandler
+            {
+                ServerCertificateCustomValidationCallback =
+                (sender, x509Certificate2, x509Chain, sslPolicyErrors) =>
+                    serverCertificateValidationProvider.ValidationCallback(sender, x509Certificate2, x509Chain, sslPolicyErrors),
+            };
+            return clientHandler;
+        }
+        catch (Exception ex)
+        {
+            ServerCertificateValidationEventSource.Log.FailedToExtractResourceAttributes($"{nameof(ServerCertificateValidationHandler)} : Failed to create HttpClientHandler", ex.ToInvariantString());
+        }
+
+        return null;
+    }
+}
+#endif