Merge pull request d2iq-archive#1203 from mesosphere/wip-1176-drexin

fixes d2iq-archive#1176 - Don't allow / as id for AppDefinition or AppUpdate, but al...

src/main/scala/mesosphere/marathon/api/v2/json/Formats.scala

@@ -95,7 +95,7 @@ trait Formats
   }
 
   implicit lazy val PathIdFormat: Format[PathId] = Format(
-    Reads.of[String](Reads.minLength[String](1)).map(PathId(_)).filterNot(_.isRoot),
+    Reads.of[String](Reads.minLength[String](1)).map(PathId(_)),
     Writes[PathId] { id => JsString(id.toString) }
   )
 
@@ -340,7 +340,7 @@ trait AppDefinitionFormats {
     val executorPattern = "^(//cmd)|(/?[^/]+(/[^/]+)*)|$".r
 
     (
-      (__ \ "id").read[PathId] ~
+      (__ \ "id").read[PathId].filterNot(_.isRoot) ~
       (__ \ "cmd").readNullable[String] ~
       (__ \ "args").readNullable[Seq[String]] ~
       (__ \ "user").readNullable[String] ~
@@ -429,7 +429,7 @@ trait AppDefinitionFormats {
   implicit lazy val AppUpdateReads: Reads[AppUpdate] = {
 
     (
-      (__ \ "id").readNullable[PathId] ~
+      (__ \ "id").readNullable[PathId].filterNot(_.exists(_.isRoot)) ~
       (__ \ "cmd").readNullable[String] ~
       (__ \ "args").readNullable[Seq[String]] ~
       (__ \ "user").readNullable[String] ~

src/test/scala/mesosphere/marathon/api/v2/json/AppUpdateFormatTest.scala

@@ -0,0 +1,17 @@
+package mesosphere.marathon.api.v2.json
+
+import mesosphere.marathon.MarathonSpec
+import mesosphere.marathon.api.v2.AppUpdate
+import play.api.libs.json.{ Json, JsResultException }
+
+class AppUpdateFormatTest extends MarathonSpec {
+  import Formats._
+
+  // regression test for #1176
+  test("should fail if id is /") {
+    val json = """{"id": "/"}"""
+    intercept[JsResultException] {
+      Json.parse(json).as[AppUpdate]
+    }
+  }
+}

src/test/scala/mesosphere/marathon/api/v2/json/GroupFormatTest.scala

@@ -0,0 +1,16 @@
+package mesosphere.marathon.api.v2.json
+
+import mesosphere.marathon.MarathonSpec
+import mesosphere.marathon.state.Group
+import play.api.libs.json.Json
+
+class GroupFormatTest extends MarathonSpec {
+  import Formats._
+
+  // regression test for #1176
+  test("allow / as id") {
+    val json = """{"id": "/"}"""
+
+    assert(Json.parse(json).as[Group].id.isRoot)
+  }
+}