diff --git a/ExternalPlugins/SppSecrets/PluginDescriptor.cs b/ExternalPlugins/SppSecrets/PluginDescriptor.cs
index ae9cc31b..21c92e4f 100644
--- a/ExternalPlugins/SppSecrets/PluginDescriptor.cs
+++ b/ExternalPlugins/SppSecrets/PluginDescriptor.cs
@@ -238,18 +238,26 @@ private bool StoreCredential(string assetName, string accountName, string payloa
}
}
+ var secretSaved = false;
switch (AssignedCredentialType)
{
case CredentialType.Password:
- SaveAccountPassword(account, payload);
+ secretSaved = SaveAccountPassword(account, payload);
break;
case CredentialType.SshKey:
- SaveAccountSshKey(account, payload);
+ secretSaved = SaveAccountSshKey(account, payload);
break;
case CredentialType.ApiKey:
- SaveAccountApiKey(account, payload);
+ secretSaved = SaveAccountApiKey(account, payload);
break;
}
+
+ if (!secretSaved)
+ {
+ // No need to log here as the specific save method already logged the error.
+ return false;
+ }
+
Logger.Information($"The secret for {assetName}-{accountName} has been successfully stored in the vault.");
// Look up A2A Registration and create one if needed.
@@ -273,52 +281,56 @@ private bool StoreCredential(string assetName, string accountName, string payloa
}
}
- private void SaveAccountPassword(Account account, string password)
+ private bool SaveAccountPassword(Account account, string password)
{
if (_sppConnection == null)
- return;
+ return false;
try
{
var result = _sppConnection.InvokeMethodFull(Service.Core, Method.Put, $"AssetAccounts/{account.Id}/Password", $"\"{password}\"");
- if (result.StatusCode != HttpStatusCode.NoContent)
+ if (result.StatusCode == HttpStatusCode.NoContent)
{
- Logger.Error(
- $"Failed to save the password for asset {account.Asset.Name} account {account.Name}");
+ return true;
}
+
+ Logger.Error($"Failed to save the password for asset {account.Asset.Name} account {account.Name}");
}
catch (Exception ex)
{
- Logger.Error(ex,
- $"Failed to save the password for asset {account.Asset.Name} account {account.Name}: {ex.Message}");
+ Logger.Error(ex, $"Failed to save the password for asset {account.Asset.Name} account {account.Name}: {ex.Message}");
}
+
+ return false;
}
- private void SaveAccountSshKey(Account account, string sshKey)
+ private bool SaveAccountSshKey(Account account, string sshKey)
{
if (_sppConnection == null)
- return;
+ return false;
try
{
var result = _sppConnection.InvokeMethodFull(Service.Core, Method.Put, $"AssetAccounts/{account.Id}/SshKey", $"{{\"PrivateKey\":\"{sshKey.ReplaceLineEndings(string.Empty)}\"}}");
- if (result.StatusCode != HttpStatusCode.OK)
+ if (result.StatusCode == HttpStatusCode.OK)
{
- Logger.Error(
- $"Failed to save the SSH key for asset {account.Asset.Name} account {account.Name}");
+ return true;
}
+
+ Logger.Error($"Failed to save the SSH key for asset {account.Asset.Name} account {account.Name}");
}
catch (Exception ex)
{
- Logger.Error(ex,
- $"Failed to save the SSH key for asset {account.Asset.Name} account {account.Name}: {ex.Message}");
+ Logger.Error(ex, $"Failed to save the SSH key for asset {account.Asset.Name} account {account.Name}: {ex.Message}");
}
+
+ return false;
}
- private void SaveAccountApiKey(Account account, string apiKeyJson)
+ private bool SaveAccountApiKey(Account account, string apiKeyJson)
{
if (_sppConnection == null)
- return;
+ return false;
try
{
@@ -332,29 +344,31 @@ private void SaveAccountApiKey(Account account, string apiKeyJson)
if (apiKey == null)
{
Logger.Information($"Failed to store the API key secret due to a failure to create the API key for the account {account.Name}.");
- return;
+ return false;
}
}
var result = _sppConnection.InvokeMethodFull(Service.Core, Method.Put,
$"AssetAccounts/{account.Id}/ApiKeys/{newApiKey.Id}/ClientSecret", apiKeyJson);
- if (result.StatusCode != HttpStatusCode.NoContent)
+ if (result.StatusCode == HttpStatusCode.NoContent)
{
- Logger.Error(
- $"Failed to save the API key secret for account {account.Name} API key {apiKey.Name} to {DisplayName}.");
+ return true;
}
+
+ Logger.Error($"Failed to save the API key secret for account {account.Name} API key {apiKey.Name} to {DisplayName}.");
}
else
{
Logger.Error($"The ApiKey {apiKey.Name} failed to save to {DisplayName}.");
}
-
}
catch (Exception ex)
{
Logger.Error(ex,
$"Failed to save the Api key for account {account.Name} to {DisplayName}: {ex.Message}");
}
+
+ return false;
}
private bool CheckOrAddExternalA2aRegistration()
diff --git a/ExternalPlugins/SppSecrets/README.md b/ExternalPlugins/SppSecrets/README.md
index dd2ef300..79886569 100644
--- a/ExternalPlugins/SppSecrets/README.md
+++ b/ExternalPlugins/SppSecrets/README.md
@@ -7,7 +7,7 @@ The Safeguard for Privileged Passwords plugin allows Secrets Broker to pull pass
### Downstream SPP configuration requirements
* Create a local SPP user that will be used by Secrets Broker to manage the A2A registration and accounts group in the downstream SPP appliance.
- * Assign policy admin permissions to the new SPP user.
+ * Assign asset admin and policy admin permissions to the new SPP user.
* This user name will be entered as the ```SPP user``` in the configuration of the SPPtoSPP Secrets Broker plugin.
* Create an A2A certificate with ```Client Authentication``` attribute.
* Install the A2A certificate with private key .pfx in the ```Local Computer``` certificate store of the Secrets Broker server.
@@ -29,4 +29,4 @@ The Safeguard for Privileged Passwords plugin allows Secrets Broker to pull pass
* **SPP User** - Downstream user name of an SPP local user with policy admin permissions.
* **SPP A2A Registration Name** - Name of the downstream A2A registration that is used to provide A2A access to the credentials that are pushed by Secrets Broker.
* **SPP A2a Certificate User** - Downstream A2A certificate user.
-* **SPP Account Group** - Name of an account group for the credentials that are pushed by Secrets Broker.
+* **SPP Account Group** - (Optional) Name of an account group for the credentials that are pushed by Secrets Broker.
diff --git a/SafeguardDevOpsService/ClientApp/angular.json b/SafeguardDevOpsService/ClientApp/angular.json
index 89e45d98..2079799a 100644
--- a/SafeguardDevOpsService/ClientApp/angular.json
+++ b/SafeguardDevOpsService/ClientApp/angular.json
@@ -18,6 +18,7 @@
"builder": "@angular-devkit/build-angular:browser",
"options": {
"allowedCommonJsDependencies": [
+ "file-saver",
"moment-timezone",
"jquery",
"lodash"
diff --git a/SafeguardDevOpsService/ClientApp/package.json b/SafeguardDevOpsService/ClientApp/package.json
index 7fcc597a..5a49814b 100644
--- a/SafeguardDevOpsService/ClientApp/package.json
+++ b/SafeguardDevOpsService/ClientApp/package.json
@@ -5,6 +5,8 @@
"ng": "ng",
"start": "ng serve",
"build": "ng build",
+ "build-debug-windows": "ng build --optimization=false && npm run copy-dist-to-debug-windows",
+ "copy-dist-to-debug-windows": "xcopy dist\\* ..\\bin\\Debug\\ClientApp\\dist\\ /y /E",
"test": "ng test",
"lint": "ng lint",
"e2e": "ng e2e"
diff --git a/SafeguardDevOpsService/ClientApp/src/app/confirm-dialog/confirm-dialog.component.html b/SafeguardDevOpsService/ClientApp/src/app/confirm-dialog/confirm-dialog.component.html
index 935b983d..e8fc83f5 100644
--- a/SafeguardDevOpsService/ClientApp/src/app/confirm-dialog/confirm-dialog.component.html
+++ b/SafeguardDevOpsService/ClientApp/src/app/confirm-dialog/confirm-dialog.component.html
@@ -37,6 +37,7 @@