Skip to content

A Q&A platform software for teams at any scales. Whether it's a community forum, help center, or knowledge management platform, you can always count on Apache Answer.

fix(user): Add rules to restrict username during installation. fix #181

LinkinStard355c823c39f
diff --git a/internal/install/install_req.go b/internal/install/install_req.go
index ff544406..a465d6bd 100644
--- a/internal/install/install_req.go
+++ b/internal/install/install_req.go
@@ -5,6 +5,10 @@ import (
"net/url"
"strings"
+ "github.com/answerdev/answer/internal/base/reason"
+ "github.com/answerdev/answer/internal/base/validator"
+ "github.com/answerdev/answer/pkg/checker"
+ "github.com/segmentfault/pacman/errors"
"xorm.io/xorm/schemas"
)
@@ -82,6 +86,18 @@ type InitBaseInfoReq struct {
AdminEmail string `validate:"required,email,gt=0,lte=500" json:"email"`
}
+func (r *InitBaseInfoReq) Check() (errFields []*validator.FormErrorField, err error) {
+ if checker.IsInvalidUsername(r.AdminName) {
+ errField := &validator.FormErrorField{
+ ErrorField: "name",
+ ErrorMsg: reason.UsernameInvalid,
+ }
+ errFields = append(errFields, errField)
+ return errFields, errors.BadRequest(reason.UsernameInvalid)
+ }
+ return
+}
+
func (r *InitBaseInfoReq) FormatSiteUrl() {
parsedUrl, err := url.Parse(r.SiteURL)
if err != nil {
diff --git a/internal/schema/user_schema.go b/internal/schema/user_schema.go
index 52449664..308568c8 100644
--- a/internal/schema/user_schema.go
+++ b/internal/schema/user_schema.go
@@ -2,7 +2,6 @@ package schema
import (
"encoding/json"
- "regexp"
"github.com/answerdev/answer/internal/base/reason"
"github.com/answerdev/answer/internal/base/validator"
@@ -301,10 +300,7 @@ type AvatarInfo struct {
func (req *UpdateInfoRequest) Check() (errFields []*validator.FormErrorField, err error) {
if len(req.Username) > 0 {
- errFields := make([]*validator.FormErrorField, 0)
- re := regexp.MustCompile(`^[a-z0-9._-]{4,30}$`)
- match := re.MatchString(req.Username)
- if !match {
+ if checker.IsInvalidUsername(req.Username) {
errField := &validator.FormErrorField{
ErrorField: "username",
ErrorMsg: reason.UsernameInvalid,
diff --git a/internal/service/user_common/user.go b/internal/service/user_common/user.go
index 946319d5..da66f4ce 100644
--- a/internal/service/user_common/user.go
+++ b/internal/service/user_common/user.go
@@ -4,7 +4,6 @@ import (
"context"
"encoding/hex"
"math/rand"
- "regexp"
"strings"
"github.com/Chain-Zhang/pinyin"
@@ -120,9 +119,7 @@ func (us *UserCommon) MakeUsername(ctx context.Context, displayName string) (use
username = strings.ToLower(username)
suffix := ""
- re := regexp.MustCompile(`^[a-z0-9._-]{4,30}$`)
- match := re.MatchString(username)
- if !match {
+ if checker.IsInvalidUsername(username) {
return "", errors.BadRequest(reason.UsernameInvalid)
}
diff --git a/pkg/checker/username.go b/pkg/checker/username.go
new file mode 100644
index 00000000..0225ec0b
--- /dev/null
+++ b/pkg/checker/username.go
@@ -0,0 +1,11 @@
+package checker
+
+import "regexp"
+
+var (
+ usernameReg = regexp.MustCompile(`^[a-z0-9._-]{4,30}$`)
+)
+
+func IsInvalidUsername(username string) bool {
+ return !usernameReg.MatchString(username)
+}