Add certificate validation

faridprogrammer · faridprogrammer · commit 36d15631fc24 · 2022-01-24T12:40:32.000+03:30
diff --git a/.gitignore b/.gitignore
@@ -2,3 +2,4 @@
 obj/Release
 obj
 .vs
+Properties/PublishProfiles/FolderProfile.pubxml.user
diff --git a/FetchFolderCommand.cs b/FetchFolderCommand.cs
@@ -32,6 +32,20 @@ public override void Execute()
                 if (EnablePassive)
                     ftpClient.DataConnectionType = FtpDataConnectionType.AutoPassive;
 
+                ftpClient.ValidateCertificate += (control, args) =>
+                {
+                    Console.BackgroundColor = ConsoleColor.DarkGreen;
+                    Console.WriteLine("Certificate to validate: " + args?.Certificate?.GetCertHashString());
+                    Console.ResetColor();
+
+                    if (!string.IsNullOrEmpty(Certificate))
+                    {
+                        var isValid = args.Certificate.GetCertHashString()?.ToUpper() == Certificate.Replace(":", "").ToUpper();
+                        if (!isValid)
+                            throw new InvalidOperationException();
+                    }
+                };
+
                 ftpClient.Connect();
 
                 var listing = ftpClient.GetNameListing(Path);
@@ -55,5 +69,6 @@ public override void Execute()
             }
 
         }
+
     }
 }
diff --git a/FileUploadCommand.cs b/FileUploadCommand.cs
@@ -39,6 +39,21 @@ public override void Execute()
                 if (EnablePassive)
                     ftpClient.DataConnectionType = FtpDataConnectionType.AutoPassive;
 
+
+                ftpClient.ValidateCertificate += (_, args) =>
+                {
+                    Console.BackgroundColor = ConsoleColor.DarkGreen;
+                    Console.WriteLine("Certificate to validate: " + args.Certificate.GetCertHashString());
+                    Console.ResetColor();
+
+                    if (!string.IsNullOrEmpty(Certificate))
+                    {
+                        var isValid = args.Certificate.GetCertHashString()?.ToUpper() == Certificate.Replace(":", "").ToUpper();
+                        if (!isValid)
+                            throw new InvalidOperationException();
+                    }
+                };
+
                 ftpClient.Connect();
 
                 var result = ftpClient.UploadFile(LocalFile, Path);
diff --git a/Ftp.Client.csproj b/Ftp.Client.csproj
@@ -1,13 +1,13 @@
 <Project Sdk="Microsoft.NET.Sdk">
-
-  <PropertyGroup>
-    <OutputType>Exe</OutputType>
-    <TargetFramework>net6.0</TargetFramework>
-  </PropertyGroup>
-
-  <ItemGroup>
-    <PackageReference Include="CommandLineParser" Version="2.8.0" />
-    <PackageReference Include="FluentFTP" Version="35.2.2" />
-  </ItemGroup>
-
+	<PropertyGroup>
+		<OutputType>Exe</OutputType>
+		<TargetFramework>net6.0</TargetFramework>
+		<AssemblyVersion>1.0.2</AssemblyVersion>
+		<FileVersion>1.0.2</FileVersion>
+		<version>1.0.2</version>
+	</PropertyGroup>
+	<ItemGroup>
+		<PackageReference Include="CommandLineParser" Version="2.8.0" />
+		<PackageReference Include="FluentFTP" Version="35.2.2" />
+	</ItemGroup>
 </Project>
diff --git a/FtpCommand.cs b/FtpCommand.cs
@@ -50,6 +50,12 @@ public string ExternalIp
         }
 
 
+        [Option('r', "certificate", Required = false, HelpText = "Certificate string. If this parameter has been set then the validation will occur.")]
+        public string Certificate
+        {
+            get;
+            set;
+        }
 
         public virtual void Execute()
         {
diff --git a/Properties/PublishProfiles/FolderProfile.pubxml.user b/Properties/PublishProfiles/FolderProfile.pubxml.user
diff --git a/README.md b/README.md
@@ -26,6 +26,8 @@ Currently there is two ftp commands available in the tool.
 
   -e, --external-ip    Set this parameter to your NAT outgoing IP if you are operating within a NAT
 
+  -r, --certificate    Certificate string. If this parameter has been set then the validation will occur.
+
   --help               Display this help screen.
 
   --version            Display version information.
@@ -44,8 +46,9 @@ Currently there is two ftp commands available in the tool.
 
   -v, --passive        Set true to enable passive mode
 
-  -e, --external-ip    Set this parameter to your NAT outgoing IP if you are
-                       operating within a NAT
+  -e, --external-ip    Set this parameter to your NAT outgoing IP if you are operating within a NAT
+
+  -r, --certificate    Certificate string. If this parameter has been set then the validation will occur.
 
   --help               Display this help screen.
 
@@ -60,7 +63,7 @@ In order to call simple ftp commands within this application (using dotnet) to t
 
 ## Download
 
-You can download the latest version [here](https://github.com/faridprogrammer/ftp.client/releases/tag/V1.0).
+You can download the latest version [here](https://github.com/faridprogrammer/ftp.client/releases/tag/V1.0.1).
 
 
 

Original file line number	Diff line number	Diff line change
`@@ -32,6 +32,20 @@ public override void Execute()`
`32`	`32`	`if (EnablePassive)`
`33`	`33`	`ftpClient.DataConnectionType = FtpDataConnectionType.AutoPassive;`
`34`	`34`
	`35`	`+ ftpClient.ValidateCertificate += (control, args) =>`
	`36`	`+ {`
	`37`	`+ Console.BackgroundColor = ConsoleColor.DarkGreen;`
	`38`	`+ Console.WriteLine("Certificate to validate: " + args?.Certificate?.GetCertHashString());`
	`39`	`+ Console.ResetColor();`
	`40`	`+`
	`41`	`+ if (!string.IsNullOrEmpty(Certificate))`
	`42`	`+ {`
	`43`	`+ var isValid = args.Certificate.GetCertHashString()?.ToUpper() == Certificate.Replace(":", "").ToUpper();`
	`44`	`+ if (!isValid)`
	`45`	`+ throw new InvalidOperationException();`
	`46`	`+ }`
	`47`	`+ };`
	`48`	`+`
`35`	`49`	`ftpClient.Connect();`
`36`	`50`
`37`	`51`	`var listing = ftpClient.GetNameListing(Path);`
`@@ -55,5 +69,6 @@ public override void Execute()`
`55`	`69`	`}`
`56`	`70`
`57`	`71`	`}`
	`72`	`+`
`58`	`73`	`}`
`59`	`74`	`}`
Original file line number	Diff line number	Diff line change
`@@ -50,6 +50,12 @@ public string ExternalIp`
`50`	`50`	`}`
`51`	`51`
`52`	`52`
	`53`	`+ [Option('r', "certificate", Required = false, HelpText = "Certificate string. If this parameter has been set then the validation will occur.")]`
	`54`	`+ public string Certificate`
	`55`	`+ {`
	`56`	`+ get;`
	`57`	`+ set;`
	`58`	`+ }`
`53`	`59`
`54`	`60`	`public virtual void Execute()`
`55`	`61`	`{`