tweaks change

qiuhaotc · Dec 24, 2020 · 55d9f3e · 55d9f3e
1 parent f2dbdd6
commit 55d9f3e
Show file tree

Hide file tree

Showing 3 changed files with 8 additions and 3 deletions.
diff --git a/src/WebSSH/Client/Pages/RemoteShell.razor b/src/WebSSH/Client/Pages/RemoteShell.razor
@@ -128,7 +128,7 @@
                 }
                 else
                 {
-                    StaticUtils.AddOutputString(UniqueId, Environment.NewLine + "Not conneted");
+                    StaticUtils.AddOutputString(UniqueId, Environment.NewLine + "Not connected");
                 }
             }
             catch (Exception ex)

diff --git a/src/WebSSH/Server/Common/ServerActiveSessionsModel.cs b/src/WebSSH/Server/Common/ServerActiveSessionsModel.cs
@@ -9,14 +9,16 @@ namespace WebSSH.Server
 {
     public class ServerActiveSessionsModel
     {
-        public ServerActiveSessionModel Connected(ActiveSessionModel activeSessionModel)
+        public ServerActiveSessionModel Connected(ActiveSessionModel activeSessionModel, ShellConfiguration shellConfiguration)
         {
             SshClient sshClient = null;
             ShellStream shellStream = null;
             try
             {
+                var timeOutMinutes = shellConfiguration.MaxIdleMinutes < 1 ? 1 : shellConfiguration.MaxIdleMinutes > 20 ? 20 : shellConfiguration.MaxIdleMinutes;
                 var clientStoredSessionModel = activeSessionModel.StoredSessionModel;
                 sshClient = new SshClient(clientStoredSessionModel.Host, clientStoredSessionModel.Port, clientStoredSessionModel.UserName, clientStoredSessionModel.PasswordDecryped);
+                sshClient.ConnectionInfo.Timeout = TimeSpan.FromMinutes(timeOutMinutes);
                 sshClient.Connect();
                 shellStream = sshClient.CreateShellStream("Terminal", 80, 30, 800, 400, 1000);
                 var outputQueue = new ConcurrentQueue<string>();

diff --git a/src/WebSSH/Server/Common/ShellPool.cs b/src/WebSSH/Server/Common/ShellPool.cs
@@ -38,9 +38,12 @@ public ShellPool(ShellConfiguration shellConfiguration)
                     }
                 }
             });
+
+            ShellConfiguration = shellConfiguration;
         }
 
         static ConcurrentDictionary<string, ServerActiveSessionsModel> ShellPoolDictionary { get; set; } = new ConcurrentDictionary<string, ServerActiveSessionsModel>();
+        public ShellConfiguration ShellConfiguration { get; }
 
         public void AddShellToPool(string sessionId, ActiveSessionModel activeSessionModel)
         {
@@ -50,7 +53,7 @@ public void AddShellToPool(string sessionId, ActiveSessionModel activeSessionMod
                 ShellPoolDictionary.TryAdd(sessionId, sessionsModel);
             }
 
-            sessionsModel.Connected(activeSessionModel);
+            sessionsModel.Connected(activeSessionModel, ShellConfiguration);
         }
 
         public void RunShellCommand(string sessionId, Guid uniqueId, string command)