Add ability to match more than one wildcard

hashicorp · Jul 19, 2019 · d949352 · d949352
1 parent de12248
commit d949352
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 2 deletions.
diff --git a/ui/app/abilities/job.js b/ui/app/abilities/job.js
@@ -59,8 +59,8 @@ export default Ability.extend({
     const matchingNamespaceName = globNamespaceNames.reduce(
       (mostMatching, namespaceName) => {
         // TODO what kind of protection/sanitisation is needed here, if any?
-        // and, can there be more than one *?
-        const namespaceNameRegExp = new RegExp(namespaceName.replace('*', '.*'));
+        // and, is * the only matchable character?
+        const namespaceNameRegExp = new RegExp(namespaceName.replace(/\*/g, '.*'));
         const characterDifference = activeNamespace.length - namespaceName.length;
 
         if (

diff --git a/ui/tests/unit/abilities/job-test.js b/ui/tests/unit/abilities/job-test.js
@@ -134,6 +134,9 @@ module('Unit | Ability | job run FIXME just for ease of filtering', function(hoo
               '*-more-suffixed': {
                 policy: 'deny',
               },
+              '*-abc-*': {
+                policy: 'write',
+              },
             },
           },
         },
@@ -163,5 +166,8 @@ module('Unit | Ability | job run FIXME just for ease of filtering', function(hoo
       jobAbility.canRun,
       'expected the namespace with the greatest number of matched characters to be chosen'
     );
+
+    systemService.set('activeNamespace.name', '000-abc-999');
+    assert.ok(jobAbility.canRun, 'expected to be able to match against more than one wildcard');
   });
 });