From 2cb7ecd851a57254777a34ff7b2e6f21f94598d3 Mon Sep 17 00:00:00 2001 From: Naoki Takezoe Date: Sat, 11 Apr 2020 10:58:28 +0900 Subject: [PATCH] Drop password validation (#2439) --- src/main/java/JettyLauncher.java | 3 --- .../core/controller/AccountController.scala | 4 ++-- .../controller/SystemSettingsController.scala | 4 ++-- .../scala/gitbucket/core/util/Validations.scala | 15 --------------- 4 files changed, 4 insertions(+), 22 deletions(-) diff --git a/src/main/java/JettyLauncher.java b/src/main/java/JettyLauncher.java index 1c2b6ca13..36c28e7aa 100644 --- a/src/main/java/JettyLauncher.java +++ b/src/main/java/JettyLauncher.java @@ -50,9 +50,6 @@ public class JettyLauncher { case "--plugin_dir": System.setProperty("gitbucket.pluginDir", dim[1]); break; - case "--validate_password": - System.setProperty("gitbucket.validate.password", dim[1]); - break; } } } diff --git a/src/main/scala/gitbucket/core/controller/AccountController.scala b/src/main/scala/gitbucket/core/controller/AccountController.scala index 2c9bfa43f..40bd892d1 100644 --- a/src/main/scala/gitbucket/core/controller/AccountController.scala +++ b/src/main/scala/gitbucket/core/controller/AccountController.scala @@ -82,7 +82,7 @@ trait AccountControllerBase extends AccountManagementControllerBase { val newForm = mapping( "userName" -> trim(label("User name", text(required, maxlength(100), identifier, uniqueUserName, reservedNames))), - "password" -> trim(label("Password", text(required, maxlength(20), password))), + "password" -> trim(label("Password", text(required, maxlength(20)))), "fullName" -> trim(label("Full Name", text(required, maxlength(100)))), "mailAddress" -> trim(label("Mail Address", text(required, maxlength(100), uniqueMailAddress()))), "extraMailAddresses" -> list( @@ -94,7 +94,7 @@ trait AccountControllerBase extends AccountManagementControllerBase { )(AccountNewForm.apply) val editForm = mapping( - "password" -> trim(label("Password", optional(text(maxlength(20), password)))), + "password" -> trim(label("Password", optional(text(maxlength(20))))), "fullName" -> trim(label("Full Name", text(required, maxlength(100)))), "mailAddress" -> trim(label("Mail Address", text(required, maxlength(100), uniqueMailAddress("userName")))), "extraMailAddresses" -> list( diff --git a/src/main/scala/gitbucket/core/controller/SystemSettingsController.scala b/src/main/scala/gitbucket/core/controller/SystemSettingsController.scala index b105aa017..b51b22760 100644 --- a/src/main/scala/gitbucket/core/controller/SystemSettingsController.scala +++ b/src/main/scala/gitbucket/core/controller/SystemSettingsController.scala @@ -177,7 +177,7 @@ trait SystemSettingsControllerBase extends AccountManagementControllerBase { val newUserForm = mapping( "userName" -> trim(label("Username", text(required, maxlength(100), identifier, uniqueUserName, reservedNames))), - "password" -> trim(label("Password", text(required, maxlength(20), password))), + "password" -> trim(label("Password", text(required, maxlength(20)))), "fullName" -> trim(label("Full Name", text(required, maxlength(100)))), "mailAddress" -> trim(label("Mail Address", text(required, maxlength(100), uniqueMailAddress()))), "extraMailAddresses" -> list( @@ -191,7 +191,7 @@ trait SystemSettingsControllerBase extends AccountManagementControllerBase { val editUserForm = mapping( "userName" -> trim(label("Username", text(required, maxlength(100), identifier))), - "password" -> trim(label("Password", optional(text(maxlength(20), password)))), + "password" -> trim(label("Password", optional(text(maxlength(20))))), "fullName" -> trim(label("Full Name", text(required, maxlength(100)))), "mailAddress" -> trim(label("Mail Address", text(required, maxlength(100), uniqueMailAddress("userName")))), "extraMailAddresses" -> list( diff --git a/src/main/scala/gitbucket/core/util/Validations.scala b/src/main/scala/gitbucket/core/util/Validations.scala index 65082de6e..b29937c41 100644 --- a/src/main/scala/gitbucket/core/util/Validations.scala +++ b/src/main/scala/gitbucket/core/util/Validations.scala @@ -19,21 +19,6 @@ trait Validations { } } - /** - * Constraint for the password. - */ - val password: Constraint = new Constraint() { - lazy val validatePassword = ConfigUtil.getConfigValue[Boolean]("gitbucket.validate.password").getOrElse(true) - - override def validate(name: String, value: String, messages: Messages): Option[String] = { - if (validatePassword == true && !value.matches("[a-zA-Z0-9\\-_.]+")) { - Some(s"${name} contains invalid character.") - } else { - None - } - } - } - /** * Constraint for the repository identifier. */