upstream/vault
1
0
Fork 0
mirror of https://github.com/hashicorp/vault.git synced 2026-05-28 04:10:44 -04:00
Code Issues Projects Releases Packages Wiki Activity Actions 2

Sync Destination Edit Bug (#25222)

Browse source 
* fixes issue with editing sync destination and credentials being overwrittern with masked placeholder value

* addresses pr feedback
This commit is contained in:
Jordan Reimer 2024-02-05 14:10:57 -07:00 committed by GitHub
parent c1875ecf24
commit 84bba4e3b7
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
3 changed files with 50 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

16
ui/lib/sync/addon/components/secrets/page/destinations/create-and-edit.ts
View file

@ -71,10 +71,18 @@ export default class DestinationsCreateForm extends Component<Args> {
if (isValid) {
try {
const verb = destination.isNew ? 'created' : 'updated';
yield destination.save();
this.flashMessages.success(`Successfully ${verb} the destination ${destination.name}`);
this.store.clearDataset('sync/destination');
// we only want to save if there are changes
if (destination.dirtyType as unknown as string) {
const verb = destination.isNew ? 'created' : 'updated';
yield destination.save();
this.flashMessages.success(`Successfully ${verb} the destination ${destination.name}`);
// when saving a record the server returns all credentials as ******
// Ember Data observes this as a change, marks the model as dirty and the field will be returned from changedAttributes
// if the user then attempts to update the record the credential will get overwritten with the masked placeholder value
// since the record will be fetched from the details route we can safely unload it to avoid the aforementioned issue
destination.unloadRecord();
this.store.clearDataset('sync/destination');
}
this.router.transitionTo(
'vault.cluster.sync.secrets.destinations.destination.details',
destination.type,

37
ui/tests/acceptance/sync/secrets/destination-test.js
View file

@ -57,4 +57,41 @@ module('Acceptance | enterprise | sync | destination', function (hooks) {
await click(ts.confirmButton);
assert.dom(ts.destinations.deleteBanner).exists('Delete banner renders');
});
test('it should not save placeholder values for credentials and only save when there are changes', async function (assert) {
assert.expect(2);
const handler = this.server.patch(
'/sys/sync/destinations/vercel-project/destination-vercel',
(schema, req) => {
assert.deepEqual(
JSON.parse(req.requestBody),
{ access_token: 'foobar' },
'Updated access token sent in patch request'
);
const { deployment_environments, project_id, team_id, name, type, secret_name_template } =
this.server.create('sync-destination', 'vercel-project');
return {
data: {
connection_details: { access_token: '*****', deployment_environments, project_id, team_id },
name,
options: { custom_tags: {}, secret_name_template },
type,
},
};
}
);
await visit('vault/sync/secrets/destinations/vercel-project/destination-vercel/edit');
await click(ts.enableField('accessToken'));
await fillIn(ts.inputByAttr('accessToken'), 'foobar');
await click(ts.saveButton);
await click(ts.toolbar('Edit destination'));
await click(ts.saveButton);
assert.strictEqual(
handler.numberOfCalls,
1,
'Model is not dirty after server returns masked value for credentials and save request is not made when there are no changes'
);
});
});

1
ui/tests/helpers/general-selectors.js
View file

@ -44,6 +44,7 @@ export const SELECTORS = {
infoRowValue: (label) => `[data-test-value-div="${label}"]`,
inputByAttr: (attr) => `[data-test-input="${attr}"]`,
fieldByAttr: (attr) => `[data-test-field="${attr}"]`,
enableField: (attr) => `[data-test-enable-field="${attr}"] button`,
validation: (attr) => `[data-test-field-validation=${attr}]`,
validationWarning: (attr) => `[data-test-validation-warning=${attr}]`,
messageError: '[data-test-message-error]',