Disallow dashes in namespace strings

elastic · Nov 20, 2020 · 59f0468 · 59f0468
1 parent 312438f
commit 59f0468
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 2 deletions.
diff --git a/x-pack/plugins/fleet/common/services/is_valid_namespace.test.ts b/x-pack/plugins/fleet/common/services/is_valid_namespace.test.ts
@@ -8,7 +8,6 @@ import { isValidNamespace } from './is_valid_namespace';
 describe('Fleet - isValidNamespace', () => {
   it('returns true for valid namespaces', () => {
     expect(isValidNamespace('default').valid).toBe(true);
-    expect(isValidNamespace('namespace-with-dash').valid).toBe(true);
     expect(isValidNamespace('123').valid).toBe(true);
     expect(isValidNamespace('testlength😀😀😀😀😀😀😀😀😀😀😀😀😀😀😀😀😀😀😀😀😀😀').valid).toBe(
       true
@@ -19,6 +18,7 @@ describe('Fleet - isValidNamespace', () => {
     expect(isValidNamespace('').valid).toBe(false);
     expect(isValidNamespace(' ').valid).toBe(false);
     expect(isValidNamespace('Default').valid).toBe(false);
+    expect(isValidNamespace('namespace-with-dash').valid).toBe(false);
     expect(isValidNamespace('namespace with spaces').valid).toBe(false);
     expect(isValidNamespace('foo/bar').valid).toBe(false);
     expect(isValidNamespace('foo\\bar').valid).toBe(false);

diff --git a/x-pack/plugins/fleet/common/services/is_valid_namespace.ts b/x-pack/plugins/fleet/common/services/is_valid_namespace.ts
@@ -23,7 +23,7 @@ export function isValidNamespace(namespace: string): { valid: boolean; error?: s
         defaultMessage: 'Namespace must be lowercase',
       }),
     };
-  } else if (/[\*\\/\?"<>|\s,#:]+/.test(namespace)) {
+  } else if (/[\*\\/\?"<>|\s,#:-]+/.test(namespace)) {
     return {
       valid: false,
       error: i18n.translate('xpack.fleet.namespaceValidation.invalidCharactersErrorMessage', {