Skip to content

Backport 1.4.x: UI Transit: Add missed algorithms (#9070) #9721

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

Merged
chelshaw merged 1 commit into from
Aug 12, 2020
Merged

Backport 1.4.x: UI Transit: Add missed algorithms (#9070) #9721

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
11 changes: 11 additions & 0 deletions ui/app/templates/partials/transit-form-create.hbs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,6 +16,9 @@
onchange={{action (mut key.type) value="target.value"}}
data-test-transit-key-type=true
>
<option selected={{eq key.type "aes128-gcm96"}} value="aes128-gcm96">
aes128-gcm96
</option>
<option selected={{eq key.type "aes256-gcm96"}} value="aes256-gcm96">
aes256-gcm96
</option>
Expand All @@ -25,6 +28,12 @@
<option selected={{eq key.type "ecdsa-p256"}} value="ecdsa-p256">
ecdsa-p256
</option>
<option selected={{eq key.type "ecdsa-p384"}} value="ecdsa-p384">
ecdsa-p384
</option>
<option selected={{eq key.type "ecdsa-p521"}} value="ecdsa-p521">
ecdsa-p521
</option>
<option selected={{eq key.type "ed25519"}} value="ed25519">
ed25519
</option>
Expand Down Expand Up @@ -56,6 +65,7 @@
</div>
</div>
{{#if (or
(eq key.type "aes128-gcm96")
(eq key.type "aes256-gcm96")
(eq key.type "chacha20-poly1305")
(eq key.type "ed25519")
Expand All @@ -77,6 +87,7 @@
</div>
{{/if}}
{{#if (or
(eq key.type "aes128-gcm96")
(eq key.type "aes256-gcm96")
(eq key.type "chacha20-poly1305")
)
Expand Down
24 changes: 24 additions & 0 deletions ui/tests/acceptance/transit-test.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,18 @@ import enablePage from 'vault/tests/pages/settings/mount-secret-backend';
import secretListPage from 'vault/tests/pages/secrets/backend/list';

const keyTypes = [
{
name: ts => `aes-${ts}`,
type: 'aes128-gcm96',
exportable: true,
supportsEncryption: true,
},
{
name: ts => `aes-convergent-${ts}`,
type: 'aes128-gcm96',
convergent: true,
supportsEncryption: true,
},
{
name: ts => `aes-${ts}`,
type: 'aes256-gcm96',
Expand Down Expand Up @@ -37,6 +49,18 @@ const keyTypes = [
exportable: true,
supportsSigning: true,
},
{
name: ts => `ecdsa-${ts}`,
type: 'ecdsa-p384',
exportable: true,
supportsSigning: true,
},
{
name: ts => `ecdsa-${ts}`,
type: 'ecdsa-p521',
exportable: true,
supportsSigning: true,
},
{
name: ts => `ed25519-${ts}`,
type: 'ed25519',
Expand Down