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

Backport of UI: Correctly call resultant-acl endpoint when user root is root into release/1.15.x #25785

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/25766.txt
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
```release-note:bug
ui: call resultant-acl without namespace header when user mounted at root namespace
```
2 changes: 1 addition & 1 deletion ui/app/adapters/permissions.js
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ import ApplicationAdapter from './application';

export default ApplicationAdapter.extend({
query() {
const namespace = this.namespaceService.userRootNamespace || this.namespaceService.path;
const namespace = this.namespaceService.userRootNamespace ?? this.namespaceService.path;
return this.ajax(this.urlForQuery(), 'GET', { namespace });
},

Expand Down
25 changes: 25 additions & 0 deletions ui/tests/unit/adapters/permissions-test.js
Original file line number Diff line number Diff line change
Expand Up @@ -34,4 +34,29 @@ module('Unit | Adapter | permissions', function (hooks) {
});
await adapter.query();
});
test('it calls resultant-acl with the users root namespace when root', async function (assert) {
assert.expect(1);
const adapter = this.owner.lookup('adapter:permissions');
const nsService = this.owner.lookup('service:namespace');
const auth = this.owner.lookup('service:auth');
nsService.setNamespace('admin');
auth.setCluster('1');
auth.set('tokens', ['vault-_root_☃1']);
auth.setTokenData('vault-_root_☃1', { userRootNamespace: '', backend: { mountPath: 'token' } });

this.server.get('/sys/internal/ui/resultant-acl', (schema, request) => {
assert.false(
Object.keys(request.requestHeaders).includes('X-Vault-Namespace'),
'request is called without namespace'
);

return {
data: {
exact_paths: {},
glob_paths: {},
},
};
});
await adapter.query();
});
});
Loading