This is an automated email from the ASF dual-hosted git repository.
tianxiaoliang pushed a commit to branch v1.x
in repository https://gitbox.apache.org/repos/asf/servicecomb-service-center.git
The following commit(s) were added to refs/heads/v1.x by this push:
new e2e8234 SCB-2176 Fix: Do not print password when invalid (#810)
e2e8234 is described below
commit e2e8234c1ab0fbadb4dbed97d576c550cfc99968
Author: little-cui <[email protected]>
AuthorDate: Wed Jan 6 11:15:52 2021 +0800
SCB-2176 Fix: Do not print password when invalid (#810)
---
pkg/validate/matcher.go | 2 +-
server/service/validate.go | 5 +++--
2 files changed, 4 insertions(+), 3 deletions(-)
diff --git a/pkg/validate/matcher.go b/pkg/validate/matcher.go
index 333fd8c..75bd998 100644
--- a/pkg/validate/matcher.go
+++ b/pkg/validate/matcher.go
@@ -48,5 +48,5 @@ func (p *PasswordChecker) MatchString(s string) bool {
return hasMinLen && hasUpper && hasLower && hasNumber && hasSpecial
}
func (p *PasswordChecker) String() string {
- return "password"
+ return "should len >= 8, contain upper && lower && number && special
chars"
}
diff --git a/server/service/validate.go b/server/service/validate.go
index e4cbc03..81e3710 100644
--- a/server/service/validate.go
+++ b/server/service/validate.go
@@ -30,6 +30,7 @@ import (
var createAccountValidator = &validate.Validator{}
var changePWDValidator = &validate.Validator{}
var accountLoginValidator = &validate.Validator{}
+var pwdValidator = &validate.Rule{Regexp: &validate.PasswordChecker{}, Hide:
true}
func init() {
var roleRegex, _ = regexp.Compile(`^$|^(admin|developer)$`)
@@ -37,9 +38,9 @@ func init() {
var expirationRegex, _ =
regexp.Compile(`^$|^(\d{1,2}d|\d{1,2}h|\d{1,3}m|\d{2,3}s)$`)
createAccountValidator.AddRule("Name", &validate.Rule{Regexp:
accountRegex})
createAccountValidator.AddRule("Role", &validate.Rule{Regexp:
roleRegex})
- createAccountValidator.AddRule("Password", &validate.Rule{Regexp:
&validate.PasswordChecker{}})
+ createAccountValidator.AddRule("Password", pwdValidator)
- changePWDValidator.AddRule("Password", &validate.Rule{Regexp:
&validate.PasswordChecker{}})
+ changePWDValidator.AddRule("Password", pwdValidator)
changePWDValidator.AddRule("Name", &validate.Rule{Regexp: accountRegex})
accountLoginValidator.AddRule("TokenExpirationTime",
&validate.Rule{Regexp: expirationRegex})
