ab#59698

Author: leefine02

RemoteFile/External References/Renci.SshNet.dll

@@ -20,16 +20,13 @@
   </ItemGroup>
 
   <ItemGroup>
-    <PackageReference Include="BouncyCastle.Cryptography" Version="2.3.0" />
+    <PackageReference Include="BouncyCastle.Cryptography" Version="2.4.0" />
     <PackageReference Include="CliWrap" Version="3.6.6" />
     <PackageReference Include="Keyfactor.Logging" Version="1.1.1" />
     <PackageReference Include="Keyfactor.Orchestrators.IOrchestratorJobExtensions" Version="0.7.0" />
     <PackageReference Include="Keyfactor.PKI" Version="5.0.0" />
     <PackageReference Include="Microsoft.PowerShell.SDK" Version="7.2.12" />
-  </ItemGroup>
-
-  <ItemGroup>
-    <Folder Include="External References\" />
+    <PackageReference Include="SSH.NET" Version="2024.0.0" />
   </ItemGroup>
 
   <ItemGroup>

RemoteFile/External References/SshNet.Security.Cryptography.dll

@@ -76,6 +76,9 @@ public override void Initialize()
             {
                 sshClient = new SshClient(Connection);
                 sshClient.Connect();
+
+                //method call below necessary to check edge condition where password for user id has expired. SCP (and possibly SFTP) download hangs in that scenario
+                CheckConnection();
             }
             catch (Exception ex)
             {
@@ -146,7 +149,7 @@ public override string RunCommand(string commandText, object[] arguments, bool w
             catch (Exception ex)
             {
                 _logger.LogError($"Exception during RunCommand...{RemoteFileException.FlattenExceptionMessages(ex, ex.Message)}");
-                throw ex;
+                throw;
             }
         }
 
@@ -328,18 +331,18 @@ public override void CreateEmptyStoreFile(string path, string linuxFilePermissio
         {
             _logger.MethodEntry(LogLevel.Debug);
             string[] linuxGroupOwner = linuxFileOwner.Split(":");
-            string linuxFileGroup = linuxFileOwner;
+            string linuxFileGroup = String.Empty;
 
             if (linuxGroupOwner.Length == 2)
             {
                 linuxFileOwner = linuxGroupOwner[0];
-                linuxFileGroup = linuxGroupOwner[1];
+                linuxFileGroup = $"-g {linuxGroupOwner[1]}";
             }
 
             if (IsStoreServerLinux)
             {
                 AreLinuxPermissionsValid(linuxFilePermissions);
-                RunCommand($"install -m {linuxFilePermissions} -o {linuxFileOwner} -g {linuxFileGroup} /dev/null {path}", null, ApplicationSettings.UseSudo, null);
+                RunCommand($"install -m {linuxFilePermissions} -o {linuxFileOwner} {linuxFileGroup} /dev/null {path}", null, ApplicationSettings.UseSudo, null);
             }
             else
                 RunCommand($@"Out-File -FilePath ""{path}""", null, false, null);
@@ -431,5 +434,18 @@ private string FormatFTPPath(string path, bool addLeadingSlashForWindows)
 
             return rtnPath;
         }
+
+        private void CheckConnection()
+        {
+            try
+            {
+                RunCommand("echo", null, ApplicationSettings.UseSudo, null);
+            }
+            catch (Exception ex)
+            {
+                _logger.LogError(RemoteFileException.FlattenExceptionMessages(ex, "Error validating server connection."));
+                throw;
+            }
+        }
     }
 }