Add initial config for RemoteCertificateValidationCallback

rsr-maersk · Oct 2, 2023 · 3e3fd61 · 3e3fd61
1 parent 4d0b136
commit 3e3fd61
Show file tree

Hide file tree

Showing 4 changed files with 39 additions and 5 deletions.
diff --git a/...MassTransit.ActiveMqTransport/ActiveMqTransport/Configuration/ActiveMqHostConfigurator.cs b/...MassTransit.ActiveMqTransport/ActiveMqTransport/Configuration/ActiveMqHostConfigurator.cs
@@ -2,6 +2,7 @@ namespace MassTransit.ActiveMqTransport.Configuration
 {
     using System;
     using System.Collections.Generic;
+    using System.Net.Security;
 
 
     public class ActiveMqHostConfigurator :
@@ -14,7 +15,9 @@ public ActiveMqHostConfigurator(Uri address)
             _settings = new ConfigurationHostSettings(address);
 
             if (_settings.Port == 61617 || _settings.Host.EndsWith("amazonaws.com", StringComparison.OrdinalIgnoreCase))
-                UseSsl();
+                UseSsl(s =>
+                {
+                });
         }
 
         public ActiveMqHostSettings Settings => _settings;
@@ -28,12 +31,16 @@ public void Password(string password)
         {
             _settings.Password = password;
         }
-
-        public void UseSsl()
+         
+        public void UseSsl(Action<IActiveMqSslConfigurator> configureSsl)
         {
             _settings.UseSsl = true;
             if (_settings.Port == 61616)
                 _settings.Port = 61617;
+
+            var configurator = new ActiveMqSslConfigurator(_settings);
+            configureSsl(configurator);
+            _settings.CertificateValidationCallback = configurator.CertificateValidationCallback;
         }
 
         public void FailoverHosts(string[] hosts)
@@ -62,4 +69,26 @@ public void SetQueuePrefetchPolicy(int limit)
             _settings.TransportOptions["jms.prefetchPolicy.queuePrefetch"] = limit.ToString();
         }
     }
+
+
+    public class ActiveMqSslConfigurator : IActiveMqSslConfigurator
+    {
+        public ActiveMqSslConfigurator(ConfigurationHostSettings settings)
+        {
+            CertificateValidationCallback = settings.CertificateValidationCallback;
+        }
+
+        public RemoteCertificateValidationCallback CertificateValidationCallback { get; set; }
+    }
+
+
+    public interface IActiveMqSslConfigurator
+    {
+        /// <summary>
+        /// An optional client specified SSL certificate validation callback.  If this is not specified,
+        /// the default callback will be used in conjunction with the <see cref="P:RabbitMQ.Client.SslOption.AcceptablePolicyErrors" /> property to
+        /// determine if the remote server certificate is valid.
+        /// </summary>
+        RemoteCertificateValidationCallback CertificateValidationCallback { get; set; }
+    }
 }
diff --git a/...ansit.ActiveMqTransport/ActiveMqTransport/Configuration/ActiveMqRegistrationBusFactory.cs b/...ansit.ActiveMqTransport/ActiveMqTransport/Configuration/ActiveMqRegistrationBusFactory.cs
@@ -42,7 +42,7 @@ public override IBusInstance CreateBus(IBusRegistrationContext context, IEnumera
                     h.Password(options.Pass);
 
                 if (options.UseSsl)
-                    h.UseSsl();
+                    h.UseSsl(s => { });
             });
 
             return CreateBus(configurator, context, _configure, specifications);

diff --git a/...assTransit.ActiveMqTransport/ActiveMqTransport/Configuration/ConfigurationHostSettings.cs b/...assTransit.ActiveMqTransport/ActiveMqTransport/Configuration/ConfigurationHostSettings.cs
@@ -3,6 +3,7 @@ namespace MassTransit.ActiveMqTransport.Configuration
     using System;
     using System.Collections.Generic;
     using System.Linq;
+    using System.Net.Security;
     using Apache.NMS;
 
 
@@ -108,5 +109,7 @@ public override string ToString()
                 Port = Port
             }.Uri.ToString();
         }
+
+        public RemoteCertificateValidationCallback CertificateValidationCallback { get; set; }
     }
 }
diff --git a/src/Transports/MassTransit.ActiveMqTransport/Configuration/IActiveMqHostConfigurator.cs b/src/Transports/MassTransit.ActiveMqTransport/Configuration/IActiveMqHostConfigurator.cs
@@ -1,6 +1,8 @@
 namespace MassTransit
 {
+    using System;
     using System.Collections.Generic;
+    using ActiveMqTransport.Configuration;
 
 
     public interface IActiveMqHostConfigurator
@@ -17,7 +19,7 @@ public interface IActiveMqHostConfigurator
         /// <param name="password"></param>
         void Password(string password);
 
-        void UseSsl();
+        void UseSsl(Action<IActiveMqSslConfigurator> configureSsl);
 
         /// <summary>
         /// Sets a list of hosts to enable the failover transport