dohertj2/jdescopingtool
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

refactor(securestore): remove password-based authentication in favor of key-file only

Browse Source 
Simplify SecureStore by removing MasterKeyEnvVar and password-based methods, leaving only key-file authentication for better security practices.
This commit is contained in:
Joseph Doherty
2026-01-23 00:17:19 -05:00
parent 9c4a184233
commit 1b7bb26def
22 changed files with 101 additions and 1421 deletions
Download Patch File Download Diff File Expand all files Collapse all files
NEW/tests/JdeScoping.SecureStoreManager.Tests/ViewModels/DialogViewModelTests.cs
+3 -195
View File
@@ -12,7 +12,6 @@ public class NewStoreDialogViewModelTests
// Arrange
var sut = new NewStoreDialogViewModel();
sut.StorePath = string.Empty;
sut.UseKeyFile = true;
sut.KeyFilePath = "/path/to/key.key";
// Act & Assert
@@ -20,12 +19,11 @@ public class NewStoreDialogViewModelTests
}
[Fact]
public void IsValid_WhenUseKeyFileButKeyFilePathEmpty_ReturnsFalse()
public void IsValid_WhenKeyFilePathEmpty_ReturnsFalse()
{
// Arrange
var sut = new NewStoreDialogViewModel();
sut.StorePath = "/path/to/store.json";
sut.UseKeyFile = true;
sut.KeyFilePath = string.Empty;
// Act & Assert
@@ -33,87 +31,17 @@ public class NewStoreDialogViewModelTests
}
[Fact]
public void IsValid_WhenUsePasswordButPasswordEmpty_ReturnsFalse()
public void IsValid_WithValidConfiguration_ReturnsTrue()
{
// Arrange
var sut = new NewStoreDialogViewModel();
sut.StorePath = "/path/to/store.json";
sut.UsePassword = true;
sut.Password = string.Empty;
// Act & Assert
sut.IsValid.ShouldBeFalse();
}
[Fact]
public void IsValid_WhenPasswordsDoNotMatch_ReturnsFalse()
{
// Arrange
var sut = new NewStoreDialogViewModel();
sut.StorePath = "/path/to/store.json";
sut.UsePassword = true;
sut.Password = "password123";
sut.ConfirmPassword = "different456";
// Act & Assert
sut.IsValid.ShouldBeFalse();
}
[Fact]
public void IsValid_WithValidKeyFileConfiguration_ReturnsTrue()
{
// Arrange
var sut = new NewStoreDialogViewModel();
sut.StorePath = "/path/to/store.json";
sut.UseKeyFile = true;
sut.KeyFilePath = "/path/to/key.key";
// Act & Assert
sut.IsValid.ShouldBeTrue();
}
[Fact]
public void IsValid_WithValidPasswordConfiguration_ReturnsTrue()
{
// Arrange
var sut = new NewStoreDialogViewModel();
sut.StorePath = "/path/to/store.json";
sut.UsePassword = true;
sut.Password = "password123";
sut.ConfirmPassword = "password123";
// Act & Assert
sut.IsValid.ShouldBeTrue();
}
[Fact]
public void UseKeyFile_WhenSetToTrue_SetsUsePasswordToFalse()
{
// Arrange
var sut = new NewStoreDialogViewModel();
sut.UsePassword = true;
// Act
sut.UseKeyFile = true;
// Assert
sut.UsePassword.ShouldBeFalse();
}
[Fact]
public void UsePassword_WhenSetToTrue_SetsUseKeyFileToFalse()
{
// Arrange
var sut = new NewStoreDialogViewModel();
sut.UseKeyFile = true;
// Act
sut.UsePassword = true;
// Assert
sut.UseKeyFile.ShouldBeFalse();
}
[Fact]
public void ValidationError_WhenStorePathEmpty_ReturnsAppropriateMessage()
{
@@ -131,47 +59,18 @@ public class NewStoreDialogViewModelTests
// Arrange
var sut = new NewStoreDialogViewModel();
sut.StorePath = "/path/to/store.json";
sut.UseKeyFile = true;
sut.KeyFilePath = string.Empty;
// Act & Assert
sut.ValidationError.ShouldBe("Key file path is required.");
}
[Fact]
public void ValidationError_WhenPasswordEmpty_ReturnsAppropriateMessage()
{
// Arrange
var sut = new NewStoreDialogViewModel();
sut.StorePath = "/path/to/store.json";
sut.UsePassword = true;
sut.Password = string.Empty;
// Act & Assert
sut.ValidationError.ShouldBe("Password is required.");
}
[Fact]
public void ValidationError_WhenPasswordsDoNotMatch_ReturnsAppropriateMessage()
{
// Arrange
var sut = new NewStoreDialogViewModel();
sut.StorePath = "/path/to/store.json";
sut.UsePassword = true;
sut.Password = "password123";
sut.ConfirmPassword = "different456";
// Act & Assert
sut.ValidationError.ShouldBe("Passwords do not match.");
}
[Fact]
public void ValidationError_WhenValid_ReturnsNull()
{
// Arrange
var sut = new NewStoreDialogViewModel();
sut.StorePath = "/path/to/store.json";
sut.UseKeyFile = true;
sut.KeyFilePath = "/path/to/key.key";
// Act & Assert
@@ -193,85 +92,17 @@ public class OpenStoreDialogViewModelTests
}
[Fact]
public void IsValid_WhenUseKeyFileButKeyFilePathEmpty_ReturnsFalse()
public void IsValid_WhenKeyFilePathEmpty_ReturnsFalse()
{
// Arrange
var sut = new OpenStoreDialogViewModel();
sut.StorePath = "/path/to/store.json";
sut.UseKeyFile = true;
sut.KeyFilePath = string.Empty;
// Act & Assert
sut.IsValid.ShouldBeFalse();
}
[Fact]
public void IsValid_WhenUsePasswordButPasswordEmpty_ReturnsFalse()
{
// Arrange
var sut = new OpenStoreDialogViewModel();
sut.StorePath = "/path/to/store.json";
sut.UsePassword = true;
sut.Password = string.Empty;
// Act & Assert
sut.IsValid.ShouldBeFalse();
}
[Fact]
public void IsValid_WithValidKeyFileConfiguration_ReturnsTrue()
{
// Arrange
var sut = new OpenStoreDialogViewModel();
sut.StorePath = "/path/to/store.json";
sut.UseKeyFile = true;
sut.KeyFilePath = "/path/to/key.key";
// Act & Assert
sut.IsValid.ShouldBeTrue();
}
[Fact]
public void IsValid_WithValidPasswordConfiguration_ReturnsTrue()
{
// Arrange
var sut = new OpenStoreDialogViewModel();
sut.StorePath = "/path/to/store.json";
sut.UsePassword = true;
sut.Password = "password123";
// Act & Assert
sut.IsValid.ShouldBeTrue();
}
[Fact]
public void UseKeyFile_WhenSetToTrue_SetsUsePasswordToFalse()
{
// Arrange
var sut = new OpenStoreDialogViewModel();
sut.UsePassword = true;
// Act
sut.UseKeyFile = true;
// Assert
sut.UsePassword.ShouldBeFalse();
}
[Fact]
public void UsePassword_WhenSetToTrue_SetsUseKeyFileToFalse()
{
// Arrange
var sut = new OpenStoreDialogViewModel();
sut.UseKeyFile = true;
// Act
sut.UsePassword = true;
// Assert
sut.UseKeyFile.ShouldBeFalse();
}
[Fact]
public void ValidationError_WhenStorePathEmpty_ReturnsAppropriateMessage()
{
@@ -303,7 +134,6 @@ public class OpenStoreDialogViewModelTests
{
var sut = new OpenStoreDialogViewModel();
sut.StorePath = tempFile;
sut.UseKeyFile = true;
sut.KeyFilePath = string.Empty;
// Act & Assert
@@ -324,7 +154,6 @@ public class OpenStoreDialogViewModelTests
{
var sut = new OpenStoreDialogViewModel();
sut.StorePath = tempFile;
sut.UseKeyFile = true;
sut.KeyFilePath = "/nonexistent/key.key";
// Act & Assert
@@ -335,27 +164,6 @@ public class OpenStoreDialogViewModelTests
File.Delete(tempFile);
}
}
[Fact]
public void ValidationError_WhenPasswordEmpty_ReturnsAppropriateMessage()
{
// Arrange - Create temp store file so we get past that validation
var tempFile = Path.GetTempFileName();
try
{
var sut = new OpenStoreDialogViewModel();
sut.StorePath = tempFile;
sut.UsePassword = true;
sut.Password = string.Empty;
// Act & Assert
sut.ValidationError.ShouldBe("Password is required.");
}
finally
{
File.Delete(tempFile);
}
}
}
public class SecretEditDialogViewModelTests
NEW/tests/JdeScoping.SecureStoreManager.Tests/ViewModels/MainWindowViewModelTests.cs
+2 -32
View File
@@ -97,27 +97,12 @@ public class MainWindowViewModelTests
_mockStoreManager.GetKeys().Returns(new List<string>().AsReadOnly());
// Act
await _sut.CreateNewStoreAsync(storePath, keyPath, null);
await _sut.CreateNewStoreAsync(storePath, keyPath);
// Assert
_mockStoreManager.Received(1).CreateStore(storePath, keyPath);
}
[Fact]
public async Task CreateNewStoreAsync_WithPassword_CallsStoreManagerCreateStoreWithPassword()
{
// Arrange
var storePath = "/path/to/store.json";
var password = "password123";
_mockStoreManager.GetKeys().Returns(new List<string>().AsReadOnly());
// Act
await _sut.CreateNewStoreAsync(storePath, null, password);
// Assert
_mockStoreManager.Received(1).CreateStoreWithPassword(storePath, password);
}
[Fact]
public async Task OpenExistingStoreAsync_WithKeyFile_CallsStoreManagerOpenStore()
{
@@ -127,27 +112,12 @@ public class MainWindowViewModelTests
_mockStoreManager.GetKeys().Returns(new List<string>().AsReadOnly());
// Act
await _sut.OpenExistingStoreAsync(storePath, keyPath, null);
await _sut.OpenExistingStoreAsync(storePath, keyPath);
// Assert
_mockStoreManager.Received(1).OpenStore(storePath, keyPath);
}
[Fact]
public async Task OpenExistingStoreAsync_WithPassword_CallsStoreManagerOpenStoreWithPassword()
{
// Arrange
var storePath = "/path/to/store.json";
var password = "password123";
_mockStoreManager.GetKeys().Returns(new List<string>().AsReadOnly());
// Act
await _sut.OpenExistingStoreAsync(storePath, null, password);
// Assert
_mockStoreManager.Received(1).OpenStoreWithPassword(storePath, password);
}
[Fact]
public async Task SaveSecretAsync_CallsStoreManagerSetSecret()
{