Refactor password validation and config defaults (#7859)

* refactor password validation and config defaults

* reorder config lines for clarity

utils/password.go

@@ -11,55 +11,55 @@ import (
 )
 
 func IsPasswordValid(password string) *model.AppError {
-	id := "model.user.is_valid.pwd"
-	isError := false
-	min := model.PASSWORD_MINIMUM_LENGTH
-
-	if IsLicensed() && *License().Features.PasswordRequirements {
-		if len(password) < *Cfg.PasswordSettings.MinimumLength || len(password) > model.PASSWORD_MAXIMUM_LENGTH {
-			isError = true
-		}
-
-		if *Cfg.PasswordSettings.Lowercase {
-			if !strings.ContainsAny(password, model.LOWERCASE_LETTERS) {
-				isError = true
-			}
-
-			id = id + "_lowercase"
-		}
-
-		if *Cfg.PasswordSettings.Uppercase {
-			if !strings.ContainsAny(password, model.UPPERCASE_LETTERS) {
-				isError = true
-			}
-
-			id = id + "_uppercase"
-		}
-
-		if *Cfg.PasswordSettings.Number {
-			if !strings.ContainsAny(password, model.NUMBERS) {
-				isError = true
-			}
-
-			id = id + "_number"
-		}
-
-		if *Cfg.PasswordSettings.Symbol {
-			if !strings.ContainsAny(password, model.SYMBOLS) {
-				isError = true
-			}
-
-			id = id + "_symbol"
-		}
-
-		min = *Cfg.PasswordSettings.MinimumLength
-	} else if len(password) > model.PASSWORD_MAXIMUM_LENGTH || len(password) < model.PASSWORD_MINIMUM_LENGTH {
-		isError = true
-		min = model.PASSWORD_MINIMUM_LENGTH
-	}
-
-	if isError {
-		return model.NewAppError("User.IsValid", id+".app_error", map[string]interface{}{"Min": min}, "", http.StatusBadRequest)
+	if len(password) > model.PASSWORD_MAXIMUM_LENGTH || len(password) < model.PASSWORD_MINIMUM_LENGTH {
+		return model.NewAppError("User.IsValid", "model.user.is_valid.pwd.app_error", map[string]interface{}{"Min": model.PASSWORD_MINIMUM_LENGTH}, "", http.StatusBadRequest)
+	}
+
+	return nil
+}
+
+func IsPasswordValidWithSettings(password string, settings *model.PasswordSettings) *model.AppError {
+	id := "model.user.is_valid.pwd"
+	isError := false
+
+	if len(password) < *settings.MinimumLength || len(password) > model.PASSWORD_MAXIMUM_LENGTH {
+		isError = true
+	}
+
+	if *settings.Lowercase {
+		if !strings.ContainsAny(password, model.LOWERCASE_LETTERS) {
+			isError = true
+		}
+
+		id = id + "_lowercase"
+	}
+
+	if *settings.Uppercase {
+		if !strings.ContainsAny(password, model.UPPERCASE_LETTERS) {
+			isError = true
+		}
+
+		id = id + "_uppercase"
+	}
+
+	if *settings.Number {
+		if !strings.ContainsAny(password, model.NUMBERS) {
+			isError = true
+		}
+
+		id = id + "_number"
+	}
+
+	if *settings.Symbol {
+		if !strings.ContainsAny(password, model.SYMBOLS) {
+			isError = true
+		}
+
+		id = id + "_symbol"
+	}
+
+	if isError {
+		return model.NewAppError("User.IsValid", id+".app_error", map[string]interface{}{"Min": *settings.MinimumLength}, "", http.StatusBadRequest)
 	}
 
 	return nil