{{#each this.flashMessages.queue as |flash|}}
@@ -84,6 +81,11 @@
{{#if this.auth.isActiveSession}}
+ {{#if this.permissionBanner}}
+
+
+
+ {{/if}}
{{outlet}}
{{else}}
diff --git a/ui/tests/unit/services/permissions-test.js b/ui/tests/unit/services/permissions-test.js
index c9483fc365..ebab76f02c 100644
--- a/ui/tests/unit/services/permissions-test.js
+++ b/ui/tests/unit/services/permissions-test.js
@@ -250,4 +250,138 @@ module('Unit | Service | permissions', function (hooks) {
);
});
});
+
+ module('wildcardPath calculates correctly', function () {
+ [
+ {
+ scenario: 'no user root or chroot',
+ userRoot: '',
+ chroot: null,
+ expectedPath: '',
+ },
+ {
+ scenario: 'user root = child ns and no chroot',
+ userRoot: 'bar',
+ chroot: null,
+ expectedPath: 'bar/',
+ },
+ {
+ scenario: 'user root = child ns and chroot set',
+ userRoot: 'bar',
+ chroot: 'admin/',
+ expectedPath: 'admin/bar/',
+ },
+ {
+ scenario: 'no user root and chroot set',
+ userRoot: '',
+ chroot: 'admin/',
+ expectedPath: 'admin/',
+ },
+ ].forEach((testCase) => {
+ test(`when ${testCase.scenario}`, function (assert) {
+ const namespaceService = Service.extend({
+ userRootNamespace: testCase.userRoot,
+ path: 'current/path/does/not/matter',
+ });
+ this.owner.register('service:namespace', namespaceService);
+ this.service.set('chrootNamespace', testCase.chroot);
+ assert.strictEqual(this.service.wildcardPath, testCase.expectedPath);
+ });
+ });
+ test('when user root =child ns and chroot set', function (assert) {
+ const namespaceService = Service.extend({
+ path: 'bar/baz',
+ userRootNamespace: 'bar',
+ });
+ this.owner.register('service:namespace', namespaceService);
+ this.service.set('chrootNamespace', 'admin/');
+ assert.strictEqual(this.service.wildcardPath, 'admin/bar/');
+ });
+ });
+
+ module('hasWildcardAccess calculates correctly', function () {
+ // The resultant-acl endpoint returns paths with chroot and
+ // relative root prefixed on all paths.
+ [
+ {
+ scenario: 'when root wildcard in root namespace',
+ chroot: null,
+ userRoot: '',
+ currentNs: 'foo/bar',
+ globs: {
+ '': { capabilities: ['read'] },
+ },
+ expectedAccess: true,
+ },
+ {
+ scenario: 'when root wildcard in chroot ns',
+ chroot: 'admin/',
+ userRoot: '',
+ currentNs: 'admin/child',
+ globs: {
+ 'admin/': { capabilities: ['read'] },
+ },
+ expectedAccess: true,
+ },
+ {
+ scenario: 'when namespace wildcard in child ns',
+ chroot: null,
+ userRoot: 'bar',
+ currentNs: 'bar/baz',
+ globs: {
+ 'bar/': { capabilities: ['read'] },
+ },
+ expectedAccess: true,
+ },
+ {
+ scenario: 'when namespace wildcard in child ns & chroot',
+ chroot: 'foo/',
+ userRoot: 'bar',
+ currentNs: 'foo/bar/baz',
+ globs: {
+ 'foo/bar/': { capabilities: ['read'] },
+ },
+ expectedAccess: true,
+ },
+ {
+ scenario: 'when namespace wildcard in different ns with chroot & user root',
+ chroot: 'foo/',
+ userRoot: 'bar',
+ currentNs: 'foo/bing',
+ globs: {
+ 'foo/bar/': { capabilities: ['read'] },
+ },
+ expectedAccess: false,
+ },
+ {
+ scenario: 'when namespace wildcard in different ns without chroot',
+ chroot: null,
+ userRoot: 'bar',
+ currentNs: 'foo/bing',
+ globs: {
+ 'bar/': { capabilities: ['read'] },
+ },
+ expectedAccess: false,
+ },
+ {
+ scenario: 'when globs is empty',
+ chroot: 'foo/',
+ userRoot: 'bar',
+ currentNs: 'foo/bing',
+ globs: {},
+ expectedAccess: false,
+ },
+ ].forEach((testCase) => {
+ test(`when ${testCase.scenario}`, function (assert) {
+ const namespaceService = Service.extend({
+ path: testCase.currentNs,
+ userRootNamespace: testCase.userRoot,
+ });
+ this.owner.register('service:namespace', namespaceService);
+ this.service.set('chrootNamespace', testCase.chroot);
+ const result = this.service.hasWildcardAccess(testCase.globs);
+ assert.strictEqual(result, testCase.expectedAccess);
+ });
+ });
+ });
});