Merge pull request #762 from mesosphere/fix/no-multi-slashes

Disallow multiple forward slashes
mesosphere · Apr 25, 2016 · 16fc063 · 16fc063
2 parents 7c7a47c + a48e944
commit 16fc063
Show file tree

Hide file tree

Showing 5 changed files with 17 additions and 0 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -10,6 +10,9 @@
   applications
 - \#3793 Wrong application status
 
+### Changed
+- \#3660 - Multiple forward slashes allowed in app ID
+
 ## 1.1.2 - 2016-04-14
 ### Fixed
 - \#3763 - Enable multiple general errors from server response

diff --git a/src/js/constants/AppFormErrorMessages.js b/src/js/constants/AppFormErrorMessages.js
@@ -7,6 +7,7 @@ const applicationFieldValidationErrors = Util.deepFreeze({
   appId: [
     "ID must not be empty",
     "Path must not contain whitespace",
+    "Path must not contain multiple forward slashes",
     "Path contains invalid characters " +
       "(allowed: lowercase letters, digits, hyphens, \".\", \"..\")",
     "Path is not well-formed"

diff --git a/src/js/stores/AppFormStore.js b/src/js/stores/AppFormStore.js
@@ -43,6 +43,7 @@ const validationRules = {
   "appId": [
     AppFormValidators.appIdNotEmpty,
     AppFormValidators.appIdNoWhitespaces,
+    AppFormValidators.appIdNoMultipleSlashes,
     AppFormValidators.appIdValidChars,
     AppFormValidators.appIdWellFormedPath
   ],

diff --git a/src/js/stores/validators/AppFormValidators.js b/src/js/stores/validators/AppFormValidators.js
@@ -26,6 +26,8 @@ const AppFormValidators = {
 
   appIdNoWhitespaces: (str) => str.match(/ /g) == null,
 
+  appIdNoMultipleSlashes: (str) => str.match(/\/{2,}/g) == null,
+
   appIdValidChars: (str) => str.match(/[^a-z0-9\-\.\/]/g) == null,
 
   appIdWellFormedPath: (str) => {

diff --git a/src/test/units/AppFormValidators.test.js b/src/test/units/AppFormValidators.test.js
@@ -30,6 +30,16 @@ describe("App Form Validators", function () {
           .to.be.false;
       });
 
+      it("has no multiple forward slashes", function () {
+        expect(this.validatior.appIdNoMultipleSlashes("/hello/world"))
+          .to.be.true;
+      });
+
+      it("has multiple forward slashes", function () {
+        expect(this.validatior.appIdNoMultipleSlashes("/hello//world////"))
+          .to.be.false;
+      });
+
       it("has no illegal characters", function () {
         expect(this.validatior.appIdValidChars("./app-1.b")).to.be.true;
       });