Added search for certifications

FrendsPlatform · Sep 12, 2023 · c76c67a · c76c67a
1 parent 76c276b
commit c76c67a
Show file tree

Hide file tree

Showing 3 changed files with 24 additions and 2 deletions.
diff --git a/Frends.FTP.DownloadFiles/CHANGELOG.md b/Frends.FTP.DownloadFiles/CHANGELOG.md
@@ -1,5 +1,9 @@
 # Changelog
 
+## [1.0.5] - 2023-09-12
+### Added
+- Added search for local certificates from machine certification store.
+
 ## [1.0.4] - 2023-08-08
 ### Changed
 - Moved client.EncryptionMode setting to be done if UseFTPS is enabled.

diff --git a/Frends.FTP.DownloadFiles/Frends.FTP.DownloadFiles/Definitions/FileTransporter.cs b/Frends.FTP.DownloadFiles/Frends.FTP.DownloadFiles/Definitions/FileTransporter.cs
@@ -145,7 +145,25 @@ private static FtpClient CreateFtpClient(Connection connect)
             };
 
             if (connect.EnableClientAuth)
-                client.ClientCertificates.Add(new X509Certificate2(connect.ClientCertificatePath));
+            {
+                if (!string.IsNullOrEmpty(connect.ClientCertificatePath))
+                {
+                    client.ClientCertificates.Add(new X509Certificate2(connect.ClientCertificatePath));
+                }
+                else
+                {
+                    X509Store store = new X509Store(StoreName.My, StoreLocation.LocalMachine);
+                    try
+                    {
+                        store.Open(OpenFlags.ReadOnly);
+                        client.ClientCertificates.AddRange(store.Certificates);
+                    }
+                    finally
+                    {
+                        store.Close();
+                    }
+                }
+            }
 
             client.ValidateCertificate += (control, e) =>
             {

diff --git a/Frends.FTP.DownloadFiles/Frends.FTP.DownloadFiles/Frends.FTP.DownloadFiles.csproj b/Frends.FTP.DownloadFiles/Frends.FTP.DownloadFiles/Frends.FTP.DownloadFiles.csproj
@@ -11,7 +11,7 @@
     <IncludeSource>true</IncludeSource>
     <PackageTags>Frends</PackageTags>
     <GenerateDocumentationFile>true</GenerateDocumentationFile>
-    <Version>1.0.4</Version>
+    <Version>1.0.5</Version>
     <Description>Task for downloading files from FTP(S) servers.</Description>
   </PropertyGroup>