From 0cd6d3f68125033803e772aa80d59ec8445d26ce Mon Sep 17 00:00:00 2001 From: Angel Garbarino Date: Tue, 4 May 2021 14:33:54 -0600 Subject: [PATCH 01/33] initial setup, modify toolbar header --- ui/app/components/secret-edit.js | 2 + ui/app/styles/components/modal.scss | 14 ++ ui/app/templates/components/secret-edit.hbs | 212 ++++++++++++------ .../components/secret-version-menu.hbs | 30 ++- 4 files changed, 191 insertions(+), 67 deletions(-) diff --git a/ui/app/components/secret-edit.js b/ui/app/components/secret-edit.js index 4adbc148bbc0..efed2949e43a 100644 --- a/ui/app/components/secret-edit.js +++ b/ui/app/components/secret-edit.js @@ -39,6 +39,8 @@ export default Component.extend(FocusOnInsertMixin, WithNavToNearestAncestor, { isWrapping: false, showWrapButton: not('wrappedData'), + showDeleteModal: false, + // called with a bool indicating if there's been a change in the secretData onDataChange() {}, onRefresh() {}, diff --git a/ui/app/styles/components/modal.scss b/ui/app/styles/components/modal.scss index fe629265737a..9378ced2f1df 100644 --- a/ui/app/styles/components/modal.scss +++ b/ui/app/styles/components/modal.scss @@ -76,3 +76,17 @@ pre { background: #f7f8fa; border-top: 1px solid #bac1cc; } + +.modal-radio-button { + display: flex; + align-items: baseline; + margin-bottom: $spacing-xs; + + input { + top: 2px; + } + + .helper-text { + margin-left: 10px; + } +} diff --git a/ui/app/templates/components/secret-edit.hbs b/ui/app/templates/components/secret-edit.hbs index cefe55f43818..23348c837d52 100644 --- a/ui/app/templates/components/secret-edit.hbs +++ b/ui/app/templates/components/secret-edit.hbs @@ -33,74 +33,18 @@ {{/unless}} - {{#if (and (eq @mode "show") this.isV2 (not @model.failedServerRead))}} - - - - History - - - - - + Delete +
{{/if}} - {{#if (and (eq mode 'show') canDelete)}} - - Delete secret - - {{/if}} - {{#if (and (eq mode 'show') (or canEditV2Secret canEdit))}} {{#let (concat 'vault.cluster.secrets.backend.' (if (eq mode 'show') 'edit' 'show')) as |targetRoute|}} {{#unless (and isV2 (or isWriteWithoutRead modelForData.destroyed modelForData.deleted))}} @@ -116,7 +60,7 @@ @class={{concat "toolbar-link" (if D.isOpen " is-active")}} @tagName="button" > - Copy secret + Copy @@ -159,7 +103,66 @@ {{/unless}} + {{/let}} + {{/if}} + {{#if (and (eq @mode "show") this.isV2 (not @model.failedServerRead))}} + + {{!-- ARG TODO this content will move to under Version dropdown --}} + {{!-- + + History + + + + + +
--}} + {{/if}} + {{#if (and (eq mode 'show') (or canEditV2Secret canEdit))}} + {{#let (concat 'vault.cluster.secrets.backend.' (if (eq mode 'show') 'edit' 'show')) as |targetRoute|}} {{#if isV2}} +{{log this.showDeleteModal "showDelete modal"}} + +
+

There are three ways to delete or destroy the {{this.model.id}} secret. Each is different, so be sure to read the below carefully.

+

How would you like to proceed?

+ {{!-- ARG TODO add permissions to each button --}} +
+ +
+ +

This deletes Version 2 of the secret. It can be un-deleted later.

+
+
+
+ +
+ +

Version 2 is permanently destroyed and cannot be read or recovered later.

+
+
+
+ +
+ +

All secret versions are permanently destroyed and cannot be read or recovered later.

+
+
+
+
+ {{!-- + --}} +
+ + + {{partial partialName}} diff --git a/ui/app/templates/components/secret-version-menu.hbs b/ui/app/templates/components/secret-version-menu.hbs index 15bc2d0e0b2c..1dd6edddd381 100644 --- a/ui/app/templates/components/secret-version-menu.hbs +++ b/ui/app/templates/components/secret-version-menu.hbs @@ -22,7 +22,33 @@ {{#if (has-block)}} {{yield}} {{/if}} - {{#if this.version.destroyed}} + {{!-- ARG TODO Add permissions here --}} + {{#each (reverse model.versions) as |secretVersion|}} +
  • + + Version {{secretVersion.version}} + {{#if (and (eq secretVersion.version model.currentVersion) (not secretVersion.deleted))}} + + {{else if secretVersion.deleted}} + + {{/if}} + +
    • + {{/each}} +
  • + + View version history + +
    • + + {{!-- ARG TODO this will all go under Delete in secret-edit.hbs --}} + {{!-- {{#if this.version.destroyed}}
  • {{/if}} {{/if}} - {{/if}} + {{/if}} --}} From 9b02bd19b9ba62cffe374563861c8b0ca60370e2 Mon Sep 17 00:00:00 2001 From: Angel Garbarino Date: Wed, 5 May 2021 09:57:54 -0600 Subject: [PATCH 02/33] footer buttons setup --- ui/app/components/secret-edit.js | 17 +++++++ ui/app/templates/components/secret-edit.hbs | 51 ++++++++++----------- 2 files changed, 40 insertions(+), 28 deletions(-) diff --git a/ui/app/components/secret-edit.js b/ui/app/components/secret-edit.js index efed2949e43a..adddd32c3268 100644 --- a/ui/app/components/secret-edit.js +++ b/ui/app/components/secret-edit.js @@ -397,5 +397,22 @@ export default Component.extend(FocusOnInsertMixin, WithNavToNearestAncestor, { formatJSON() { this.set('codemirrorString', this.secretData.toJSONString(true)); }, + + handleDelete() { + if (!this.deleteType) { + return; + } + console.log(this.deleteType, 'do something with the deleteType'); + this.router.transitionTo('vault.cluster.metrics.config'); + // this.rotateCredentials(backend, name) + // .then(() => { + // this.flashMessages.success(`Successfully rotated root credentials for connection "${name}"`); + // this.transitionToRoute(SHOW_ROUTE, name); + // }) + // .catch(e => { + // this.flashMessages.danger(`Error rotating root credentials: ${e.errors}`); + // this.transitionToRoute(SHOW_ROUTE, name); + // }); + }, }, }); diff --git a/ui/app/templates/components/secret-edit.hbs b/ui/app/templates/components/secret-edit.hbs index 23348c837d52..5a1151cc8961 100644 --- a/ui/app/templates/components/secret-edit.hbs +++ b/ui/app/templates/components/secret-edit.hbs @@ -186,7 +186,6 @@ -{{log this.showDeleteModal "showDelete modal"}}
    @@ -215,13 +213,12 @@
    @@ -230,13 +227,12 @@
    @@ -245,22 +241,21 @@
    - {{!-- --}} + Cancel +
    From a94fefb25f0e296ebd050aa37235e379db84c35b Mon Sep 17 00:00:00 2001 From: Angel Garbarino Date: Wed, 5 May 2021 10:50:05 -0600 Subject: [PATCH 03/33] setup first delete version delete method --- ui/app/components/secret-edit.js | 25 ++++++++++++--------- ui/app/templates/components/secret-edit.hbs | 5 ++--- 2 files changed, 16 insertions(+), 14 deletions(-) diff --git a/ui/app/components/secret-edit.js b/ui/app/components/secret-edit.js index adddd32c3268..dc2d8c4c848e 100644 --- a/ui/app/components/secret-edit.js +++ b/ui/app/components/secret-edit.js @@ -10,6 +10,7 @@ import keys from 'vault/lib/keycodes'; import KVObject from 'vault/lib/kv-object'; import { maybeQueryRecord } from 'vault/macros/maybe-query-record'; import ControlGroupError from 'vault/lib/control-group-error'; +import { getOwner } from '@ember/application'; const LIST_ROUTE = 'vault.cluster.secrets.backend.list'; const LIST_ROOT_ROUTE = 'vault.cluster.secrets.backend.list-root'; @@ -402,17 +403,19 @@ export default Component.extend(FocusOnInsertMixin, WithNavToNearestAncestor, { if (!this.deleteType) { return; } - console.log(this.deleteType, 'do something with the deleteType'); - this.router.transitionTo('vault.cluster.metrics.config'); - // this.rotateCredentials(backend, name) - // .then(() => { - // this.flashMessages.success(`Successfully rotated root credentials for connection "${name}"`); - // this.transitionToRoute(SHOW_ROUTE, name); - // }) - // .catch(e => { - // this.flashMessages.danger(`Error rotating root credentials: ${e.errors}`); - // this.transitionToRoute(SHOW_ROUTE, name); - // }); + // Option 1: Delete Current Version + if (this.deleteType === 'delete-version') { + return this.store + .adapterFor('secret-v2-version') + .v2DeleteOperation(this.store, this.modelForData.id, 'delete') + .then(() => { + location.reload(); // not the best but unsure how refresh such that the modal no longer shows? + }); + } + // Option 2: Destroy Current Version + if (this.deleteType === 'destroy-version') { + // here + } }, }, }); diff --git a/ui/app/templates/components/secret-edit.hbs b/ui/app/templates/components/secret-edit.hbs index 5a1151cc8961..d4e1e50db340 100644 --- a/ui/app/templates/components/secret-edit.hbs +++ b/ui/app/templates/components/secret-edit.hbs @@ -34,7 +34,6 @@ {{/unless}} {{#if (and (eq mode 'show') canDelete)}} - {{!-- ARG TODO the actions here will change --}}
    @@ -222,7 +221,7 @@ />
    -

    Version 2 is permanently destroyed and cannot be read or recovered later.

    +

    Version {{this.modelForData.version}} is permanently destroyed and cannot be read or recovered later.

    From 5733a64cbd189af90eadd0d759bbde4d28063b0e Mon Sep 17 00:00:00 2001 From: Angel Garbarino Date: Wed, 5 May 2021 11:32:02 -0600 Subject: [PATCH 04/33] clean up --- ui/app/components/secret-edit.js | 35 ++++++++++++++++----- ui/app/components/secret-version-menu.js | 2 +- ui/app/templates/components/secret-edit.hbs | 6 ++-- 3 files changed, 31 insertions(+), 12 deletions(-) diff --git a/ui/app/components/secret-edit.js b/ui/app/components/secret-edit.js index dc2d8c4c848e..430877d73107 100644 --- a/ui/app/components/secret-edit.js +++ b/ui/app/components/secret-edit.js @@ -10,7 +10,6 @@ import keys from 'vault/lib/keycodes'; import KVObject from 'vault/lib/kv-object'; import { maybeQueryRecord } from 'vault/macros/maybe-query-record'; import ControlGroupError from 'vault/lib/control-group-error'; -import { getOwner } from '@ember/application'; const LIST_ROUTE = 'vault.cluster.secrets.backend.list'; const LIST_ROOT_ROUTE = 'vault.cluster.secrets.backend.list-root'; @@ -118,6 +117,30 @@ export default Component.extend(FocusOnInsertMixin, WithNavToNearestAncestor, { canDelete: alias('model.canDelete'), canEdit: alias('updatePath.canUpdate'), + deleteVersionPath: maybeQueryRecord( + 'capabilities', + context => { + let [backend, id] = JSON.parse(context.version.id); + return { + id: `${backend}/delete/${id}`, + }; + }, + 'version.id' + ), + canDeleteVersion: alias('deleteVersionPath.canUpdate'), + destroyVersionPath: maybeQueryRecord( + 'capabilities', + context => { + let [backend, id] = JSON.parse(context.version.id); + return { + id: `${backend}/destroy/${id}`, + }; + }, + 'version.id' + ), + canDestroyVersion: alias('destroyVersionPath.canUpdate'), + // ARG TODO missing canUndelete Version? see secret version menu + v2UpdatePath: maybeQueryRecord( 'capabilities', context => { @@ -403,19 +426,15 @@ export default Component.extend(FocusOnInsertMixin, WithNavToNearestAncestor, { if (!this.deleteType) { return; } - // Option 1: Delete Current Version - if (this.deleteType === 'delete-version') { + // Option 1 & 2: Delete or Destroy Current Version + if (this.deleteType === 'delete' || this.deleteType === 'destroy') { return this.store .adapterFor('secret-v2-version') - .v2DeleteOperation(this.store, this.modelForData.id, 'delete') + .v2DeleteOperation(this.store, this.modelForData.id, this.deleteType) .then(() => { location.reload(); // not the best but unsure how refresh such that the modal no longer shows? }); } - // Option 2: Destroy Current Version - if (this.deleteType === 'destroy-version') { - // here - } }, }, }); diff --git a/ui/app/components/secret-version-menu.js b/ui/app/components/secret-version-menu.js index f698870d05d1..6b2b5de5b5d4 100644 --- a/ui/app/components/secret-version-menu.js +++ b/ui/app/components/secret-version-menu.js @@ -9,7 +9,7 @@ export default Component.extend({ version: null, useDefaultTrigger: false, onRefresh() {}, - + // ARG TODO this functionality is being moved to secret-edit deleteVersionPath: maybeQueryRecord( 'capabilities', context => { diff --git a/ui/app/templates/components/secret-edit.hbs b/ui/app/templates/components/secret-edit.hbs index d4e1e50db340..b1b540e60d28 100644 --- a/ui/app/templates/components/secret-edit.hbs +++ b/ui/app/templates/components/secret-edit.hbs @@ -198,7 +198,7 @@ {{!-- ARG TODO add permissions to each button --}}
    -

    All secret versions are permanently destroyed and cannot be read or recovered later.

    +

    All secret versions and metadata are permanently destroyed and cannot be read or recovered later.

    From f613b286c183f2eb9cda3293be3c15fd1004fb60 Mon Sep 17 00:00:00 2001 From: Angel Garbarino Date: Wed, 5 May 2021 11:39:21 -0600 Subject: [PATCH 05/33] handle destory all versions --- ui/app/components/secret-edit.js | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/ui/app/components/secret-edit.js b/ui/app/components/secret-edit.js index 430877d73107..a7ae403ce49c 100644 --- a/ui/app/components/secret-edit.js +++ b/ui/app/components/secret-edit.js @@ -432,9 +432,15 @@ export default Component.extend(FocusOnInsertMixin, WithNavToNearestAncestor, { .adapterFor('secret-v2-version') .v2DeleteOperation(this.store, this.modelForData.id, this.deleteType) .then(() => { - location.reload(); // not the best but unsure how refresh such that the modal no longer shows? + location.reload(); // ARG TODO not the best but unsure how refresh such that the modal no longer shows? }); } + if (this.deleteType === 'destroy-all-versions') { + let { id } = this.model; + this.model.destroyRecord().then(() => { + this.navToNearestAncestor.perform(id); + }); + } }, }, }); From 73ef1a128fbf578e484e1ec161fd169fedc05a93 Mon Sep 17 00:00:00 2001 From: Angel Garbarino Date: Wed, 5 May 2021 14:04:11 -0600 Subject: [PATCH 06/33] handle undelete --- ui/app/components/secret-edit.js | 29 +++++++++++++-------- ui/app/templates/components/secret-edit.hbs | 24 ++++++++++++----- 2 files changed, 35 insertions(+), 18 deletions(-) diff --git a/ui/app/components/secret-edit.js b/ui/app/components/secret-edit.js index a7ae403ce49c..f8c6adc34dd7 100644 --- a/ui/app/components/secret-edit.js +++ b/ui/app/components/secret-edit.js @@ -197,6 +197,14 @@ export default Component.extend(FocusOnInsertMixin, WithNavToNearestAncestor, { return false; }), + canUndelete: computed('modelForData.{deleted,destroyed}', function() { + if (this.modelForData.deleted && !this.modelForData.destroyed) { + return true; + } else { + return false; + } + }), + transitionToRoute() { return this.router.transitionTo(...arguments); }, @@ -422,25 +430,24 @@ export default Component.extend(FocusOnInsertMixin, WithNavToNearestAncestor, { this.set('codemirrorString', this.secretData.toJSONString(true)); }, - handleDelete() { - if (!this.deleteType) { + handleDelete(deleteType) { + if (!deleteType) { return; } - // Option 1 & 2: Delete or Destroy Current Version - if (this.deleteType === 'delete' || this.deleteType === 'destroy') { + + if (deleteType === 'destroy-all-versions') { + let { id } = this.model; + this.model.destroyRecord().then(() => { + this.navToNearestAncestor.perform(id); + }); + } else { return this.store .adapterFor('secret-v2-version') - .v2DeleteOperation(this.store, this.modelForData.id, this.deleteType) + .v2DeleteOperation(this.store, this.modelForData.id, deleteType) .then(() => { location.reload(); // ARG TODO not the best but unsure how refresh such that the modal no longer shows? }); } - if (this.deleteType === 'destroy-all-versions') { - let { id } = this.model; - this.model.destroyRecord().then(() => { - this.navToNearestAncestor.perform(id); - }); - } }, }, }); diff --git a/ui/app/templates/components/secret-edit.hbs b/ui/app/templates/components/secret-edit.hbs index b1b540e60d28..89bd5cc78b61 100644 --- a/ui/app/templates/components/secret-edit.hbs +++ b/ui/app/templates/components/secret-edit.hbs @@ -34,13 +34,23 @@ {{/unless}} {{#if (and (eq mode 'show') canDelete)}} - + {{else}} + + {{/if}}
    {{/if}} @@ -243,7 +253,7 @@ - {{else}} - - {{/if}} + {{/if}} +
    {{/if}} @@ -206,34 +205,38 @@

    There are three ways to delete or destroy the {{this.model.id}} secret. Each is different, so be sure to read the below carefully.

    How would you like to proceed?

    {{!-- ARG TODO add permissions to each button --}} -
    - -
    - -

    This deletes Version {{this.modelForData.version}} of the secret. It can be un-deleted later.

    -
    -
    -
    - -
    - -

    Version {{this.modelForData.version}} is permanently destroyed and cannot be read or recovered later.

    + {{#unless this.modelForData.destroyed}} + {{#unless this.modelForData.deleted}} +
    + +
    + +

    This deletes Version {{this.modelForData.version}} of the secret. It can be un-deleted later.

    +
    +
    + {{/unless}} +
    + +
    + +

    Version {{this.modelForData.version}} is permanently destroyed and cannot be read or recovered later.

    +
    -
    + {{/unless}}
    Date: Wed, 5 May 2021 14:34:22 -0600 Subject: [PATCH 08/33] remove delete from version area --- ui/app/templates/components/secret-edit.hbs | 52 +-------------------- 1 file changed, 2 insertions(+), 50 deletions(-) diff --git a/ui/app/templates/components/secret-edit.hbs b/ui/app/templates/components/secret-edit.hbs index 1b6638b8cde2..a9c63c362b21 100644 --- a/ui/app/templates/components/secret-edit.hbs +++ b/ui/app/templates/components/secret-edit.hbs @@ -113,60 +113,13 @@ {{/unless}} {{/let}} {{/if}} + {{#if (and (eq @mode "show") this.isV2 (not @model.failedServerRead))}} - {{!-- ARG TODO this content will move to under Version dropdown --}} - {{!-- - - History - - - - - -
    --}} {{/if}} {{#if (and (eq mode 'show') (or canEditV2Secret canEdit))}} @@ -270,6 +223,5 @@ - - +{{log deleteVersionPath "dleete deleteVersionPath"}} {{partial partialName}} From bfdc688aed3e75d005c85fb05d481aa9abf299d9 Mon Sep 17 00:00:00 2001 From: Angel Garbarino Date: Wed, 5 May 2021 14:42:16 -0600 Subject: [PATCH 09/33] modelForData in permissions --- ui/app/components/secret-edit.js | 4 ++-- ui/app/templates/components/secret-edit.hbs | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/ui/app/components/secret-edit.js b/ui/app/components/secret-edit.js index f8c6adc34dd7..6fcc5dc24da5 100644 --- a/ui/app/components/secret-edit.js +++ b/ui/app/components/secret-edit.js @@ -120,7 +120,7 @@ export default Component.extend(FocusOnInsertMixin, WithNavToNearestAncestor, { deleteVersionPath: maybeQueryRecord( 'capabilities', context => { - let [backend, id] = JSON.parse(context.version.id); + let [backend, id] = JSON.parse(context.modelForData.id); return { id: `${backend}/delete/${id}`, }; @@ -131,7 +131,7 @@ export default Component.extend(FocusOnInsertMixin, WithNavToNearestAncestor, { destroyVersionPath: maybeQueryRecord( 'capabilities', context => { - let [backend, id] = JSON.parse(context.version.id); + let [backend, id] = JSON.parse(context.modelForData.id); return { id: `${backend}/destroy/${id}`, }; diff --git a/ui/app/templates/components/secret-edit.hbs b/ui/app/templates/components/secret-edit.hbs index a9c63c362b21..a9f867855236 100644 --- a/ui/app/templates/components/secret-edit.hbs +++ b/ui/app/templates/components/secret-edit.hbs @@ -223,5 +223,5 @@ -{{log deleteVersionPath "dleete deleteVersionPath"}} + {{partial partialName}} From 86099ccbf8c1b6c6d2754fa378db5d9da65ddf93 Mon Sep 17 00:00:00 2001 From: Angel Garbarino Date: Fri, 7 May 2021 10:12:39 -0600 Subject: [PATCH 10/33] setup for soft delete and modify adpater to allow DELETE in additon to POST --- ui/app/adapters/secret-v2-version.js | 19 +++++++++++---- ui/app/components/secret-edit.js | 23 +++++++++++++++--- ui/app/templates/components/secret-edit.hbs | 27 +++++++++++++++------ 3 files changed, 53 insertions(+), 16 deletions(-) diff --git a/ui/app/adapters/secret-v2-version.js b/ui/app/adapters/secret-v2-version.js index 5aac49d731d9..992d4eb86ac5 100644 --- a/ui/app/adapters/secret-v2-version.js +++ b/ui/app/adapters/secret-v2-version.js @@ -70,14 +70,23 @@ export default ApplicationAdapter.extend({ v2DeleteOperation(store, id, deleteType = 'delete') { let [backend, path, version] = JSON.parse(id); - // deleteType should be 'delete', 'destroy', 'undelete' - return this.ajax(this._url(backend, path, deleteType), 'POST', { data: { versions: [version] } }).then( - () => { + + // ARG TODO this previously was not handled with POST and the permissions were denied for soft deletes + // Need to make sure this works for different versions at root permissions + if (!version && deleteType === 'delete') { + return this.ajax(this._url(backend, path, 'data'), 'DELETE').then(() => { let model = store.peekRecord('secret-v2-version', id); return model && model.rollbackAttributes() && model.reload(); - } - ); + }); + } else { + return this.ajax(this._url(backend, path, deleteType), 'POST', { data: { versions: [version] } }).then( + () => { + let model = store.peekRecord('secret-v2-version', id); + return model && model.rollbackAttributes() && model.reload(); + } + ); + } }, handleResponse(status, headers, payload, requestData) { diff --git a/ui/app/components/secret-edit.js b/ui/app/components/secret-edit.js index 6fcc5dc24da5..206cb0864f56 100644 --- a/ui/app/components/secret-edit.js +++ b/ui/app/components/secret-edit.js @@ -114,20 +114,35 @@ export default Component.extend(FocusOnInsertMixin, WithNavToNearestAncestor, { 'model.id', 'mode' ), - canDelete: alias('model.canDelete'), + canDelete: alias('updatePath.canDelete'), canEdit: alias('updatePath.canUpdate'), - + // ARG TODO covered by canDelete if they canDelete they can delete the version + // ARG TODO need to confirm still works for version 1. deleteVersionPath: maybeQueryRecord( 'capabilities', context => { let [backend, id] = JSON.parse(context.modelForData.id); + console.log(backend, 'BACKEND'); return { id: `${backend}/delete/${id}`, }; }, 'version.id' ), - canDeleteVersion: alias('deleteVersionPath.canUpdate'), + canDeleteAnyVersion: alias('deleteVersionPath.canUpdate'), + + undeleteVersionPath: maybeQueryRecord( + 'capabilities', + context => { + let [backend, id] = JSON.parse(context.version.id); + return { + id: `${backend}/undelete/${id}`, + }; + }, + 'version.id' + ), + canUndeleteVersion: alias('undeleteVersionPath.canUpdate'), + destroyVersionPath: maybeQueryRecord( 'capabilities', context => { @@ -197,7 +212,7 @@ export default Component.extend(FocusOnInsertMixin, WithNavToNearestAncestor, { return false; }), - canUndelete: computed('modelForData.{deleted,destroyed}', function() { + showUndeleteOption: computed('modelForData.{deleted,destroyed}', function() { if (this.modelForData.deleted && !this.modelForData.destroyed) { return true; } else { diff --git a/ui/app/templates/components/secret-edit.hbs b/ui/app/templates/components/secret-edit.hbs index a9f867855236..1a5210d53504 100644 --- a/ui/app/templates/components/secret-edit.hbs +++ b/ui/app/templates/components/secret-edit.hbs @@ -34,7 +34,8 @@ {{/unless}} {{#if (and (eq mode 'show') canDelete)}} - {{#if canUndelete}} + {{!-- ARG TODO check this against permissions, for canUndeleteVersion --}} + {{#if (and showUndeleteOption canUndeleteVersion)}} + {{else}} + - {{if (and (not this.modelForData.deleted) (not this.modelForData.destroyed)) "Delete" "Destroy"}} - + Delete version + + {{/if}}
    {{/if}} From 772b22ebb2d44a381745c2460194f8962e276dab Mon Sep 17 00:00:00 2001 From: Angel Garbarino Date: Fri, 7 May 2021 13:01:56 -0600 Subject: [PATCH 11/33] dropdown for soft delete --- ui/app/components/secret-edit.js | 2 +- ui/app/templates/components/secret-edit.hbs | 13 +++++++------ 2 files changed, 8 insertions(+), 7 deletions(-) diff --git a/ui/app/components/secret-edit.js b/ui/app/components/secret-edit.js index 206cb0864f56..e4bdc0121243 100644 --- a/ui/app/components/secret-edit.js +++ b/ui/app/components/secret-edit.js @@ -134,7 +134,7 @@ export default Component.extend(FocusOnInsertMixin, WithNavToNearestAncestor, { undeleteVersionPath: maybeQueryRecord( 'capabilities', context => { - let [backend, id] = JSON.parse(context.version.id); + let [backend, id] = JSON.parse(context.modelForData.id); return { id: `${backend}/undelete/${id}`, }; diff --git a/ui/app/templates/components/secret-edit.hbs b/ui/app/templates/components/secret-edit.hbs index 1a5210d53504..9795bcb766db 100644 --- a/ui/app/templates/components/secret-edit.hbs +++ b/ui/app/templates/components/secret-edit.hbs @@ -50,20 +50,21 @@ class="toolbar-link" onclick={{action (mut this.showDeleteModal) true}} > - {{if (and (not this.modelForData.deleted) (not this.modelForData.destroyed)) "Delete" "Destroy"}} - + {{if (and (not this.modelForData.deleted) (not this.modelForData.destroyed)) "Delete" "Destroy"}} + +
    {{else}} - Delete version + Delete {{/if}} -
    + {{/if}} {{#if (and (eq mode 'show') (or canEditV2Secret canEdit))}} From eef8d75582d70dcba13b1b9a58df0b8628194362 Mon Sep 17 00:00:00 2001 From: Angel Garbarino Date: Fri, 7 May 2021 13:59:44 -0600 Subject: [PATCH 12/33] stuck --- ui/app/components/secret-edit.js | 15 ++++++++++----- ui/app/templates/components/secret-edit.hbs | 20 +++++++++++--------- 2 files changed, 21 insertions(+), 14 deletions(-) diff --git a/ui/app/components/secret-edit.js b/ui/app/components/secret-edit.js index e4bdc0121243..ae39ba38d340 100644 --- a/ui/app/components/secret-edit.js +++ b/ui/app/components/secret-edit.js @@ -122,12 +122,11 @@ export default Component.extend(FocusOnInsertMixin, WithNavToNearestAncestor, { 'capabilities', context => { let [backend, id] = JSON.parse(context.modelForData.id); - console.log(backend, 'BACKEND'); return { id: `${backend}/delete/${id}`, }; }, - 'version.id' + 'model.id' ), canDeleteAnyVersion: alias('deleteVersionPath.canUpdate'), @@ -139,7 +138,7 @@ export default Component.extend(FocusOnInsertMixin, WithNavToNearestAncestor, { id: `${backend}/undelete/${id}`, }; }, - 'version.id' + 'model.id' ), canUndeleteVersion: alias('undeleteVersionPath.canUpdate'), @@ -151,7 +150,7 @@ export default Component.extend(FocusOnInsertMixin, WithNavToNearestAncestor, { id: `${backend}/destroy/${id}`, }; }, - 'version.id' + 'model.id' ), canDestroyVersion: alias('destroyVersionPath.canUpdate'), // ARG TODO missing canUndelete Version? see secret version menu @@ -456,11 +455,17 @@ export default Component.extend(FocusOnInsertMixin, WithNavToNearestAncestor, { this.navToNearestAncestor.perform(id); }); } else { + // ARG STUCK on this.modelForData.id does not include version in this iteration + let [backend, id, version] = JSON.parse(this.modelForData.id); + if (!version) { + this.modelForData.id = [backend, id, this.modelForData.version]; + } + console.log(this.modelForData.id, 'here'); return this.store .adapterFor('secret-v2-version') .v2DeleteOperation(this.store, this.modelForData.id, deleteType) .then(() => { - location.reload(); // ARG TODO not the best but unsure how refresh such that the modal no longer shows? + // location.reload(); // ARG TODO not the best but unsure how refresh such that the modal no longer shows? }); } }, diff --git a/ui/app/templates/components/secret-edit.hbs b/ui/app/templates/components/secret-edit.hbs index 9795bcb766db..eb2b856b7ba8 100644 --- a/ui/app/templates/components/secret-edit.hbs +++ b/ui/app/templates/components/secret-edit.hbs @@ -54,15 +54,17 @@
    {{else}} - - Delete - + {{#if (and (not this.modelForData.deleted) (not this.modelForData.destroyed)) }} + + Delete + + {{/if}} {{/if}} {{/if}} From 28d661766d1b385b6255f730401ce520bfd7d64c Mon Sep 17 00:00:00 2001 From: Angel Garbarino Date: Mon, 10 May 2021 12:50:08 -0600 Subject: [PATCH 13/33] handle all soft deletes --- ui/app/adapters/secret-v2-version.js | 7 +-- ui/app/components/secret-edit.js | 36 +++++++------- ui/app/templates/components/secret-edit.hbs | 54 ++++++++++----------- 3 files changed, 48 insertions(+), 49 deletions(-) diff --git a/ui/app/adapters/secret-v2-version.js b/ui/app/adapters/secret-v2-version.js index 992d4eb86ac5..246be173adda 100644 --- a/ui/app/adapters/secret-v2-version.js +++ b/ui/app/adapters/secret-v2-version.js @@ -70,11 +70,8 @@ export default ApplicationAdapter.extend({ v2DeleteOperation(store, id, deleteType = 'delete') { let [backend, path, version] = JSON.parse(id); - // deleteType should be 'delete', 'destroy', 'undelete' - - // ARG TODO this previously was not handled with POST and the permissions were denied for soft deletes - // Need to make sure this works for different versions at root permissions - if (!version && deleteType === 'delete') { + // deleteType should be 'delete', 'destroy', 'undelete', 'delete-latest-version', 'destroy-version' + if ((!version && deleteType === 'delete') || deleteType === 'delete-latest-version') { return this.ajax(this._url(backend, path, 'data'), 'DELETE').then(() => { let model = store.peekRecord('secret-v2-version', id); return model && model.rollbackAttributes() && model.reload(); diff --git a/ui/app/components/secret-edit.js b/ui/app/components/secret-edit.js index ae39ba38d340..4d328edc7316 100644 --- a/ui/app/components/secret-edit.js +++ b/ui/app/components/secret-edit.js @@ -115,12 +115,13 @@ export default Component.extend(FocusOnInsertMixin, WithNavToNearestAncestor, { 'mode' ), canDelete: alias('updatePath.canDelete'), - canEdit: alias('updatePath.canUpdate'), + canUpdate: alias('updatePath.canUpdate'), // ARG TODO covered by canDelete if they canDelete they can delete the version // ARG TODO need to confirm still works for version 1. deleteVersionPath: maybeQueryRecord( 'capabilities', context => { + if (!context.modelForData) return; let [backend, id] = JSON.parse(context.modelForData.id); return { id: `${backend}/delete/${id}`, @@ -133,6 +134,8 @@ export default Component.extend(FocusOnInsertMixin, WithNavToNearestAncestor, { undeleteVersionPath: maybeQueryRecord( 'capabilities', context => { + if (!context.modelForData) return; + if (!context.modelForData.id) return; let [backend, id] = JSON.parse(context.modelForData.id); return { id: `${backend}/undelete/${id}`, @@ -145,6 +148,8 @@ export default Component.extend(FocusOnInsertMixin, WithNavToNearestAncestor, { destroyVersionPath: maybeQueryRecord( 'capabilities', context => { + if (!context.modelForData) return; + if (!context.modelForData.id) return; let [backend, id] = JSON.parse(context.modelForData.id); return { id: `${backend}/destroy/${id}`, @@ -184,6 +189,17 @@ export default Component.extend(FocusOnInsertMixin, WithNavToNearestAncestor, { return this.isV2 ? model.belongsTo('selectedVersion').value() : model; }), + isLatestVersion: computed('model.{currentVersion,selectedVersion}', function() { + let { model } = this; + if (!model) return; + let latestVersion = model.currentVersion; + let selectedVersion = model.selectedVersion.version; + if (latestVersion !== selectedVersion) { + return false; + } + return true; + }), + basicModeDisabled: computed('secretDataIsAdvanced', 'showAdvancedMode', function() { return this.secretDataIsAdvanced || this.showAdvancedMode === false; }), @@ -211,14 +227,6 @@ export default Component.extend(FocusOnInsertMixin, WithNavToNearestAncestor, { return false; }), - showUndeleteOption: computed('modelForData.{deleted,destroyed}', function() { - if (this.modelForData.deleted && !this.modelForData.destroyed) { - return true; - } else { - return false; - } - }), - transitionToRoute() { return this.router.transitionTo(...arguments); }, @@ -445,27 +453,21 @@ export default Component.extend(FocusOnInsertMixin, WithNavToNearestAncestor, { }, handleDelete(deleteType) { + // deleteType should be 'delete', 'destroy', 'undelete', 'delete-latest-version', 'destroy-all-versions' if (!deleteType) { return; } - if (deleteType === 'destroy-all-versions') { let { id } = this.model; this.model.destroyRecord().then(() => { this.navToNearestAncestor.perform(id); }); } else { - // ARG STUCK on this.modelForData.id does not include version in this iteration - let [backend, id, version] = JSON.parse(this.modelForData.id); - if (!version) { - this.modelForData.id = [backend, id, this.modelForData.version]; - } - console.log(this.modelForData.id, 'here'); return this.store .adapterFor('secret-v2-version') .v2DeleteOperation(this.store, this.modelForData.id, deleteType) .then(() => { - // location.reload(); // ARG TODO not the best but unsure how refresh such that the modal no longer shows? + location.reload(); // ARG TODO not the best but unsure how refresh such that the modal no longer shows? }); } }, diff --git a/ui/app/templates/components/secret-edit.hbs b/ui/app/templates/components/secret-edit.hbs index eb2b856b7ba8..82b44e486885 100644 --- a/ui/app/templates/components/secret-edit.hbs +++ b/ui/app/templates/components/secret-edit.hbs @@ -33,9 +33,8 @@ {{/unless}} - {{#if (and (eq mode 'show') canDelete)}} - {{!-- ARG TODO check this against permissions, for canUndeleteVersion --}} - {{#if (and showUndeleteOption canUndeleteVersion)}} + {{#if (eq mode 'show')}} + {{#if (and canUndeleteVersion (or this.modelForData.deleted this.modelForData.destroyed))}} -
    - {{else}} - {{#if (and (not this.modelForData.deleted) (not this.modelForData.destroyed)) }} - - Delete - + {{#if (and (not this.modelForData.deleted) (not this.modelForData.destroyed)) }} + {{#if canDestroyVersion}} + +
    + {{else}} + {{#if (or canDeleteAnyVersion (and isLatestVersion canDelete))}} + + Delete + + {{/if}} {{/if}} - {{/if}} - + {{/if}} {{/if}} - {{#if (and (eq mode 'show') (or canEditV2Secret canEdit))}} + {{#if (and (eq mode 'show') (or canEditV2Secret canUpdate))}} {{#let (concat 'vault.cluster.secrets.backend.' (if (eq mode 'show') 'edit' 'show')) as |targetRoute|}} {{#unless (and isV2 (or isWriteWithoutRead modelForData.destroyed modelForData.deleted))}} {{/if}} - {{#if (and (eq mode 'show') (or canEditV2Secret canEdit))}} + {{#if (and (eq mode 'show') (or canEditV2Secret canUpdate))}} {{#let (concat 'vault.cluster.secrets.backend.' (if (eq mode 'show') 'edit' 'show')) as |targetRoute|}} {{#if isV2}} Date: Tue, 11 May 2021 09:44:32 -0600 Subject: [PATCH 14/33] conditional for destroy all versions --- ui/app/components/secret-edit.js | 30 ++++++++++----------- ui/app/templates/components/secret-edit.hbs | 28 ++++++++++--------- 2 files changed, 30 insertions(+), 28 deletions(-) diff --git a/ui/app/components/secret-edit.js b/ui/app/components/secret-edit.js index 4d328edc7316..1924bb62872b 100644 --- a/ui/app/components/secret-edit.js +++ b/ui/app/components/secret-edit.js @@ -116,8 +116,7 @@ export default Component.extend(FocusOnInsertMixin, WithNavToNearestAncestor, { ), canDelete: alias('updatePath.canDelete'), canUpdate: alias('updatePath.canUpdate'), - // ARG TODO covered by canDelete if they canDelete they can delete the version - // ARG TODO need to confirm still works for version 1. + deleteVersionPath: maybeQueryRecord( 'capabilities', context => { @@ -148,8 +147,8 @@ export default Component.extend(FocusOnInsertMixin, WithNavToNearestAncestor, { destroyVersionPath: maybeQueryRecord( 'capabilities', context => { - if (!context.modelForData) return; - if (!context.modelForData.id) return; + if (!context.modelForData || !context.modelForData.id) return; + let [backend, id] = JSON.parse(context.modelForData.id); return { id: `${backend}/destroy/${id}`, @@ -158,7 +157,6 @@ export default Component.extend(FocusOnInsertMixin, WithNavToNearestAncestor, { 'model.id' ), canDestroyVersion: alias('destroyVersionPath.canUpdate'), - // ARG TODO missing canUndelete Version? see secret version menu v2UpdatePath: maybeQueryRecord( 'capabilities', @@ -179,15 +177,7 @@ export default Component.extend(FocusOnInsertMixin, WithNavToNearestAncestor, { ), canEditV2Secret: alias('v2UpdatePath.canUpdate'), - requestInFlight: or('model.isLoading', 'model.isReloading', 'model.isSaving'), - - buttonDisabled: or('requestInFlight', 'model.isFolder', 'model.flagsIsInvalid', 'hasLintError', 'error'), - - modelForData: computed('isV2', 'model', function() { - let { model } = this; - if (!model) return null; - return this.isV2 ? model.belongsTo('selectedVersion').value() : model; - }), + canDestroyAllVersions: alias('v2UpdatePath.canDelete'), isLatestVersion: computed('model.{currentVersion,selectedVersion}', function() { let { model } = this; @@ -200,6 +190,16 @@ export default Component.extend(FocusOnInsertMixin, WithNavToNearestAncestor, { return true; }), + requestInFlight: or('model.isLoading', 'model.isReloading', 'model.isSaving'), + + buttonDisabled: or('requestInFlight', 'model.isFolder', 'model.flagsIsInvalid', 'hasLintError', 'error'), + + modelForData: computed('isV2', 'model', function() { + let { model } = this; + if (!model) return null; + return this.isV2 ? model.belongsTo('selectedVersion').value() : model; + }), + basicModeDisabled: computed('secretDataIsAdvanced', 'showAdvancedMode', function() { return this.secretDataIsAdvanced || this.showAdvancedMode === false; }), @@ -467,7 +467,7 @@ export default Component.extend(FocusOnInsertMixin, WithNavToNearestAncestor, { .adapterFor('secret-v2-version') .v2DeleteOperation(this.store, this.modelForData.id, deleteType) .then(() => { - location.reload(); // ARG TODO not the best but unsure how refresh such that the modal no longer shows? + location.reload(); }); } }, diff --git a/ui/app/templates/components/secret-edit.hbs b/ui/app/templates/components/secret-edit.hbs index 82b44e486885..9773dd2b68cb 100644 --- a/ui/app/templates/components/secret-edit.hbs +++ b/ui/app/templates/components/secret-edit.hbs @@ -206,20 +206,22 @@
    {{/unless}} -
    - -
    - -

    All secret versions and metadata are permanently destroyed and cannot be read or recovered later.

    + {{#if canDestroyAllVersions}} +
    + +
    + +

    All secret versions and metadata are permanently destroyed and cannot be read or recovered later.

    +
    -
    + {{/if}}
    • - - {{!-- ARG TODO this will all go under Delete in secret-edit.hbs --}} - {{!-- {{#if this.version.destroyed}} -
  • - -
    • - {{else}} - {{#if isFetchingVersionCapabilities}} -
  • - -
    • - {{else}} -
  • - {{#if this.version.deleted}} - {{#if canUndeleteVersion}} - - {{else}} - - {{/if}} - {{else if canDeleteVersion}} - - Delete version - - {{else}} - - {{/if}} -
    • - {{#if canDestroyVersion}} -
  • - - Permanently destroy version - -
    • - {{else}} - - {{/if}} - {{/if}} - {{/if}} --}} From a37eadcf4d67e1f1b62cfdfdc51200a9ceab51a3 Mon Sep 17 00:00:00 2001 From: Angel Garbarino Date: Tue, 11 May 2021 10:10:38 -0600 Subject: [PATCH 16/33] glimmerize secret-version-menu --- ui/app/components/secret-version-menu.js | 14 +++++++------- ui/app/templates/components/secret-edit.hbs | 1 - .../templates/components/secret-version-menu.hbs | 10 +++++----- 3 files changed, 12 insertions(+), 13 deletions(-) diff --git a/ui/app/components/secret-version-menu.js b/ui/app/components/secret-version-menu.js index ba03b3d02fc1..b7709943992f 100644 --- a/ui/app/components/secret-version-menu.js +++ b/ui/app/components/secret-version-menu.js @@ -1,8 +1,8 @@ -import Component from '@ember/component'; +import Component from '@glimmer/component'; -export default Component.extend({ - tagName: '', - version: null, - useDefaultTrigger: false, - onRefresh() {}, -}); +export default class SecretVersionMenu extends Component { + onRefresh() {} + get useDefaultTrigger() { + return this.args.useDefaultTrigger || false; + } +} diff --git a/ui/app/templates/components/secret-edit.hbs b/ui/app/templates/components/secret-edit.hbs index 9773dd2b68cb..f355cff5d487 100644 --- a/ui/app/templates/components/secret-edit.hbs +++ b/ui/app/templates/components/secret-edit.hbs @@ -173,7 +173,6 @@

    There are three ways to delete or destroy the {{this.model.id}} secret. Each is different, so be sure to read the below carefully.

    How would you like to proceed?

    - {{!-- ARG TODO add permissions to each button --}} {{#unless this.modelForData.destroyed}} {{#unless this.modelForData.deleted}}
    diff --git a/ui/app/templates/components/secret-version-menu.hbs b/ui/app/templates/components/secret-version-menu.hbs index 5192d5d20493..0327ae13498f 100644 --- a/ui/app/templates/components/secret-version-menu.hbs +++ b/ui/app/templates/components/secret-version-menu.hbs @@ -9,10 +9,10 @@ @class={{concat "toolbar-link" (if D.isOpen " is-active")}} @tagName="button" > - {{#if useDefaultTrigger}} + {{#if this.useDefaultTrigger}} {{else}} - Version {{this.version.version}} + Version {{@version.version}} {{/if}} @@ -23,11 +23,11 @@ {{yield}} {{/if}} {{!-- ARG TODO Add permissions here --}} - {{#each (reverse model.versions) as |secretVersion|}} + {{#each (reverse @model.versions) as |secretVersion|}}
  • Version {{secretVersion.version}} - {{#if (and (eq secretVersion.version model.currentVersion) (not secretVersion.deleted))}} + {{#if (and (eq secretVersion.version @model.currentVersion) (not secretVersion.deleted))}} {{else if secretVersion.deleted}} @@ -39,7 +39,7 @@ From d470b17f0df0d36ade118af66a72a04c4541cd9d Mon Sep 17 00:00:00 2001 From: Arnav Palnitkar Date: Tue, 11 May 2021 11:17:20 -0700 Subject: [PATCH 17/33] Updated secret version menu and version history --- ui/app/components/secret-version-menu.js | 3 - ui/app/styles/components/masked-input.scss | 1 - .../components/secret-version-menu.hbs | 16 ++- .../cluster/secrets/backend/versions.hbs | 102 ++++++++++-------- 4 files changed, 64 insertions(+), 58 deletions(-) diff --git a/ui/app/components/secret-version-menu.js b/ui/app/components/secret-version-menu.js index b7709943992f..b4aa0db982a0 100644 --- a/ui/app/components/secret-version-menu.js +++ b/ui/app/components/secret-version-menu.js @@ -2,7 +2,4 @@ import Component from '@glimmer/component'; export default class SecretVersionMenu extends Component { onRefresh() {} - get useDefaultTrigger() { - return this.args.useDefaultTrigger || false; - } } diff --git a/ui/app/styles/components/masked-input.scss b/ui/app/styles/components/masked-input.scss index 65f03e0cba32..32f6c5aac90b 100644 --- a/ui/app/styles/components/masked-input.scss +++ b/ui/app/styles/components/masked-input.scss @@ -66,7 +66,6 @@ height: auto; line-height: 1rem; min-width: $spacing-l; - z-index: 100; border: 0; box-shadow: none; color: $grey-light; diff --git a/ui/app/templates/components/secret-version-menu.hbs b/ui/app/templates/components/secret-version-menu.hbs index 0327ae13498f..8cc751825bb6 100644 --- a/ui/app/templates/components/secret-version-menu.hbs +++ b/ui/app/templates/components/secret-version-menu.hbs @@ -9,12 +9,8 @@ @class={{concat "toolbar-link" (if D.isOpen " is-active")}} @tagName="button" > - {{#if this.useDefaultTrigger}} - - {{else}} - Version {{@version.version}} - - {{/if}} + Version {{@version.version}} +
    • +
    + + +
    + +{{/unless}} \ No newline at end of file diff --git a/ui/app/templates/components/secret-edit.hbs b/ui/app/templates/components/secret-edit.hbs index f090d77479d3..e07876a2918c 100644 --- a/ui/app/templates/components/secret-edit.hbs +++ b/ui/app/templates/components/secret-edit.hbs @@ -40,6 +40,7 @@ @canDelete={{canDelete}} @canUpdate={{canUpdate}} @navToNearestAncestor={{this.navToNearestAncestor}} + @isV2={{isV2}} /> {{/if}} {{#if (and (eq mode 'show') (or canEditV2Secret canUpdate))}} From e56898393b9e4033db085e5a7efe5af1416a5854 Mon Sep 17 00:00:00 2001 From: Angel Garbarino Date: Wed, 12 May 2021 12:19:44 -0600 Subject: [PATCH 25/33] refining --- ui/app/components/secret-delete-menu.js | 24 +++++++++++++++- .../components/secret-delete-menu.hbs | 28 ++++++++++--------- ui/app/templates/components/secret-edit.hbs | 2 -- 3 files changed, 38 insertions(+), 16 deletions(-) diff --git a/ui/app/components/secret-delete-menu.js b/ui/app/components/secret-delete-menu.js index e4f468fc9fb1..f21d537a8753 100644 --- a/ui/app/components/secret-delete-menu.js +++ b/ui/app/components/secret-delete-menu.js @@ -11,6 +11,28 @@ export default class SecretDeleteMenu extends Component { @tracked showDeleteModal = false; + @maybeQueryRecord( + 'capabilities', + context => { + if (!context.args.model) { + return; + } + let backend = context.args.model.backend; + let id = context.args.model.id; + let path = context.args.isV2 ? `${backend}/data/${id}` : `${backend}/${id}`; + return { + id: path, + }; + }, + 'isV2', + 'model', + 'model.id', + 'mode' + ) + updatePath; + @alias('updatePath.canDelete') canDelete; + @alias('updatePath.canUpdate') canUpdate; + @maybeQueryRecord( 'capabilities', context => { @@ -91,7 +113,7 @@ export default class SecretDeleteMenu extends Component { if (!deleteType) { return; } - if (deleteType === 'destroy-all-versions') { + if (deleteType === 'destroy-all-versions' || deleteType === 'v1') { let { id } = this.args.model; this.args.model.destroyRecord().then(() => { this.args.navToNearestAncestor.perform(id); diff --git a/ui/app/templates/components/secret-delete-menu.hbs b/ui/app/templates/components/secret-delete-menu.hbs index e4a6c1c13bce..5c2337b18f85 100644 --- a/ui/app/templates/components/secret-delete-menu.hbs +++ b/ui/app/templates/components/secret-delete-menu.hbs @@ -1,13 +1,15 @@ -{{#unless isV2}} - - Delete Secret - +{{#unless @isV2}} + {{#if this.canDelete}} + + Delete + + {{/if}} {{else}} {{#if (and this.canUndeleteVersion @modelForData.deleted)}} -{{/unless}} \ No newline at end of file +{{/unless}} diff --git a/ui/app/templates/components/secret-version-menu.hbs b/ui/app/templates/components/secret-version-menu.hbs index 548c22721618..672be6d5cb1e 100644 --- a/ui/app/templates/components/secret-version-menu.hbs +++ b/ui/app/templates/components/secret-version-menu.hbs @@ -5,7 +5,7 @@ as |D| > diff --git a/ui/app/templates/vault/cluster/secrets/backend/versions.hbs b/ui/app/templates/vault/cluster/secrets/backend/versions.hbs index 2eceee3f4e58..9281ce6cedfe 100644 --- a/ui/app/templates/vault/cluster/secrets/backend/versions.hbs +++ b/ui/app/templates/vault/cluster/secrets/backend/versions.hbs @@ -22,31 +22,31 @@
    -
    - - Version {{list.item.version}} -
    - {{#if (eq list.item.version model.currentVersion)}} +
    + + Version {{list.item.version}} +
    + {{#if (eq list.item.version model.currentVersion)}}
    - - Current - + + Current +
    - {{/if}} - {{#if list.item.deleted}} + {{/if}} + {{#if list.item.deleted}}
    - - Deleted - + + Deleted +
    - {{/if}} - {{#if list.item.destroyed}} + {{/if}} + {{#if list.item.destroyed}}
    - - Destroyed - + + Destroyed +
    - {{/if}} + {{/if}}
    diff --git a/ui/tests/acceptance/secrets/backend/kv/secret-test.js b/ui/tests/acceptance/secrets/backend/kv/secret-test.js index 9fdde5a011f4..81f23ab6016f 100644 --- a/ui/tests/acceptance/secrets/backend/kv/secret-test.js +++ b/ui/tests/acceptance/secrets/backend/kv/secret-test.js @@ -144,7 +144,7 @@ module('Acceptance | secrets/secret/create', function(hooks) { .submit(); await listPage.create(); await editPage.createSecret(secretPath, 'foo', 'bar'); - await showPage.deleteSecret(); + await showPage.deleteSecretV1(); assert.equal( currentRouteName(), 'vault.cluster.secrets.backend.list-root', @@ -305,7 +305,7 @@ module('Acceptance | secrets/secret/create', function(hooks) { await listPage.create(); await editPage.createSecret(secretPath, 'foo', 'bar'); await settled(); - await click('[data-test-popup-menu-trigger="history"]'); + await click('[data-test-popup-menu-trigger="version"]'); await settled(); await click('[data-test-version-history]'); await settled(); diff --git a/ui/tests/pages/secrets/backend/kv/show.js b/ui/tests/pages/secrets/backend/kv/show.js index 7d1071a94cf8..2ae41dc63e92 100644 --- a/ui/tests/pages/secrets/backend/kv/show.js +++ b/ui/tests/pages/secrets/backend/kv/show.js @@ -8,6 +8,7 @@ export default create({ text: text(), }), deleteBtn: clickable('[data-test-secret-delete] button'), + deleteBtnV1: clickable('[data-test-secret-v1-delete="true"] button'), confirmBtn: clickable('[data-test-confirm-button]'), rows: collection('data-test-row-label'), toggleJSON: clickable('[data-test-secret-json-toggle]'), @@ -22,4 +23,7 @@ export default create({ deleteSecret() { return this.deleteBtn().confirmBtn(); }, + deleteSecretV1() { + return this.deleteBtnV1().confirmBtn(); + }, }); From 0c912f89f9dca15552c3660b82154f2591d1216d Mon Sep 17 00:00:00 2001 From: Angel Garbarino Date: Thu, 13 May 2021 10:40:41 -0600 Subject: [PATCH 29/33] add to test --- .../components/secret-delete-menu.hbs | 33 +++++----- .../secrets/backend/kv/secret-test.js | 63 +++++++++++++++++++ ui/tests/pages/secrets/backend/kv/show.js | 4 ++ 3 files changed, 85 insertions(+), 15 deletions(-) diff --git a/ui/app/templates/components/secret-delete-menu.hbs b/ui/app/templates/components/secret-delete-menu.hbs index 0dc8847c4227..195d98a3d142 100644 --- a/ui/app/templates/components/secret-delete-menu.hbs +++ b/ui/app/templates/components/secret-delete-menu.hbs @@ -26,6 +26,7 @@ type="button" class="toolbar-link" {{on "click" (fn this.toggleDeleteModal)}} + data-test-delete-open-modal > {{if (and (not @modelForData.deleted) (not @modelForData.destroyed)) "Delete" "Destroy"}} @@ -57,23 +58,25 @@

    How would you like to proceed?

    {{#unless @modelForData.destroyed}} {{#unless @modelForData.deleted}} -
    - -
    - -

    This deletes Version {{@modelForData.version}} of the secret. It can be un-deleted later.

    + {{#if this.canDelete}} +
    + +
    + +

    This deletes Version {{@modelForData.version}} of the secret. It can be un-deleted later.

    +
    -
    + {{/if}} {{/unless}} {{#if this.canDestroyVersion}} -
    +
    +
    Date: Thu, 13 May 2021 16:06:33 -0600 Subject: [PATCH 30/33] amend test --- ui/app/components/secret-delete-menu.js | 9 ++++++++- .../templates/components/secret-delete-menu.hbs | 1 + .../acceptance/secrets/backend/kv/secret-test.js | 15 ++++++++++++--- 3 files changed, 21 insertions(+), 4 deletions(-) diff --git a/ui/app/components/secret-delete-menu.js b/ui/app/components/secret-delete-menu.js index e5dd006da882..99fb53737b72 100644 --- a/ui/app/components/secret-delete-menu.js +++ b/ui/app/components/secret-delete-menu.js @@ -1,3 +1,4 @@ +import Ember from 'ember'; import { inject as service } from '@ember/service'; import Component from '@glimmer/component'; import { tracked } from '@glimmer/tracking'; @@ -41,7 +42,7 @@ export default class SecretDeleteMenu extends Component { @maybeQueryRecord( 'capabilities', context => { - if (!context.args || !context.modelForData || !context.modelForData.id) return; + if (!context.args || !context.args.modelForData || !context.args.modelForData.id) return; let [backend, id] = JSON.parse(context.args.modelForData.id); return { id: `${backend}/delete/${id}`, @@ -128,6 +129,12 @@ export default class SecretDeleteMenu extends Component { .adapterFor('secret-v2-version') .v2DeleteOperation(this.store, this.args.modelForData.id, deleteType) .then(resp => { + if (Ember.testing) { + return; + } + if (!resp) { + location.reload(); + } if (resp.isAdapterError) { const errorMessage = getErrorMessage(resp.errors); this.flashMessages.danger(errorMessage); diff --git a/ui/app/templates/components/secret-delete-menu.hbs b/ui/app/templates/components/secret-delete-menu.hbs index 195d98a3d142..c9291b0356dc 100644 --- a/ui/app/templates/components/secret-delete-menu.hbs +++ b/ui/app/templates/components/secret-delete-menu.hbs @@ -16,6 +16,7 @@ type="button" class="toolbar-link" onclick={{action this.handleDelete "undelete"}} + data-test-secret-undelete > Undelete diff --git a/ui/tests/acceptance/secrets/backend/kv/secret-test.js b/ui/tests/acceptance/secrets/backend/kv/secret-test.js index 3922fa67354b..a923d8e9d6d8 100644 --- a/ui/tests/acceptance/secrets/backend/kv/secret-test.js +++ b/ui/tests/acceptance/secrets/backend/kv/secret-test.js @@ -284,17 +284,20 @@ module('Acceptance | secrets/secret/create', function(hooks) { assert.dom('[data-test-delete-modal="delete-version"]').doesNotExist('delete version does not show'); }); - test('version 2 with policy with only delete option does not show modal', async function(assert) { + test('version 2 with policy with only delete option does not show modal and undelete is an option', async function(assert) { let backend = 'kv-v2'; const V2_POLICY = ` path "kv-v2/delete/*" { capabilities = ["update"] } + path "kv-v2/undelete/*" { + capabilities = ["update"] + } path "kv-v2/metadata/*" { capabilities = ["list","read","create","update"] } path "kv-v2/data/secret" { - capabilities = ["create", "read", "update", "delete"] + capabilities = ["create", "read"] } `; await consoleComponent.runCommands([ @@ -308,10 +311,16 @@ module('Acceptance | secrets/secret/create', function(hooks) { let userToken = consoleComponent.lastLogOutput; await logout.visit(); await authPage.login(userToken); - await writeSecret(backend, 'secret', 'foo', 'bar'); assert.dom('[data-test-delete-open-modal]').doesNotExist('delete version does not show'); assert.dom('[data-test-secret-v2-delete="true"]').exists('drop down delete shows'); + await showPage.deleteSecretV2(); + // unable to reload page in test scenario so going to list and back to secret to confirm deletion + let url = `/vault/secrets/${backend}/list`; + await visit(url); + await click('[data-test-secret-link="secret"]'); + assert.dom('[data-test-component="empty-state"]').exists('secret has been deleted'); + assert.dom('[data-test-secret-undelete]').exists('undelete button shows'); }); test('paths are properly encoded', async function(assert) { From 49af0ef275a61f86f623950dbf0b5acb8141a751 Mon Sep 17 00:00:00 2001 From: Angel Garbarino Date: Mon, 17 May 2021 12:56:29 -0600 Subject: [PATCH 31/33] address PR comments --- ui/app/adapters/secret-v2-version.js | 1 + ui/app/components/secret-delete-menu.js | 9 ++++----- ui/app/components/secret-edit.js | 2 +- ui/app/templates/components/secret-delete-menu.hbs | 9 ++++----- ui/app/templates/components/secret-edit.hbs | 5 +++-- 5 files changed, 13 insertions(+), 13 deletions(-) diff --git a/ui/app/adapters/secret-v2-version.js b/ui/app/adapters/secret-v2-version.js index d5a10b95c7a1..5bdd02129566 100644 --- a/ui/app/adapters/secret-v2-version.js +++ b/ui/app/adapters/secret-v2-version.js @@ -84,6 +84,7 @@ export default ApplicationAdapter.extend({ return this.ajax(this._url(backend, path, deleteType), 'POST', { data: { versions: [version] } }) .then(() => { let model = store.peekRecord('secret-v2-version', id); + // potential that model.reload() is never called. return model && model.rollbackAttributes() && model.reload(); }) .catch(e => { diff --git a/ui/app/components/secret-delete-menu.js b/ui/app/components/secret-delete-menu.js index 99fb53737b72..78a2454bb3ec 100644 --- a/ui/app/components/secret-delete-menu.js +++ b/ui/app/components/secret-delete-menu.js @@ -109,10 +109,6 @@ export default class SecretDeleteMenu extends Component { return true; } - @action toggleDeleteModal() { - this.showDeleteModal = !this.showDeleteModal; - } - @action handleDelete(deleteType) { // deleteType should be 'delete', 'destroy', 'undelete', 'delete-latest-version', 'destroy-all-versions' @@ -133,12 +129,15 @@ export default class SecretDeleteMenu extends Component { return; } if (!resp) { - location.reload(); + this.showDeleteModal = false; + this.args.refresh(); + return; } if (resp.isAdapterError) { const errorMessage = getErrorMessage(resp.errors); this.flashMessages.danger(errorMessage); } else { + // not likely to ever get to this situation, but adding just in case. location.reload(); } }); diff --git a/ui/app/components/secret-edit.js b/ui/app/components/secret-edit.js index e901892d6694..8a6f602bf012 100644 --- a/ui/app/components/secret-edit.js +++ b/ui/app/components/secret-edit.js @@ -113,7 +113,7 @@ export default Component.extend(FocusOnInsertMixin, WithNavToNearestAncestor, { 'mode' ), canDelete: alias('updatePath.canDelete'), - canUpdate: alias('updatePath.canUpdate'), + canEdit: alias('updatePath.canEdit'), v2UpdatePath: maybeQueryRecord( 'capabilities', diff --git a/ui/app/templates/components/secret-delete-menu.hbs b/ui/app/templates/components/secret-delete-menu.hbs index c9291b0356dc..614f50e2e403 100644 --- a/ui/app/templates/components/secret-delete-menu.hbs +++ b/ui/app/templates/components/secret-delete-menu.hbs @@ -26,7 +26,7 @@ diff --git a/ui/app/templates/components/secret-edit.hbs b/ui/app/templates/components/secret-edit.hbs index 65d75a4dce68..4be44a5e2ee0 100644 --- a/ui/app/templates/components/secret-edit.hbs +++ b/ui/app/templates/components/secret-edit.hbs @@ -39,9 +39,10 @@ @model={{this.model}} @navToNearestAncestor={{this.navToNearestAncestor}} @isV2={{isV2}} + @refresh={{action 'refresh'}} /> {{/if}} - {{#if (and (eq mode 'show') (or canEditV2Secret canUpdate))}} + {{#if (and (eq mode 'show') (or canEditV2Secret canEdit))}} {{#let (concat 'vault.cluster.secrets.backend.' (if (eq mode 'show') 'edit' 'show')) as |targetRoute|}} {{#unless (and isV2 (or isWriteWithoutRead modelForData.destroyed modelForData.deleted))}} {{/if}} - {{#if (and (eq mode 'show') (or canEditV2Secret canUpdate))}} + {{#if (and (eq mode 'show') (or canEditV2Secret canEdit))}} {{#let (concat 'vault.cluster.secrets.backend.' (if (eq mode 'show') 'edit' 'show')) as |targetRoute|}} {{#if isV2}} Date: Mon, 17 May 2021 13:12:09 -0600 Subject: [PATCH 32/33] whoopies --- ui/app/components/secret-edit.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ui/app/components/secret-edit.js b/ui/app/components/secret-edit.js index 8a6f602bf012..3c049b610e5b 100644 --- a/ui/app/components/secret-edit.js +++ b/ui/app/components/secret-edit.js @@ -113,7 +113,7 @@ export default Component.extend(FocusOnInsertMixin, WithNavToNearestAncestor, { 'mode' ), canDelete: alias('updatePath.canDelete'), - canEdit: alias('updatePath.canEdit'), + canEdit: alias('updatePath.canUpdate'), v2UpdatePath: maybeQueryRecord( 'capabilities', From 7f20aca7d1ecf61b31ae0be1a5aaa960bb7f8534 Mon Sep 17 00:00:00 2001 From: Angel Garbarino Date: Tue, 18 May 2021 12:31:33 -0600 Subject: [PATCH 33/33] add urlEncoding --- ui/app/components/secret-delete-menu.js | 12 +++++++----- 1 file changed, 7 insertions(+), 5 deletions(-) diff --git a/ui/app/components/secret-delete-menu.js b/ui/app/components/secret-delete-menu.js index 78a2454bb3ec..e5feb32e7634 100644 --- a/ui/app/components/secret-delete-menu.js +++ b/ui/app/components/secret-delete-menu.js @@ -25,7 +25,9 @@ export default class SecretDeleteMenu extends Component { } let backend = context.args.model.backend; let id = context.args.model.id; - let path = context.args.isV2 ? `${backend}/data/${id}` : `${backend}/${id}`; + let path = context.args.isV2 + ? `${encodeURIComponent(backend)}/data/${encodeURIComponent(id)}` + : `${encodeURIComponent(backend)}/${encodeURIComponent(id)}`; return { id: path, }; @@ -45,7 +47,7 @@ export default class SecretDeleteMenu extends Component { if (!context.args || !context.args.modelForData || !context.args.modelForData.id) return; let [backend, id] = JSON.parse(context.args.modelForData.id); return { - id: `${backend}/delete/${id}`, + id: `${encodeURIComponent(backend)}/delete/${encodeURIComponent(id)}`, }; }, 'model.id' @@ -59,7 +61,7 @@ export default class SecretDeleteMenu extends Component { if (!context.args || !context.args.modelForData || !context.args.modelForData.id) return; let [backend, id] = JSON.parse(context.args.modelForData.id); return { - id: `${backend}/undelete/${id}`, + id: `${encodeURIComponent(backend)}/undelete/${encodeURIComponent(id)}`, }; }, 'model.id' @@ -73,7 +75,7 @@ export default class SecretDeleteMenu extends Component { if (!context.args || !context.args.modelForData || !context.args.modelForData.id) return; let [backend, id] = JSON.parse(context.args.modelForData.id); return { - id: `${backend}/destroy/${id}`, + id: `${encodeURIComponent(backend)}/destroy/${encodeURIComponent(id)}`, }; }, 'model.id' @@ -88,7 +90,7 @@ export default class SecretDeleteMenu extends Component { let backend = context.args.model.engine.id; let id = context.args.model.id; return { - id: `${backend}/metadata/${id}`, + id: `${encodeURIComponent(backend)}/metadata/${encodeURIComponent(id)}`, }; }, 'model',