fix: address code-quality path and disposal findings

ColDog5044 · ColDog5044 · commit 8ddcdc67123f · 2026-06-23T21:05:52.000-04:00
diff --git a/ColDogLocker.Avalonia.Tests/ViewModels/MainWindowViewModelTests.cs b/ColDogLocker.Avalonia.Tests/ViewModels/MainWindowViewModelTests.cs
@@ -195,7 +195,7 @@ internal static ObservableCollection<LockerItemViewModel> CreateLockers()
                 {
                     Guid = System.Guid.NewGuid().ToString(),
                     Name = "Alpha",
-                    Location = Path.Combine(Path.DirectorySeparatorChar.ToString(), "vault", "alpha"),
+                    Location = $"{Path.DirectorySeparatorChar}{Path.Join("vault", "alpha")}",
                     IsLocked = false,
                     LastModified = new DateTime(2026, 1, 2, 0, 0, 0, DateTimeKind.Utc),
                     Size = 200
@@ -204,7 +204,7 @@ internal static ObservableCollection<LockerItemViewModel> CreateLockers()
                 {
                     Guid = System.Guid.NewGuid().ToString(),
                     Name = "Beta",
-                    Location = Path.Combine(Path.DirectorySeparatorChar.ToString(), "archive", "beta"),
+                    Location = $"{Path.DirectorySeparatorChar}{Path.Join("archive", "beta")}",
                     IsLocked = true,
                     LastModified = new DateTime(2026, 1, 1, 0, 0, 0, DateTimeKind.Utc),
                     Size = 100
diff --git a/ColDogLocker.Avalonia.Tests/Views/DialogHeadlessTests.cs b/ColDogLocker.Avalonia.Tests/Views/DialogHeadlessTests.cs
@@ -113,7 +113,7 @@ public void SettingsDialog_TracksChangesAndEnablesSave()
         private static string CreateSafeLockerPath()
         {
             var profile = Environment.GetFolderPath(Environment.SpecialFolder.UserProfile);
-            return Path.Combine(profile, "Documents", "ColDogLockerHeadless", "HeadlessLocker");
+            return Path.Join(profile, "Documents", "ColDogLockerHeadless", "HeadlessLocker");
         }
 
         private static T RequiredControl<T>(Control root, string name) where T : Control
diff --git a/ColDogLocker.Avalonia/Views/Dialogs/ErrorDialog.cs b/ColDogLocker.Avalonia/Views/Dialogs/ErrorDialog.cs
@@ -84,7 +84,7 @@ private async void OpenLogsButton_Click(object? sender, RoutedEventArgs e)
             try
             {
                 var logsPath = Path.GetDirectoryName(Logger.GetCurrentLogFilePath())
-                               ?? Path.Combine(AppPaths.LocalConfig, "logs");
+                               ?? Path.Join(AppPaths.LocalConfig, "logs");
                 AppFilePermissions.EnsurePrivateDirectory(logsPath);
 
                 if (_platformService != null)
diff --git a/ColDogLocker.Avalonia/Views/Dialogs/SettingsDialog.cs b/ColDogLocker.Avalonia/Views/Dialogs/SettingsDialog.cs
@@ -192,7 +192,7 @@ private async void CheckForUpdates_Click(object? sender, RoutedEventArgs e)
         private async void OpenLogsFolder_Click(object? sender, RoutedEventArgs e)
         {
             var logsPath = Path.GetDirectoryName(Logger.GetCurrentLogFilePath())
-                           ?? Path.Combine(AppPaths.LocalConfig, "logs");
+                           ?? Path.Join(AppPaths.LocalConfig, "logs");
             await OpenFolderAsync(logsPath, "Failed to open logs folder");
         }
 
diff --git a/ColDogLocker.Cli.Tests/CommandHelpTests.cs b/ColDogLocker.Cli.Tests/CommandHelpTests.cs
@@ -51,7 +51,7 @@ public void ShowCommandHelp_ForUnknownCommand_PrintsCompleteCommandList()
 
         private static string CaptureOutput(Action action)
         {
-            var outputWriter = new StringWriter();
+            using var outputWriter = new StringWriter();
             var originalOutput = Console.Out;
 
             try
diff --git a/ColDogLocker.Cli.Tests/GuiLauncherTests.cs b/ColDogLocker.Cli.Tests/GuiLauncherTests.cs
@@ -57,7 +57,7 @@ public void Launch_WhenLinuxInstalledGuiExists_StartsOptExecutable()
         [Fact]
         public void Launch_WhenLinuxInstalledGuiIsMissing_ReturnsExecutableNotFoundError()
         {
-            var errorWriter = new StringWriter();
+            using var errorWriter = new StringWriter();
             var originalError = Console.Error;
 
             try
@@ -102,7 +102,7 @@ public void GetCandidatePaths_WhenUnixSourceBuild_UsesUnixExecutableName()
         [Fact]
         public void Launch_WhenProcessCannotStart_ReturnsFailure()
         {
-            var baseDirectory = Path.Combine(Path.GetTempPath(), $"cdlocker-gui-launcher-tests-{Guid.NewGuid():N}");
+            var baseDirectory = Path.Join(Path.GetTempPath(), $"cdlocker-gui-launcher-tests-{Guid.NewGuid():N}");
             var expectedExecutable = Path.GetFullPath(Path.Combine(baseDirectory, "ColDogLocker"));
             var environment = CreateEnvironment(
                 isMacOS: false,
@@ -147,7 +147,7 @@ public void Launch_WhenMacOsInstalledAppExists_StartsAppBundleExecutable()
         [Fact]
         public void Launch_WhenMacOsInstalledAppIsMissing_ReturnsExecutableNotFoundError()
         {
-            var errorWriter = new StringWriter();
+            using var errorWriter = new StringWriter();
             var originalError = Console.Error;
 
             try
@@ -171,7 +171,7 @@ public void Launch_WhenMacOsInstalledAppIsMissing_ReturnsExecutableNotFoundError
         [Fact]
         public void GetCandidatePaths_WhenSourceTreeAndInstalledFallbackExist_PrefersSourceTreeBeforeInstalledFallback()
         {
-            var sourceRoot = Path.Combine(Path.GetTempPath(), $"cdlocker-source-{Guid.NewGuid():N}");
+            var sourceRoot = Path.Join(Path.GetTempPath(), $"cdlocker-source-{Guid.NewGuid():N}");
             var baseDirectory = Path.Combine(sourceRoot, "ColDogLocker.Cli", "bin", "Debug", "net10.0");
             var sourceCandidate = Path.Combine(sourceRoot, "ColDogLocker.Avalonia", "bin", "Debug", "net10.0", "ColDogLocker");
             var environment = CreateEnvironment(
@@ -202,7 +202,7 @@ private static GuiLauncherEnvironment CreateEnvironment(
         {
             return new GuiLauncherEnvironment
             {
-                BaseDirectory = baseDirectory ?? Path.Combine(Path.GetTempPath(), $"cdlocker-gui-launcher-tests-{Guid.NewGuid():N}"),
+                BaseDirectory = baseDirectory ?? Path.Join(Path.GetTempPath(), $"cdlocker-gui-launcher-tests-{Guid.NewGuid():N}"),
                 IsMacOS = isMacOS,
                 IsLinux = isLinux,
                 IsWindows = isWindows,
diff --git a/ColDogLocker.Cli.Tests/LockerCommandsTests.cs b/ColDogLocker.Cli.Tests/LockerCommandsTests.cs
@@ -0,0 +1,31 @@
+using ColDogStudios.ColDogLocker.Cli.Commands;
+
+namespace ColDogStudios.ColDogLocker.Cli.Tests
+{
+    public sealed class LockerCommandsTests
+    {
+        [Theory]
+        [InlineData("bad/name", "Locker name must be a valid file name")]
+        [InlineData("..", "Locker name must be a valid file name")]
+        [InlineData("", "Locker name cannot be empty")]
+        public void New_WithInvalidLockerName_ReturnsErrorBeforeCreatingLocker(string lockerName, string expectedError)
+        {
+            using var errorWriter = new StringWriter();
+            var originalError = Console.Error;
+
+            try
+            {
+                Console.SetError(errorWriter);
+
+                var exitCode = LockerCommands.New(["new", lockerName, "--password", "ValidPassword123!"]);
+
+                Assert.Equal(1, exitCode);
+                Assert.Contains(expectedError, errorWriter.ToString());
+            }
+            finally
+            {
+                Console.SetError(originalError);
+            }
+        }
+    }
+}
diff --git a/ColDogLocker.Cli/Commands/LockerCommands.cs b/ColDogLocker.Cli/Commands/LockerCommands.cs
@@ -49,6 +49,13 @@ public static int New(string[] args)
                 return 1;
             }
 
+            var lockerNameValidationError = ValidateLockerName(lockerName);
+            if (lockerNameValidationError != null)
+            {
+                Console.Error.WriteLine($"Error: {lockerNameValidationError}");
+                return 1;
+            }
+
             string? customPath = null;
             string? providedPassword = null;
 
@@ -69,8 +76,8 @@ public static int New(string[] args)
 
             // Determine locker location
             var lockerLocation = customPath is not null
-                ? Path.Combine(customPath, lockerName)
-                : Path.Combine(AppPaths.CdlDir, lockerName);
+                ? Path.Join(customPath, lockerName)
+                : Path.Join(AppPaths.CdlDir, lockerName);
 
             // Validate path is not protected
             var pathValidationError = LockerPathFilter.ValidatePath(lockerLocation);
@@ -163,6 +170,25 @@ public static int New(string[] args)
             }
         }
 
+        private static string? ValidateLockerName(string lockerName)
+        {
+            if (string.IsNullOrWhiteSpace(lockerName))
+            {
+                return "Locker name cannot be empty.";
+            }
+
+            var trimmedName = lockerName.Trim();
+            if (trimmedName.IndexOfAny(Path.GetInvalidFileNameChars()) >= 0 ||
+                trimmedName.Contains(Path.DirectorySeparatorChar) ||
+                trimmedName.Contains(Path.AltDirectorySeparatorChar) ||
+                trimmedName is "." or "..")
+            {
+                return "Locker name must be a valid file name, not a path.";
+            }
+
+            return null;
+        }
+
         #endregion
 
         #region Remove Locker
diff --git a/ColDogLocker.Core/Versioning/SemanticVersion.cs b/ColDogLocker.Core/Versioning/SemanticVersion.cs
@@ -197,21 +197,12 @@ public static bool TryParse(string version, out SemanticVersion result)
                     return false;
                 }
 
-                // Validate pre-release format (no leading zeros in numeric identifiers per semver spec)
-                if (preRelease != null)
+                var preReleaseParts = preRelease?.Split('.');
+                if (preReleaseParts?.Any(part => part.Length > 1 && part[0] == '0' && char.IsDigit(part[1])) == true)
                 {
-                    var parts = preRelease.Split('.');
-                    foreach (var part in parts)
-                    {
-                        // Reject numeric identifiers with leading zeros (except "0" itself)
-                        if (part.Length > 1 && part[0] == '0' && char.IsDigit(part[1]))
-                        {
-                            return false;
-                        }
-                    }
+                    return false;
                 }
 
-                var preReleaseParts = preRelease?.Split('.');
                 result = new SemanticVersion(major, minor, patch, preRelease, preReleaseParts);
                 return true;
             }
diff --git a/ColDogLocker.Services.Tests/Lockers/LockerArchiveServiceTests.cs b/ColDogLocker.Services.Tests/Lockers/LockerArchiveServiceTests.cs
@@ -283,7 +283,7 @@ public void Dispose()
 
             public static TestWorkspace Create()
             {
-                return new TestWorkspace(System.IO.Path.Combine(System.IO.Path.GetTempPath(), $"cdlocker-archive-tests-{Guid.NewGuid():N}"));
+                return new TestWorkspace(System.IO.Path.Join(System.IO.Path.GetTempPath(), $"cdlocker-archive-tests-{Guid.NewGuid():N}"));
             }
 
             public string CreateDirectory(string name)
diff --git a/ColDogLocker.Services.Tests/Lockers/LockerRepositoryTests.cs b/ColDogLocker.Services.Tests/Lockers/LockerRepositoryTests.cs
@@ -313,7 +313,7 @@ public void Dispose()
 
             public static TestDatabase Create()
             {
-                return new TestDatabase(System.IO.Path.Combine(System.IO.Path.GetTempPath(), $"cdlocker-tests-{Guid.NewGuid():N}"));
+                return new TestDatabase(System.IO.Path.Join(System.IO.Path.GetTempPath(), $"cdlocker-tests-{Guid.NewGuid():N}"));
             }
 
             public static TestDatabase CreateInitialized()
diff --git a/ColDogLocker.Services.Tests/Lockers/LockerServiceTests.cs b/ColDogLocker.Services.Tests/Lockers/LockerServiceTests.cs
@@ -32,7 +32,7 @@ public void Verify_NullLocker_ShouldThrowArgumentNullException()
         [Fact]
         public void AddLocker_WithInvalidName_ShouldThrowArgumentException()
         {
-            var locker = new LockerModel("bad/name", "hash", Path.Combine(Path.GetTempPath(), Guid.NewGuid().ToString()));
+            var locker = new LockerModel("bad/name", "hash", Path.Join(Path.GetTempPath(), Guid.NewGuid().ToString()));
 
             var exception = Assert.Throws<ArgumentException>(() => LockerService.AddLocker(locker));
 
@@ -63,7 +63,7 @@ public void DeleteLockerDirectory_WithMismatchedDirectoryName_ShouldThrowUnautho
         [Fact]
         public void RemoveLocker_WithLockedLocker_ShouldThrowInvalidOperationException()
         {
-            var locker = new LockerModel("Locked", "hash", Path.Combine(Path.GetTempPath(), Guid.NewGuid().ToString())) { IsLocked = true };
+            var locker = new LockerModel("Locked", "hash", Path.Join(Path.GetTempPath(), Guid.NewGuid().ToString())) { IsLocked = true };
 
             var exception = Assert.Throws<InvalidOperationException>(() => LockerService.RemoveLocker(locker));
 
@@ -73,7 +73,7 @@ public void RemoveLocker_WithLockedLocker_ShouldThrowInvalidOperationException()
         [Fact]
         public void Verify_MissingDirectory_ShouldReturnInvalidResult()
         {
-            var locker = new LockerModel("Missing", "hash", Path.Combine(Path.GetTempPath(), Guid.NewGuid().ToString()));
+            var locker = new LockerModel("Missing", "hash", Path.Join(Path.GetTempPath(), Guid.NewGuid().ToString()));
 
             var result = LockerService.Verify(locker);
 
diff --git a/ColDogLocker.Services.Tests/Security/EncryptionHelperTests.cs b/ColDogLocker.Services.Tests/Security/EncryptionHelperTests.cs
@@ -41,7 +41,9 @@ public void Dispose()
 
             public static TestDirectory Create()
             {
-                var path = System.IO.Path.Combine(System.IO.Path.GetTempPath(), $"cdlocker-encryption-tests-{Guid.NewGuid():N}");
+                var directoryName = $"cdlocker-encryption-tests-{Guid.NewGuid():N}";
+                var safeDirectoryName = System.IO.Path.GetFileName(directoryName) ?? directoryName;
+                var path = System.IO.Path.Combine(System.IO.Path.GetTempPath(), safeDirectoryName);
                 Directory.CreateDirectory(path);
                 return new TestDirectory(path);
             }
diff --git a/ColDogLocker.Services.Tests/Updates/UpdateServiceTests.cs b/ColDogLocker.Services.Tests/Updates/UpdateServiceTests.cs
@@ -652,7 +652,7 @@ private static string Sha256Hex(byte[] bytes)
 
         private static string CreateTempDirectory()
         {
-            var path = Path.Combine(Path.GetTempPath(), $"cdl-update-tests-{Guid.NewGuid():N}");
+            var path = Path.Join(Path.GetTempPath(), $"cdl-update-tests-{Guid.NewGuid():N}");
             Directory.CreateDirectory(path);
             return path;
         }
diff --git a/ColDogLocker.Services/Startup/AppInitializer.cs b/ColDogLocker.Services/Startup/AppInitializer.cs
@@ -48,7 +48,7 @@ public static async Task InitializeAsync()
                 throw new InvalidOperationException("Logs directory name must be a relative path segment.");
             }
 
-            var logsDirectoryPath = Path.Combine(AppPaths.LocalConfig, logsDirectoryName);
+            var logsDirectoryPath = Path.Join(AppPaths.LocalConfig, logsDirectoryName);
             var createdLogsDirectory = !Directory.Exists(logsDirectoryPath);
             AppFilePermissions.EnsurePrivateDirectory(logsDirectoryPath);
             if (createdLogsDirectory)
diff --git a/ColDogLocker.Services/Updates/UpdateInstaller.cs b/ColDogLocker.Services/Updates/UpdateInstaller.cs
@@ -309,10 +309,21 @@ private bool HasGraphicalAuthSession()
 
         private static bool CommandExists(string command)
         {
+            if (string.IsNullOrWhiteSpace(command))
+            {
+                return false;
+            }
+
+            var candidate = Path.GetFileName(command);
+            if (string.IsNullOrWhiteSpace(candidate))
+            {
+                return false;
+            }
+
             var paths = (Environment.GetEnvironmentVariable("PATH") ?? string.Empty)
                 .Split(Path.PathSeparator, StringSplitOptions.RemoveEmptyEntries | StringSplitOptions.TrimEntries);
 
-            return paths.Any(path => File.Exists(Path.Combine(path, command)));
+            return paths.Any(path => File.Exists(Path.Combine(path, candidate)));
         }
 
         private static bool IsRunningAsAdministrator()
diff --git a/ColDogLocker.Tui/Views/DevMenu.cs b/ColDogLocker.Tui/Views/DevMenu.cs
@@ -49,7 +49,7 @@ public static void Show()
 
             Console.WriteLine($"\nLocal Config Location: {AppPaths.LocalConfig}");
             Console.WriteLine($"Current Directory: {AppPaths.CdlDir}");
-            var logPath = Path.Combine(AppPaths.LocalConfig, "logs");
+            var logPath = Path.Join(AppPaths.LocalConfig, "logs");
             Console.WriteLine($"Log Directory: {logPath}");
             Console.WriteLine($"Log Directory Exists: {Directory.Exists(logPath)}");
 

Original file line number	Diff line number	Diff line change
`@@ -113,7 +113,7 @@ public void SettingsDialog_TracksChangesAndEnablesSave()`
`113`	`113`	`private static string CreateSafeLockerPath()`
`114`	`114`	`{`
`115`	`115`	`var profile = Environment.GetFolderPath(Environment.SpecialFolder.UserProfile);`
`116`		`- return Path.Combine(profile, "Documents", "ColDogLockerHeadless", "HeadlessLocker");`
	`116`	`+ return Path.Join(profile, "Documents", "ColDogLockerHeadless", "HeadlessLocker");`
`117`	`117`	`}`
`118`	`118`
`119`	`119`	`private static T RequiredControl<T>(Control root, string name) where T : Control`
Original file line number	Diff line number	Diff line change
`@@ -84,7 +84,7 @@ private async void OpenLogsButton_Click(object? sender, RoutedEventArgs e)`
`84`	`84`	`try`
`85`	`85`	`{`
`86`	`86`	`var logsPath = Path.GetDirectoryName(Logger.GetCurrentLogFilePath())`
`87`		`- ?? Path.Combine(AppPaths.LocalConfig, "logs");`
	`87`	`+ ?? Path.Join(AppPaths.LocalConfig, "logs");`
`88`	`88`	`AppFilePermissions.EnsurePrivateDirectory(logsPath);`
`89`	`89`
`90`	`90`	`if (_platformService != null)`
Original file line number	Diff line number	Diff line change
`@@ -192,7 +192,7 @@ private async void CheckForUpdates_Click(object? sender, RoutedEventArgs e)`
`192`	`192`	`private async void OpenLogsFolder_Click(object? sender, RoutedEventArgs e)`
`193`	`193`	`{`
`194`	`194`	`var logsPath = Path.GetDirectoryName(Logger.GetCurrentLogFilePath())`
`195`		`- ?? Path.Combine(AppPaths.LocalConfig, "logs");`
	`195`	`+ ?? Path.Join(AppPaths.LocalConfig, "logs");`
`196`	`196`	`await OpenFolderAsync(logsPath, "Failed to open logs folder");`
`197`	`197`	`}`
`198`	`198`
Original file line number	Diff line number	Diff line change
`@@ -51,7 +51,7 @@ public void ShowCommandHelp_ForUnknownCommand_PrintsCompleteCommandList()`
`51`	`51`
`52`	`52`	`private static string CaptureOutput(Action action)`
`53`	`53`	`{`
`54`		`- var outputWriter = new StringWriter();`
	`54`	`+ using var outputWriter = new StringWriter();`
`55`	`55`	`var originalOutput = Console.Out;`
`56`	`56`
`57`	`57`	`try`
Original file line number	Diff line number	Diff line change
`@@ -197,21 +197,12 @@ public static bool TryParse(string version, out SemanticVersion result)`
`197`	`197`	`return false;`
`198`	`198`	`}`
`199`	`199`
`200`		`- // Validate pre-release format (no leading zeros in numeric identifiers per semver spec)`
`201`		`- if (preRelease != null)`
	`200`	`+ var preReleaseParts = preRelease?.Split('.');`
	`201`	`+ if (preReleaseParts?.Any(part => part.Length > 1 && part[0] == '0' && char.IsDigit(part[1])) == true)`
`202`	`202`	`{`
`203`		`- var parts = preRelease.Split('.');`
`204`		`- foreach (var part in parts)`
`205`		`- {`
`206`		`- // Reject numeric identifiers with leading zeros (except "0" itself)`
`207`		`- if (part.Length > 1 && part[0] == '0' && char.IsDigit(part[1]))`
`208`		`- {`
`209`		`- return false;`
`210`		`- }`
`211`		`- }`
	`203`	`+ return false;`
`212`	`204`	`}`
`213`	`205`
`214`		`- var preReleaseParts = preRelease?.Split('.');`
`215`	`206`	`result = new SemanticVersion(major, minor, patch, preRelease, preReleaseParts);`
`216`	`207`	`return true;`
`217`	`208`	`}`
Original file line number	Diff line number	Diff line change
`@@ -283,7 +283,7 @@ public void Dispose()`
`283`	`283`
`284`	`284`	`public static TestWorkspace Create()`
`285`	`285`	`{`
`286`		`- return new TestWorkspace(System.IO.Path.Combine(System.IO.Path.GetTempPath(), $"cdlocker-archive-tests-{Guid.NewGuid():N}"));`
	`286`	`+ return new TestWorkspace(System.IO.Path.Join(System.IO.Path.GetTempPath(), $"cdlocker-archive-tests-{Guid.NewGuid():N}"));`
`287`	`287`	`}`
`288`	`288`
`289`	`289`	`public string CreateDirectory(string name)`