Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Wrap secrets #5664

Merged
merged 35 commits into from
Nov 12, 2018
Merged

Wrap secrets #5664

Show file tree
Hide file tree
Changes from 11 commits
Commits
Show all changes
35 commits
Select commit Hold shift + click to select a range
62e4133
add menu for copying secrets, implement copying json of secret
Nov 1, 2018
f867433
add wrapped secret copy funcitonality
Nov 1, 2018
6a57da6
add wrap details tab to tools unwrap page
Nov 1, 2018
8345e5c
add menu for copying secrets, implement copying json of secret
Nov 1, 2018
46de9c8
add wrapped secret copy funcitonality
Nov 1, 2018
a9452b2
add wrap details tab to tools unwrap page
Nov 1, 2018
1b5f1d8
wrap secrets properly for kv v2
Nov 5, 2018
277f84b
use clipboard polyfill to copy wrapped
Nov 5, 2018
a319610
fix conflict
Nov 5, 2018
618f320
Merge branch 'master' of github.com:hashicorp/vault into wrap-secrets
Nov 5, 2018
d88b340
resolve merge nonsense
Nov 5, 2018
0d7922a
tidy up styling for unwrap page
Nov 5, 2018
953424a
use modelForData
Nov 5, 2018
df3f893
simplify copy dropdown, break wrapping into two steps
Nov 6, 2018
6111d62
upgrade yarn and regenerate yarn.lock
Nov 6, 2018
0a4947e
only allow copy for secret versions that are not deleted or destroyed
Nov 6, 2018
055933f
show None and No next to wrap details that don't exist
Nov 6, 2018
adc5a01
Merge branch 'master' into wrap-secrets
madalynrose Nov 7, 2018
ad94214
Merge branch 'master' into wrap-secrets
madalynrose Nov 7, 2018
a93c347
Merge branch 'master' into wrap-secrets
madalynrose Nov 7, 2018
a040d28
reset packages, toggle isWrapping even if it errors
Nov 7, 2018
4b123f0
Merge branch 'wrap-secrets' of github.com:hashicorp/vault into wrap-s…
Nov 7, 2018
0feb677
simplify showWrapButton logic, change unwrap tabs to buttons
Nov 7, 2018
1607e5f
Merge branch 'master' into wrap-secrets
madalynrose Nov 7, 2018
4d64235
Merge branch 'master' into wrap-secrets
madalynrose Nov 7, 2018
30a384d
Merge branch 'master' into wrap-secrets
madalynrose Nov 7, 2018
1925af7
Merge branch 'master' into wrap-secrets
madalynrose Nov 7, 2018
286ac71
Merge branch 'master' into wrap-secrets
madalynrose Nov 8, 2018
a3f254d
Merge branch 'master' into wrap-secrets
madalynrose Nov 8, 2018
ff9ef07
Merge branch 'master' of github.com:hashicorp/vault into wrap-secrets
Nov 8, 2018
096d536
evaluate showing wrap secret button on wrapped data
Nov 8, 2018
309bc1a
Merge branch 'master' into wrap-secrets
madalynrose Nov 9, 2018
76ea70d
oops lost data-test attributes on merge
Nov 9, 2018
a82f0c2
Merge branch 'master' into wrap-secrets
madalynrose Nov 12, 2018
5af1563
Merge branch 'master' into wrap-secrets
madalynrose Nov 12, 2018
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
15 changes: 15 additions & 0 deletions ui/app/adapters/secret-v2-version.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,6 +19,10 @@ export default ApplicationAdapter.extend({
return this._url(backend, path) + `?version=${version}`;
},

urlForQueryRecord(backend, path, version) {
return this._url(backend, path) + `?version=${version}`;
},

findRecord() {
return this._super(...arguments).catch(errorOrModel => {
// if it's a real 404, this will be an error, if not
Expand All @@ -30,6 +34,17 @@ export default ApplicationAdapter.extend({
});
},

queryRecord(backend, path, version, options) {
return this.ajax(this.urlForQueryRecord(backend, path, version), 'GET', options).then(resp => {
if (options.wrapTTL) {
return resp;
}
resp.id = id;
resp.backend = backend;
return resp;
});
},

urlForCreateRecord(modelName, snapshot) {
let backend = snapshot.belongsTo('secret').belongsTo('engine').id;
let path = snapshot.attr('path');
Expand Down
25 changes: 16 additions & 9 deletions ui/app/adapters/secret.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -34,22 +34,29 @@ export default ApplicationAdapter.extend({
return url;
},

optionsForQuery(id, action) {
optionsForQuery(id, action, wrapTTL) {
let data = {};
if (action === 'query') {
data['list'] = true;
data.list = true;
}
if (wrapTTL) {
return { data, wrapTTL };
}

return { data };
},

fetchByQuery(query, action) {
const { id, backend } = query;
return this.ajax(this.urlForSecret(backend, id), 'GET', this.optionsForQuery(id, action)).then(resp => {
resp.id = id;
resp.backend = backend;
return resp;
});
const { id, backend, wrapTTL } = query;
return this.ajax(this.urlForSecret(backend, id), 'GET', this.optionsForQuery(id, action, wrapTTL)).then(
resp => {
if (wrapTTL) {
return resp;
}
resp.id = id;
resp.backend = backend;
return resp;
}
);
},

query(store, type, query) {
Expand Down
24 changes: 24 additions & 0 deletions ui/app/components/secret-edit.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,7 @@ import FocusOnInsertMixin from 'vault/mixins/focus-on-insert';
import keys from 'vault/lib/keycodes';
import KVObject from 'vault/lib/kv-object';
import { maybeQueryRecord } from 'vault/macros/maybe-query-record';
import * as clipboard from 'clipboard-polyfill';
madalynrose marked this conversation as resolved.
Show resolved Hide resolved

const LIST_ROUTE = 'vault.cluster.secrets.backend.list';
const LIST_ROOT_ROUTE = 'vault.cluster.secrets.backend.list-root';
Expand All @@ -17,6 +18,7 @@ export default Component.extend(FocusOnInsertMixin, {
wizard: service(),
router: service(),
store: service(),
flashMessages: service(),

// a key model
key: null,
Expand Down Expand Up @@ -45,6 +47,7 @@ export default Component.extend(FocusOnInsertMixin, {
error: null,

codemirrorString: null,
wrappedSecret: null,

hasLintError: false,
isV2: false,
Expand Down Expand Up @@ -235,6 +238,27 @@ export default Component.extend(FocusOnInsertMixin, {
set(this.modelForData, 'secretData', this.secretData.toJSON());
},

handleWrappedClick() {
if (this.isV2) {
const { path } = this.model.versions.objectAt(this.model.currentVersion - 1);
madalynrose marked this conversation as resolved.
Show resolved Hide resolved
this.store
.adapterFor('secret-v2-version')
.queryRecord(this.model.backend, path, this.model.currentVersion, { wrapTTL: 1800 })
madalynrose marked this conversation as resolved.
Show resolved Hide resolved
.then(resp => {
clipboard.writeText(resp.wrap_info.token);
this.flashMessages.success('Wrapped Token Copied!');
});
} else {
this.store
.adapterFor('secret')
.queryRecord(null, null, { backend: this.model.backend, id: this.model.id, wrapTTL: 1800 })
.then(resp => {
clipboard.writeText(resp.wrap_info.token);
this.flashMessages.success('Wrapped Token Copied!');
});
madalynrose marked this conversation as resolved.
Show resolved Hide resolved
}
},

createOrUpdateKey(type, event) {
event.preventDefault();
let model = this.modelForData;
Expand Down
14 changes: 13 additions & 1 deletion ui/app/components/tool-actions-form.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,6 +14,7 @@ const DEFAULTS = {
creation_ttl: null,
data: '{\n}',
unwrap_data: null,
details: null,
wrapTTL: null,
sum: null,
random_bytes: null,
Expand All @@ -33,6 +34,7 @@ export default Component.extend(DEFAULTS, {
algorithm: 'sha2-256',

tagName: '',
unwrapActiveTab: 'data',

didReceiveAttrs() {
this._super(...arguments);
Expand Down Expand Up @@ -76,7 +78,13 @@ export default Component.extend(DEFAULTS, {
let props = {};
let secret = (resp && resp.data) || resp.auth;
if (secret && action === 'unwrap') {
props = assign({}, props, { unwrap_data: secret });
let details = {
'Request ID': resp.request_id,
'Lease ID': resp.lease_id,
Renewable: resp.renewable,
'Lease Duration': resp.lease_duration,
};
props = assign({}, props, { unwrap_data: secret }, { details: details });
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

You won't need these changes if we move to reading with wrapTTL.

}
props = assign({}, props, secret);
if (resp && resp.wrap_info) {
Expand Down Expand Up @@ -136,5 +144,9 @@ export default Component.extend(DEFAULTS, {
data: val,
});
},

updateUnwrapTab(tab) {
this.set('unwrapActiveTab', tab);
},
},
});
100 changes: 71 additions & 29 deletions ui/app/templates/components/secret-edit.hbs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,7 @@
<ConfirmAction
@buttonClasses="button is-compact is-ghost has-icon-right"
@onConfirmAction={{action "deleteKey"}}
@confirmMessage={{if isV2
@confirmMessage={{if isV2
(concat "This will permanently delete " model.id " and all its versions. Are you sure you want to do this?")
(concat "Are you sure you want to delete " model.id "?")
}}
Expand All @@ -53,43 +53,85 @@
<label for="json" class="has-text-grey">JSON</label>
</div>
{{#if (and (eq mode 'show') (or canEditV2Secret canEdit))}}
<div class="control">
{{#let (concat 'vault.cluster.secrets.backend.' (if (eq mode 'show') 'edit' 'show')) as |targetRoute|}}
{{#if isV2}}
<LinkTo
@params={{array targetRoute model.id (query-params version=this.modelForData.version)}}
@replace={{true}}
class="link link-plain has-text-weight-semibold"
>
Create new version
</LinkTo>
{{else}}
<LinkTo
@params={{array targetRoute model.id}}
@replace={{true}}
class="link link-plain has-text-weight-semibold"
<div class="control">
madalynrose marked this conversation as resolved.
Show resolved Hide resolved
<BasicDropdown
@class="popup-menu"
@horizontalPosition="auto-right"
@verticalPosition="below"
as |D|
>
Edit Secret
</LinkTo>
{{/if}}
{{/let}}
</div>
<D.trigger
data-test-popup-menu-trigger="true"
@class={{concat "link link-plain has-text-weight-semibold" (if D.isOpen " is-active")}}
@tagName="a"
madalynrose marked this conversation as resolved.
Show resolved Hide resolved
>
Copy Secret
</D.trigger>
<D.content @class="popup-menu-content ">
<nav class="box menu">
<ul class="menu-list">
<li>
<CopyButton
@class="link link-plain has-text-weight-semibold is-ghost"
@clipboardText={{codemirrorString}}
@success={{action (set-flash-message "JSON Copied!")}}
data-test-copy-button
>
Copy JSON
</CopyButton>
</li>
<li>
<button
class="link link-plain has-text-weight-semibold is-ghost"
type="button"
{{action "handleWrappedClick"}}
data-test-copy-button
>
Copy Wrapped
</button>
</li>
</ul>
</nav>
</D.content>
</BasicDropdown>
</div>
<div class="control">
{{#if isV2}}
<LinkTo
@params={{array targetRoute model.id (query-params version=this.modelForData.version)}}
@replace={{true}}
class="link link-plain has-text-weight-semibold"
>
Create new version
</LinkTo>
{{else}}
<LinkTo
@params={{array targetRoute model.id}}
@replace={{true}}
class="link link-plain has-text-weight-semibold"
>
Edit Secret
</LinkTo>
{{/if}}
</div>
{{/let}}
{{/if}}
{{#if (and (eq @mode "show") this.isV2)}}
<div class="control">
<SecretVersionMenu @version={{this.modelForData}} />
</div>
<div class="control">
<BasicDropdown
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Yikes not sure why I had all of this trailing whitespace the first time

@class="popup-menu"
@horizontalPosition="auto-right"
@verticalPosition="below"
<BasicDropdown
@class="popup-menu"
@horizontalPosition="auto-right"
@verticalPosition="below"
as |D|
>
<D.trigger
<D.trigger
data-test-popup-menu-trigger="true"
@class={{concat "popup-menu-trigger button is-ghost has-text-grey" (if D.isOpen " is-active")}}
@tagName="button"
@class={{concat "popup-menu-trigger button is-ghost has-text-grey" (if D.isOpen " is-active")}}
@tagName="button"
>
History <ICon @glyph="chevron-right" @size="11" />
</D.trigger>
Expand All @@ -101,8 +143,8 @@
@mode="versions"
@secret={{this.model.id}}
@class="has-text-black has-text-weight-semibold has-bottom-shadow"
>
View version history
>
View version history
</SecretLink>
</li>
</ul>
Expand Down
45 changes: 33 additions & 12 deletions ui/app/templates/partials/tools/unwrap.hbs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,19 +8,40 @@

{{#if unwrap_data}}
<div class="box is-sideless is-fullwidth is-marginless">
<div class="field">
<label class="is-label">
Unwrapped data
</label>
<div class="control">
{{json-editor
value=(stringify unwrap_data)
options=(hash
readOnly=true
)
}}
<nav class="tabs">
<ul>
<li class="{{if (eq unwrapActiveTab "data") "is-active"}}">
<a href="#" {{action "updateUnwrapTab" "data"}} class="link link-plain has-text-weight-semibold {{if (eq unwrapActiveTab "data") "is-active"}}">Data</a>
Copy link
Contributor

@meirish meirish Nov 1, 2018 •
edited
Loading

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

These should be <button type="button">s - anchors w/o an href are bad for a11y.

</li>
<li class="{{if (eq unwrapActiveTab "details") "is-active"}}">
<a href="#" {{action "updateUnwrapTab" "details"}} class="link link-plain has-text-weight-semibold {{if (eq unwrapActiveTab "details") "is-active"}}">Wrap Details</a>
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

You can use the mut helper here if don't want to add the action to the component file. Something like {{action (mut unwrapActiveTab) "details"}} - here's the docs for it https://www.emberjs.com/api/ember/3.5/classes/Ember.Templates.helpers/methods/mut?anchor=mut and we use it quite a bit if you search around the code base.

</li>
</ul>
</nav>
{{#if (eq unwrapActiveTab "data")}}
<div class="field">
<div class="control">
{{json-editor
value=(stringify unwrap_data)
options=(hash
readOnly=true
)
}}
</div>
</div>
</div>
{{else}}
<div class="field box is-fullwidth is-shadowless is-paddingless is-marginless">
{{#each-in details as |key detail|}}
madalynrose marked this conversation as resolved.
Show resolved Hide resolved
{{#info-table-row label=key value=key}}
{{#if detail}}
{{detail}}
{{else}}
<ICon @size=28 @glyph="false" />
madalynrose marked this conversation as resolved.
Show resolved Hide resolved
{{/if}}
{{/info-table-row}}
{{/each-in}}
</div>
{{/if}}
</div>
<div class="field is-grouped box is-fullwidth is-bottomless">
<div class="control">
Expand Down
1 change: 1 addition & 0 deletions ui/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -44,6 +44,7 @@
"broccoli-sri-hash": "meirish/broccoli-sri-hash#rooturl",
"bulma": "^0.5.2",
"bulma-switch": "^0.0.1",
"clipboard-polyfill": "^2.7.0",
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Do we still need this? (if no may want to reset yarn.lock too)

"codemirror": "5.15.2",
"columnify": "^1.5.4",
"cool-checkboxes-for-bulma.io": "^1.1.0",
Expand Down
Loading