Fixed a crash in pool name check.

jexuswebserver · Mar 23, 2019 · f09c918 · f09c918
1 parent be060bb
commit f09c918
Show file tree

Hide file tree

Showing 2 changed files with 14 additions and 2 deletions.
diff --git a/JexusManager.Shared/StringUtility.cs b/JexusManager.Shared/StringUtility.cs
@@ -11,15 +11,15 @@ namespace JexusManager
 {
     public static class StringUtility
     {
-        public static string Combine(this IEnumerable<string> item, string connector)
+        public static string Combine<T>(this IEnumerable<T> item, string connector)
         {
             var preConditions = item.ToList();
             if (preConditions.Count == 0)
             {
                 return string.Empty;
             }
 
-            var result = new StringBuilder(preConditions[0]);
+            var result = new StringBuilder(preConditions[0].ToString());
             for (int index = 1; index < preConditions.Count; index++)
             {
                 result.Append(connector).Append(preConditions[index]);

diff --git a/JexusManager/Features/Main/ApplicationPoolBasicSettingsDialog.cs b/JexusManager/Features/Main/ApplicationPoolBasicSettingsDialog.cs
@@ -56,9 +56,21 @@ public ApplicationPoolBasicSettingsDialog(IServiceProvider serviceProvider, Appl
                         {
                             ShowMessage("An application pool with this name already exists.", MessageBoxButtons.OK, MessageBoxIcon.Error, MessageBoxDefaultButton.Button1);
                             txtName.Focus();
+                            txtName.SelectAll();
                             return;
                         }
 
+                        foreach (var ch in ApplicationPoolCollection.InvalidApplicationPoolNameCharacters())
+                        {
+                            if (txtName.Text.Contains(ch))
+                            {
+                                ShowMessage($"The application pool name cannot contain the following characters: {ApplicationPoolCollection.InvalidApplicationPoolNameCharacters().Combine(", ")}.", MessageBoxButtons.OK, MessageBoxIcon.Error, MessageBoxDefaultButton.Button1);
+                                txtName.Focus();
+                                txtName.SelectAll();
+                                return;
+                            }
+                        }
+
                         Pool = collection.Add(txtName.Text);
                     }
                     else