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.

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

Dashboard TLS Configuration Details Bug #23726

Merged
merged 3 commits into from
Oct 18, 2023
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
3 changes: 3 additions & 0 deletions changelog/23726.txt
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
```release-note:bug
ui: Fixes issues displaying accurate TLS state in dashboard configuration details
```
Original file line number Diff line number Diff line change
Expand Up @@ -17,11 +17,14 @@ import Component from '@glimmer/component';
*/

export default class DashboardSecretsEnginesCard extends Component {
get tlsDisabled() {
const tlsDisableConfig = this.args.vaultConfiguration?.listeners.find((listener) => {
if (listener.config && listener.config.tls_disable) return listener.config.tls_disable;
get tls() {
// since the default for tls_disable is false it may not be in the config
// consider tls enabled if tls_disable is undefined or false AND both tls_cert_file and tls_key_file are defined
const tlsListener = this.args.vaultConfiguration?.listeners.find((listener) => {
const { tls_disable, tls_cert_file, tls_key_file } = listener.config || {};
return !tls_disable && tls_cert_file && tls_key_file;
});

return tlsDisableConfig?.config.tls_disable ? 'Enabled' : 'Disabled';
return tlsListener ? 'Enabled' : 'Disabled';
}
}
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@
</B.Tr>
<B.Tr>
<B.Td>TLS</B.Td>
<B.Td data-test-vault-config-details="tls_disable">{{this.tlsDisabled}}</B.Td>
<B.Td data-test-vault-config-details="tls">{{this.tls}}</B.Td>
Copy link
Contributor

Choose a reason for hiding this comment

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

🎉

</B.Tr>
<B.Tr>
<B.Td>Log format</B.Td>
Expand Down
60 changes: 29 additions & 31 deletions ui/tests/acceptance/dashboard-test.js
Original file line number Diff line number Diff line change
Expand Up @@ -169,10 +169,17 @@ module('Acceptance | landing page dashboard', function (hooks) {
usage_gauge_period: 5000000000,
},
};
await authPage.login();

this.server.get('sys/config/state/sanitized', () => ({
data: this.data,
wrap_info: null,
warnings: null,
auth: null,
}));
});

test('hides the configuration details card on a non-root namespace enterprise version', async function (assert) {
await authPage.login();
await visit('/vault/dashboard');
const version = this.owner.lookup('service:version');
assert.true(version.isEnterprise, 'vault is enterprise');
Expand All @@ -183,12 +190,6 @@ module('Acceptance | landing page dashboard', function (hooks) {
});

test('shows the configuration details card', async function (assert) {
this.server.get('sys/config/state/sanitized', () => ({
data: this.data,
wrap_info: null,
warnings: null,
auth: null,
}));
await authPage.login();
await visit('/vault/dashboard');
assert.dom(SELECTORS.cardHeader('configuration')).hasText('Configuration details');
Expand All @@ -197,39 +198,36 @@ module('Acceptance | landing page dashboard', function (hooks) {
.hasText('http://127.0.0.1:8200');
assert.dom(SELECTORS.vaultConfigurationCard.configDetailsField('default_lease_ttl')).hasText('0');
assert.dom(SELECTORS.vaultConfigurationCard.configDetailsField('max_lease_ttl')).hasText('2 days');
assert.dom(SELECTORS.vaultConfigurationCard.configDetailsField('tls_disable')).hasText('Enabled');
assert.dom(SELECTORS.vaultConfigurationCard.configDetailsField('tls')).hasText('Disabled'); // tls_disable=true
assert.dom(SELECTORS.vaultConfigurationCard.configDetailsField('log_format')).hasText('None');
assert.dom(SELECTORS.vaultConfigurationCard.configDetailsField('log_level')).hasText('debug');
assert.dom(SELECTORS.vaultConfigurationCard.configDetailsField('type')).hasText('raft');
});
test('shows the tls disabled if it is disabled', async function (assert) {
this.server.get('sys/config/state/sanitized', () => {
this.data.listeners[0].config.tls_disable = false;
return {
data: this.data,
wrap_info: null,
warnings: null,
auth: null,
};
});

test('it should show tls as enabled if tls_disable, tls_cert_file and tls_key_file are in the config', async function (assert) {
this.data.listeners[0].config.tls_disable = false;
this.data.listeners[0].config.tls_cert_file = './cert.pem';
this.data.listeners[0].config.tls_key_file = './key.pem';

await authPage.login();
await visit('/vault/dashboard');
assert.dom(SELECTORS.vaultConfigurationCard.configDetailsField('tls_disable')).hasText('Disabled');
assert.dom(SELECTORS.vaultConfigurationCard.configDetailsField('tls')).hasText('Enabled');
});
test('shows the tls disabled if there is no tlsDisabled returned from server', async function (assert) {
this.server.get('sys/config/state/sanitized', () => {
this.data.listeners = [];

return {
data: this.data,
wrap_info: null,
warnings: null,
auth: null,
};
});

test('it should show tls as enabled if only cert and key exist in config', async function (assert) {
delete this.data.listeners[0].config.tls_disable;
this.data.listeners[0].config.tls_cert_file = './cert.pem';
this.data.listeners[0].config.tls_key_file = './key.pem';
await authPage.login();
await visit('/vault/dashboard');
assert.dom(SELECTORS.vaultConfigurationCard.configDetailsField('tls')).hasText('Enabled');
});

test('it should show tls as disabled if there is no tls information in the config', async function (assert) {
this.data.listeners = [];
await authPage.login();
await visit('/vault/dashboard');
assert.dom(SELECTORS.vaultConfigurationCard.configDetailsField('tls_disable')).hasText('Disabled');
assert.dom(SELECTORS.vaultConfigurationCard.configDetailsField('tls')).hasText('Disabled');
});
});

Expand Down