From 4bd05835a52f70b0df8168d5e850ee2442dadde1 Mon Sep 17 00:00:00 2001 From: Reap3r119 Date: Fri, 29 Sep 2017 11:57:56 -0600 Subject: [PATCH 1/3] Reserve "assets" and "plugin-assets" --- src/main/scala/gitbucket/core/controller/ControllerBase.scala | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/main/scala/gitbucket/core/controller/ControllerBase.scala b/src/main/scala/gitbucket/core/controller/ControllerBase.scala index 41b45cd11..3f04352c7 100644 --- a/src/main/scala/gitbucket/core/controller/ControllerBase.scala +++ b/src/main/scala/gitbucket/core/controller/ControllerBase.scala @@ -321,7 +321,7 @@ trait AccountManagementControllerBase extends ControllerBase { .map { _ => "Mail address is already registered." } } - val allReservedNames = Set("git", "admin", "upload", "api") + val allReservedNames = Set("git", "admin", "upload", "api", "assets", "plugin-assets") protected def reservedNames(): Constraint = new Constraint(){ override def validate(name: String, value: String, messages: Messages): Option[String] = if(allReservedNames.contains(value)){ Some(s"${value} is reserved") From 832733330541ce67ec6508816459e5b1a9e306a6 Mon Sep 17 00:00:00 2001 From: Reap3r119 Date: Fri, 29 Sep 2017 12:13:15 -0600 Subject: [PATCH 2/3] Reserve additional system paths --- src/main/scala/gitbucket/core/controller/ControllerBase.scala | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/main/scala/gitbucket/core/controller/ControllerBase.scala b/src/main/scala/gitbucket/core/controller/ControllerBase.scala index 3f04352c7..f6f785700 100644 --- a/src/main/scala/gitbucket/core/controller/ControllerBase.scala +++ b/src/main/scala/gitbucket/core/controller/ControllerBase.scala @@ -321,7 +321,7 @@ trait AccountManagementControllerBase extends ControllerBase { .map { _ => "Mail address is already registered." } } - val allReservedNames = Set("git", "admin", "upload", "api", "assets", "plugin-assets") + val allReservedNames = Set("git", "admin", "upload", "api", "assets", "plugin-assets", "signin", "signout", "register", "activities.atom", "sidebar-collapse") protected def reservedNames(): Constraint = new Constraint(){ override def validate(name: String, value: String, messages: Messages): Option[String] = if(allReservedNames.contains(value)){ Some(s"${value} is reserved") From f47e389a9bf491a41b17504d85538cbc0bd4c8b3 Mon Sep 17 00:00:00 2001 From: Reap3r119 Date: Fri, 29 Sep 2017 12:34:30 -0600 Subject: [PATCH 3/3] Reserve "groups" and "new" --- src/main/scala/gitbucket/core/controller/ControllerBase.scala | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/main/scala/gitbucket/core/controller/ControllerBase.scala b/src/main/scala/gitbucket/core/controller/ControllerBase.scala index f6f785700..928e5f6f8 100644 --- a/src/main/scala/gitbucket/core/controller/ControllerBase.scala +++ b/src/main/scala/gitbucket/core/controller/ControllerBase.scala @@ -321,7 +321,7 @@ trait AccountManagementControllerBase extends ControllerBase { .map { _ => "Mail address is already registered." } } - val allReservedNames = Set("git", "admin", "upload", "api", "assets", "plugin-assets", "signin", "signout", "register", "activities.atom", "sidebar-collapse") + val allReservedNames = Set("git", "admin", "upload", "api", "assets", "plugin-assets", "signin", "signout", "register", "activities.atom", "sidebar-collapse", "groups", "new") protected def reservedNames(): Constraint = new Constraint(){ override def validate(name: String, value: String, messages: Messages): Option[String] = if(allReservedNames.contains(value)){ Some(s"${value} is reserved")