feature: support both password and PKI

* add PKIandPassword for auth * added global option PKIandPassword
emberstack · Aug 25, 2023 · 025fdac · 025fdac
1 parent 1ac83f7
commit 025fdac
Show file tree

Hide file tree

Showing 4 changed files with 7 additions and 1 deletion.
diff --git a/src/ES.SFTP/Configuration/ConfigurationService.cs b/src/ES.SFTP/Configuration/ConfigurationService.cs
@@ -68,6 +68,7 @@ private Task UpdateConfiguration()
         config.Global.Directories ??= new List<string>();
         config.Global.Logging ??= new LoggingDefinition();
         config.Global.Chroot ??= new ChrootDefinition();
+        config.Global.PKIandPassword ??= new string("");
         config.Global.HostKeys ??= new HostKeysDefinition();
         config.Global.Hooks ??= new HooksDefinition();
 

diff --git a/src/ES.SFTP/Configuration/Elements/GlobalConfiguration.cs b/src/ES.SFTP/Configuration/Elements/GlobalConfiguration.cs
@@ -7,6 +7,7 @@ public class GlobalConfiguration
     public LoggingDefinition Logging { get; set; } = new();
     public HostKeysDefinition HostKeys { get; set; } = new();
     public HooksDefinition Hooks { get; set; } = new();
+    public string PKIandPassword { get; set; }
 
     public string Ciphers { get; set; }
     public string HostKeyAlgorithms { get; set; }

diff --git a/src/ES.SFTP/SSH/Configuration/SSHConfiguration.cs b/src/ES.SFTP/SSH/Configuration/SSHConfiguration.cs
@@ -12,6 +12,7 @@ public class SSHConfiguration
     public string HostKeyAlgorithms { get; set; }
     public string KexAlgorithms { get; set; }
     public string MACs { get; set; }
+    public string PKIandPassword { get; set; }
 
     public override string ToString()
     {
@@ -44,6 +45,8 @@ public override string ToString()
         builder.AppendLine("# Allowed users");
         builder.AppendLine($"AllowUsers {string.Join(" ", AllowUsers)}");
         builder.AppendLine();
+        if (PKIandPassword == "true") builder.AppendLine("AuthenticationMethods \"publickey,password\"");
+        builder.AppendLine();
         builder.AppendLine("# Match blocks");
         foreach (var matchBlock in MatchBlocks)
         {

diff --git a/src/ES.SFTP/SSH/SSHService.cs b/src/ES.SFTP/SSH/SSHService.cs
@@ -64,7 +64,8 @@ private async Task UpdateConfiguration()
             Ciphers = sftpConfig.Global.Ciphers,
             HostKeyAlgorithms = sftpConfig.Global.HostKeyAlgorithms,
             KexAlgorithms = sftpConfig.Global.KexAlgorithms,
-            MACs = sftpConfig.Global.MACs
+            MACs = sftpConfig.Global.MACs,
+            PKIandPassword = sftpConfig.Global.PKIandPassword
         };
 
         var exceptionalUsers = sftpConfig.Users.Where(s => s.Chroot != null).ToList();