Merge pull request #73 from Pranay265/fix-mqttrelay-IoTbroker-conn-wi…

…th-tls Add Option to Skip CA Certificate Validation in MTConnect Agent Configuration
TrakHound · Sep 26, 2024 · eb4952c · eb4952c
2 parents bf4c042 + 232c7b0
commit eb4952c
Show file tree

Hide file tree

Showing 3 changed files with 4 additions and 2 deletions.
diff --git a/agent/Modules/MTConnect.NET-AgentModule-MqttRelay/Module.cs b/agent/Modules/MTConnect.NET-AgentModule-MqttRelay/Module.cs
@@ -133,7 +133,7 @@ private async Task Worker()
                                 var certificateAuthorityResults = _configuration.Tls.GetCertificateAuthority();
 
                                 var certificates = new List<X509Certificate2>();
-                                if (certificateAuthorityResults.Certificate != null)
+                                if (certificateAuthorityResults.Certificate != null && _configuration.Tls.OmitCAValidation == false)
                                 {
                                     certificates.Add(certificateAuthorityResults.Certificate);
                                 }

diff --git a/libraries/MTConnect.NET-MQTT/Clients/MTConnectMqttClient.cs b/libraries/MTConnect.NET-MQTT/Clients/MTConnectMqttClient.cs
@@ -252,7 +252,7 @@ private async Task Worker()
                                 var certificateAuthorityResults = _configuration.Tls.GetCertificateAuthority();
 
                                 var certificates = new List<X509Certificate2>();
-                                if (certificateAuthorityResults.Certificate != null)
+                                if (certificateAuthorityResults.Certificate != null && _configuration.Tls.OmitCAValidation == false)
                                 {
                                     certificates.Add(certificateAuthorityResults.Certificate);
                                 }

diff --git a/libraries/MTConnect.NET-TLS/TlsConfiguration.cs b/libraries/MTConnect.NET-TLS/TlsConfiguration.cs
@@ -18,6 +18,8 @@ public class TlsConfiguration
         [JsonPropertyName("verifyClientCertificate")]
         public bool VerifyClientCertificate { get; set; }
 
+        [JsonPropertyName("omitCAValidation")]
+        public bool OmitCAValidation { get; set; }
 
 
         public CertificateLoadResult GetCertificate()