Fix not working certificate selection (#78)

* Pass the selected certificate (with password) from the UI to the internal MQTT client * Add MQTT specific words to spell checker dictionary.
chkr1011 · Feb 17, 2024 · fd296ad · fd296ad
1 parent bd05fa8
commit fd296ad
Show file tree

Hide file tree

Showing 2 changed files with 33 additions and 0 deletions.
diff --git a/Source/Services/Mqtt/MqttClientService.cs b/Source/Services/Mqtt/MqttClientService.cs
@@ -1,10 +1,13 @@
 using System;
 using System.Collections.Generic;
 using System.IO;
+using System.Net.Security;
 using System.Security.Authentication;
+using System.Security.Cryptography.X509Certificates;
 using System.Text;
 using System.Threading;
 using System.Threading.Tasks;
+using Avalonia.Controls;
 using Avalonia.Threading;
 using mqttMultimeter.Controls;
 using mqttMultimeter.Pages.Connection;
@@ -95,6 +98,27 @@ public async Task<MqttClientConnectResult> Connect(ConnectionItemViewModel item)
                 o.IgnoreCertificateChainErrors = item.ServerOptions.IgnoreCertificateErrors;
                 o.IgnoreCertificateRevocationErrors = item.ServerOptions.IgnoreCertificateErrors;
                 o.CertificateValidationHandler = item.ServerOptions.IgnoreCertificateErrors ? _ => true : null;
+
+                if (!string.IsNullOrEmpty(item.SessionOptions.CertificatePath))
+                {
+                    X509Certificate2Collection certificates = new();
+
+                    if (string.IsNullOrEmpty(item.SessionOptions.CertificatePassword))
+                    {
+                        certificates.Add(new X509Certificate2(item.SessionOptions.CertificatePath));
+                    }
+                    else
+                    {
+                        certificates.Add(new X509Certificate2(item.SessionOptions.CertificatePath, item.SessionOptions.CertificatePassword));
+                    }
+
+                    o.Certificates = certificates;
+                    o.ApplicationProtocols = new List<SslApplicationProtocol>
+                    {
+                        // TODO: Consider exposing this in the UI.
+                        new("mqtt")
+                    };
+                }
             });
         }
 

diff --git a/Source/mqttMultimeter.sln.DotSettings b/Source/mqttMultimeter.sln.DotSettings
@@ -241,5 +241,14 @@
 	<s:Boolean x:Key="/Default/Environment/SettingsMigration/IsMigratorApplied/=JetBrains_002EReSharper_002EPsi_002ECSharp_002ECodeStyle_002ESettingsUpgrade_002EAlwaysTreatStructAsNotReorderableMigration/@EntryIndexedValue">True</s:Boolean>
 	<s:Boolean x:Key="/Default/Environment/SettingsMigration/IsMigratorApplied/=JetBrains_002EReSharper_002EPsi_002ECSharp_002ECodeStyle_002ESettingsUpgrade_002EMigrateBlankLinesAroundFieldToBlankLinesAroundProperty/@EntryIndexedValue">True</s:Boolean>
 	<s:Boolean x:Key="/Default/UserDictionary/Words/=Avalonia/@EntryIndexedValue">True</s:Boolean>
+	<s:Boolean x:Key="/Default/UserDictionary/Words/=CONNACK/@EntryIndexedValue">True</s:Boolean>
+	<s:Boolean x:Key="/Default/UserDictionary/Words/=PINGREQ/@EntryIndexedValue">True</s:Boolean>
+	<s:Boolean x:Key="/Default/UserDictionary/Words/=PINGRESP/@EntryIndexedValue">True</s:Boolean>
+	<s:Boolean x:Key="/Default/UserDictionary/Words/=PUBACK/@EntryIndexedValue">True</s:Boolean>
+	<s:Boolean x:Key="/Default/UserDictionary/Words/=PUBCOMP/@EntryIndexedValue">True</s:Boolean>
+	<s:Boolean x:Key="/Default/UserDictionary/Words/=PUBREC/@EntryIndexedValue">True</s:Boolean>
+	<s:Boolean x:Key="/Default/UserDictionary/Words/=PUBREL/@EntryIndexedValue">True</s:Boolean>
+	<s:Boolean x:Key="/Default/UserDictionary/Words/=SUBACK/@EntryIndexedValue">True</s:Boolean>
 	<s:Boolean x:Key="/Default/UserDictionary/Words/=Tnet/@EntryIndexedValue">True</s:Boolean>
+	<s:Boolean x:Key="/Default/UserDictionary/Words/=UNSUBACK/@EntryIndexedValue">True</s:Boolean>
 	<s:Boolean x:Key="/Default/UserDictionary/Words/=Viewbox/@EntryIndexedValue">True</s:Boolean></wpf:ResourceDictionary>