Nemcio/GitBucket
1
0
Fork 0
mirror of https://github.com/gitbucket/gitbucket.git synced 2025-11-01 11:06:06 +01:00
Code Issues Packages Projects Releases Wiki Activity

Drop password validation (#2439)

Browse Source
This commit is contained in:
Naoki Takezoe
2020-04-11 10:58:28 +09:00
committed by GitHub
parent 7d1ad4ce66
commit 2cb7ecd851
4 changed files with 4 additions and 22 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
src/main/java/JettyLauncher.java
View File

@@ -50,9 +50,6 @@ public class JettyLauncher {
case "--plugin_dir": case "--plugin_dir":
System.setProperty("gitbucket.pluginDir", dim[1]); System.setProperty("gitbucket.pluginDir", dim[1]);
break; break;
case "--validate_password":
System.setProperty("gitbucket.validate.password", dim[1]);
break;
} }
} }
} }

4
src/main/scala/gitbucket/core/controller/AccountController.scala
View File

@@ -82,7 +82,7 @@ trait AccountControllerBase extends AccountManagementControllerBase {
val newForm = mapping( val newForm = mapping(
"userName" -> trim(label("User name", text(required, maxlength(100), identifier, uniqueUserName, reservedNames))), "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)))), "fullName" -> trim(label("Full Name", text(required, maxlength(100)))),
"mailAddress" -> trim(label("Mail Address", text(required, maxlength(100), uniqueMailAddress()))), "mailAddress" -> trim(label("Mail Address", text(required, maxlength(100), uniqueMailAddress()))),
"extraMailAddresses" -> list( "extraMailAddresses" -> list(
@@ -94,7 +94,7 @@ trait AccountControllerBase extends AccountManagementControllerBase {
)(AccountNewForm.apply) )(AccountNewForm.apply)
val editForm = mapping( 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)))), "fullName" -> trim(label("Full Name", text(required, maxlength(100)))),
"mailAddress" -> trim(label("Mail Address", text(required, maxlength(100), uniqueMailAddress("userName")))), "mailAddress" -> trim(label("Mail Address", text(required, maxlength(100), uniqueMailAddress("userName")))),
"extraMailAddresses" -> list( "extraMailAddresses" -> list(

4
src/main/scala/gitbucket/core/controller/SystemSettingsController.scala
View File

@@ -177,7 +177,7 @@ trait SystemSettingsControllerBase extends AccountManagementControllerBase {
val newUserForm = mapping( val newUserForm = mapping(
"userName" -> trim(label("Username", text(required, maxlength(100), identifier, uniqueUserName, reservedNames))), "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)))), "fullName" -> trim(label("Full Name", text(required, maxlength(100)))),
"mailAddress" -> trim(label("Mail Address", text(required, maxlength(100), uniqueMailAddress()))), "mailAddress" -> trim(label("Mail Address", text(required, maxlength(100), uniqueMailAddress()))),
"extraMailAddresses" -> list( "extraMailAddresses" -> list(
@@ -191,7 +191,7 @@ trait SystemSettingsControllerBase extends AccountManagementControllerBase {
val editUserForm = mapping( val editUserForm = mapping(
"userName" -> trim(label("Username", text(required, maxlength(100), identifier))), "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)))), "fullName" -> trim(label("Full Name", text(required, maxlength(100)))),
"mailAddress" -> trim(label("Mail Address", text(required, maxlength(100), uniqueMailAddress("userName")))), "mailAddress" -> trim(label("Mail Address", text(required, maxlength(100), uniqueMailAddress("userName")))),
"extraMailAddresses" -> list( "extraMailAddresses" -> list(

15
src/main/scala/gitbucket/core/util/Validations.scala
View File

@@ -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. * Constraint for the repository identifier.
*/ */