diff --git a/src/main/java/JettyLauncher.java b/src/main/java/JettyLauncher.java index 1c2b6ca..36c28e7 100644 --- a/src/main/java/JettyLauncher.java +++ b/src/main/java/JettyLauncher.java @@ -50,9 +50,6 @@ 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 2c9bfa4..40bd892 100644 --- a/src/main/scala/gitbucket/core/controller/AccountController.scala +++ b/src/main/scala/gitbucket/core/controller/AccountController.scala @@ -82,7 +82,7 @@ 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 @@ )(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 b105aa0..b51b227 100644 --- a/src/main/scala/gitbucket/core/controller/SystemSettingsController.scala +++ b/src/main/scala/gitbucket/core/controller/SystemSettingsController.scala @@ -177,7 +177,7 @@ 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 @@ 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 65082de..b29937c 100644 --- a/src/main/scala/gitbucket/core/util/Validations.scala +++ b/src/main/scala/gitbucket/core/util/Validations.scala @@ -20,21 +20,6 @@ } /** - * 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. */ val repository: Constraint = new Constraint() {