scottk/vault
1
0
Fork 0
mirror of https://github.com/optim-enterprises-bv/vault.git synced 2025-10-30 18:17:55 +00:00
Code Issues Packages Projects Releases Wiki Activity

Wrapped token login bug (#19036)

Browse Source 
* fixes issue logging in with wrapped_token via logout route when not logged in

* adds changelog entry

* fixes cluster route mixin test
This commit is contained in:
Jordan Reimer
2023-02-07 14:22:22 -07:00
committed by GitHub
parent 39f8e8687f
commit 2883217a1a
3 changed files with 18 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
changelog/19036.txt Normal file
View File

@@ -0,0 +1,3 @@
```release-note:bug
ui: fixes logout route wrapped_token bug
``

4
ui/app/mixins/cluster-route.js
View File

@@ -29,11 +29,13 @@ export default Mixin.create({
targetRoute !== transition.targetName && targetRoute !== transition.targetName &&
targetRoute !== this.router.currentRouteName targetRoute !== this.router.currentRouteName
) { ) {
// there may be query params so check for inclusion rather than exact match
const isExcluded = EXCLUDED_REDIRECT_URLS.find((url) => this.router.currentURL?.includes(url));
if ( if (
// only want to redirect if we're going to authenticate // only want to redirect if we're going to authenticate
targetRoute === AUTH && targetRoute === AUTH &&
transition.targetName !== CLUSTER_INDEX && transition.targetName !== CLUSTER_INDEX &&
!EXCLUDED_REDIRECT_URLS.includes(this.router.currentURL) !isExcluded
) { ) {
return this.transitionTo(targetRoute, { queryParams: { redirect_to: this.router.currentURL } }); return this.transitionTo(targetRoute, { queryParams: { redirect_to: this.router.currentURL } });
} }

13
ui/tests/acceptance/wrapped-token-test.js
View File

@@ -1,7 +1,8 @@
import { module, test } from 'qunit'; import { module, test } from 'qunit';
import { setupApplicationTest } from 'ember-qunit'; import { setupApplicationTest } from 'ember-qunit';
import { settled, currentURL } from '@ember/test-helpers'; import { settled, currentURL, visit } from '@ember/test-helpers';
import { create } from 'ember-cli-page-object'; import { create } from 'ember-cli-page-object';
import { setupMirage } from 'ember-cli-mirage/test-support';
import auth from 'vault/tests/pages/auth'; import auth from 'vault/tests/pages/auth';
import consoleClass from 'vault/tests/pages/components/console/ui-panel'; import consoleClass from 'vault/tests/pages/components/console/ui-panel';
@@ -27,6 +28,7 @@ const setupWrapping = async () => {
}; };
module('Acceptance | wrapped_token query param functionality', function (hooks) { module('Acceptance | wrapped_token query param functionality', function (hooks) {
setupApplicationTest(hooks); setupApplicationTest(hooks);
setupMirage(hooks);
test('it authenticates you if the query param is present', async function (assert) { test('it authenticates you if the query param is present', async function (assert) {
const token = await setupWrapping(); const token = await setupWrapping();
@@ -41,4 +43,13 @@ module('Acceptance | wrapped_token query param functionality', function (hooks)
await settled(); await settled();
assert.strictEqual(currentURL(), '/vault/secrets', 'authenticates and redirects to home'); assert.strictEqual(currentURL(), '/vault/secrets', 'authenticates and redirects to home');
}); });
test('it should authenticate when hitting logout url with wrapped_token when logged out', async function (assert) {
this.server.post('/sys/wrapping/unwrap', () => {
return { auth: { client_token: 'root' } };
});
await visit(`/vault/logout?wrapped_token=1234`);
assert.strictEqual(currentURL(), '/vault/secrets', 'authenticates and redirects to home');
});
}); });