Added namespace parameter validation. #4

ernstc · Nov 18, 2023 · 69fcb57 · 69fcb57
1 parent c123314
commit 69fcb57
Show file tree

Hide file tree

Showing 3 changed files with 24 additions and 0 deletions.
diff --git a/src/dotnet-ylt/Commands/AddCalculatorCommand.cs b/src/dotnet-ylt/Commands/AddCalculatorCommand.cs
@@ -34,6 +34,10 @@ public async Task<int> OnExecute()
             if (Namespace != null)
             {
                 Namespace = Namespace.Replace('/', '.').Replace('\\', '.');
+                if (!ValidateNamespace(Namespace))
+                {
+                    return 1;
+                }
             }
 
             XDocument xProj = XDocument.Load(projectFile);

diff --git a/src/dotnet-ylt/Commands/AddParserCommand.cs b/src/dotnet-ylt/Commands/AddParserCommand.cs
@@ -35,6 +35,10 @@ public async Task<int> OnExecute()
             if (Namespace != null)
             {
                 Namespace = Namespace.Replace('/', '.').Replace('\\', '.');
+                if (!ValidateNamespace(Namespace))
+                {
+                    return 1;
+                }
             }
 
             XDocument xProj = XDocument.Load(projectFile);

diff --git a/src/dotnet-ylt/Commands/CommandBase.cs b/src/dotnet-ylt/Commands/CommandBase.cs
@@ -3,6 +3,7 @@
 using System.Diagnostics;
 using System.IO;
 using System.Linq;
+using System.Text.RegularExpressions;
 using System.Xml.Linq;
 using YaccLexTools.Utilities;
 
@@ -13,6 +14,21 @@ namespace DotnetYaccLexTools.Commands
     public abstract class CommandBase
     {
 
+        protected readonly Regex _namespaceRegex = new Regex(@"^[a-zA-Z_][a-zA-Z\d_]*(\.[a-zA-Z_][a-zA-Z\d_]*)*$", RegexOptions.Compiled);
+
+
+        protected bool ValidateNamespace(string @namespace)
+        {
+            if (!_namespaceRegex.IsMatch(@namespace))
+            {
+                Console.Error.WriteLine("Namespace is not valid.");
+                return false;
+            }
+
+            return true;
+        }
+
+
         protected string? GetProjectFile()
         {
             var projectFiles = Directory.GetFiles(".", "*.csproj");