You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@answer.apache.org by li...@apache.org on 2026/07/07 08:27:14 UTC
(answer) branch fix/2.0.2/user updated (1e329eb5 -> acc3e070)
This is an automated email from the ASF dual-hosted git repository.
LinkinStars pushed a change to branch fix/2.0.2/user
in repository https://gitbox.apache.org/repos/asf/answer.git
from 1e329eb5 fix external login account binding
new 9e8414cc Align revision audit permission checks
new 3f30215e Harden avatar cleanup ownership checks
new e424fce0 Harden Accept-Language parsing
new acc3e070 fix: update goroutine handling and context imports for consistency
The 4 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails. The revisions
listed as "add" were already present in the repository and have only
been added to this reference.
Summary of changes:
go.mod | 14 +++----
go.sum | 32 +++++++--------
internal/base/middleware/accept_language.go | 6 +++
internal/base/queue/queue.go | 6 +--
internal/base/queue/queue_test.go | 6 +--
internal/controller/template_render/tags.go | 3 +-
internal/controller/template_render/userinfo.go | 3 +-
internal/service/content/question_service.go | 2 +-
internal/service/content/revision_service.go | 48 ++++++++++++++--------
internal/service/content/user_service.go | 10 ++++-
internal/service/export/email_service.go | 2 +-
internal/service/report/report_service.go | 2 +-
.../user_external_login_service.go | 19 ++++-----
13 files changed, 86 insertions(+), 67 deletions(-)
(answer) 01/04: Align revision audit permission checks
Posted by li...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
LinkinStars pushed a commit to branch fix/2.0.2/user
in repository https://gitbox.apache.org/repos/asf/answer.git
commit 9e8414cc15e8ba74d0cba05fe95048e89ff58b00
Author: LinkinStars <li...@foxmail.com>
AuthorDate: Tue Jul 7 12:18:55 2026 +0800
Align revision audit permission checks
---
internal/service/content/revision_service.go | 48 +++++++++++++++++-----------
1 file changed, 30 insertions(+), 18 deletions(-)
diff --git a/internal/service/content/revision_service.go b/internal/service/content/revision_service.go
index 83568088..b932ba8b 100644
--- a/internal/service/content/revision_service.go
+++ b/internal/service/content/revision_service.go
@@ -114,14 +114,20 @@ func (rs *RevisionService) RevisionAudit(ctx context.Context, req *schema.Revisi
if revisioninfo.Status != entity.RevisionUnreviewedStatus {
return
}
+ objectType, objectTypeerr := obj.GetObjectTypeStrByObjectID(revisioninfo.ObjectID)
+ if objectTypeerr != nil {
+ return objectTypeerr
+ }
if req.Operation == schema.RevisionAuditReject {
+ if err = checkRevisionAuditPermission(req, objectType); err != nil {
+ return err
+ }
err = rs.revisionRepo.UpdateStatus(ctx, req.ID, entity.RevisionReviewRejectStatus, req.UserID)
return
}
if req.Operation == schema.RevisionAuditApprove {
- objectType, objectTypeerr := obj.GetObjectTypeStrByObjectID(revisioninfo.ObjectID)
- if objectTypeerr != nil {
- return objectTypeerr
+ if err = checkRevisionAuditPermission(req, objectType); err != nil {
+ return err
}
revisionitem := &schema.GetRevisionResp{}
_ = copier.Copy(revisionitem, revisioninfo)
@@ -129,23 +135,11 @@ func (rs *RevisionService) RevisionAudit(ctx context.Context, req *schema.Revisi
var saveErr error
switch objectType {
case constant.QuestionObjectType:
- if !req.CanReviewQuestion {
- saveErr = errors.BadRequest(reason.RevisionNoPermission)
- } else {
- saveErr = rs.revisionAuditQuestion(ctx, revisionitem)
- }
+ saveErr = rs.revisionAuditQuestion(ctx, revisionitem)
case constant.AnswerObjectType:
- if !req.CanReviewAnswer {
- saveErr = errors.BadRequest(reason.RevisionNoPermission)
- } else {
- saveErr = rs.revisionAuditAnswer(ctx, revisionitem)
- }
+ saveErr = rs.revisionAuditAnswer(ctx, revisionitem)
case constant.TagObjectType:
- if !req.CanReviewTag {
- saveErr = errors.BadRequest(reason.RevisionNoPermission)
- } else {
- saveErr = rs.revisionAuditTag(ctx, revisionitem)
- }
+ saveErr = rs.revisionAuditTag(ctx, revisionitem)
}
if saveErr != nil {
return saveErr
@@ -179,6 +173,24 @@ func (rs *RevisionService) RevisionAudit(ctx context.Context, req *schema.Revisi
return nil
}
+func checkRevisionAuditPermission(req *schema.RevisionAuditReq, objectType string) error {
+ switch objectType {
+ case constant.QuestionObjectType:
+ if !req.CanReviewQuestion {
+ return errors.BadRequest(reason.RevisionNoPermission)
+ }
+ case constant.AnswerObjectType:
+ if !req.CanReviewAnswer {
+ return errors.BadRequest(reason.RevisionNoPermission)
+ }
+ case constant.TagObjectType:
+ if !req.CanReviewTag {
+ return errors.BadRequest(reason.RevisionNoPermission)
+ }
+ }
+ return nil
+}
+
func (rs *RevisionService) revisionAuditQuestion(ctx context.Context, revisionitem *schema.GetRevisionResp) (err error) {
questioninfo, ok := revisionitem.ContentParsed.(*schema.QuestionInfoResp)
if ok {
(answer) 04/04: fix: update goroutine handling and context imports for consistency
Posted by li...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
LinkinStars pushed a commit to branch fix/2.0.2/user
in repository https://gitbox.apache.org/repos/asf/answer.git
commit acc3e070152f22fdb252abb1a0fc0e6db50d0bdf
Author: LinkinStars <li...@foxmail.com>
AuthorDate: Tue Jul 7 16:26:45 2026 +0800
fix: update goroutine handling and context imports for consistency
---
go.mod | 2 +-
internal/base/queue/queue.go | 6 ++----
internal/base/queue/queue_test.go | 6 ++----
internal/controller/template_render/tags.go | 3 ++-
internal/controller/template_render/userinfo.go | 3 ++-
internal/service/content/question_service.go | 2 +-
internal/service/export/email_service.go | 2 +-
internal/service/report/report_service.go | 2 +-
.../user_external_login_service.go | 19 +++++++------------
9 files changed, 19 insertions(+), 26 deletions(-)
diff --git a/go.mod b/go.mod
index 7b68c180..5787c8b1 100644
--- a/go.mod
+++ b/go.mod
@@ -64,7 +64,6 @@ require (
go.uber.org/mock v0.6.0
golang.org/x/crypto v0.53.0
golang.org/x/image v0.20.0
- golang.org/x/net v0.56.0
golang.org/x/term v0.44.0
golang.org/x/text v0.39.0
gopkg.in/gomail.v2 v2.0.0-20160411212932-81ebce5c23df
@@ -171,6 +170,7 @@ require (
go.uber.org/zap v1.27.0 // indirect
golang.org/x/arch v0.10.0 // indirect
golang.org/x/exp v0.0.0-20240909161429-701f63a606c0 // indirect
+ golang.org/x/net v0.56.0 // indirect
golang.org/x/sys v0.46.0 // indirect
golang.org/x/tools v0.47.0 // indirect
google.golang.org/protobuf v1.34.2 // indirect
diff --git a/internal/base/queue/queue.go b/internal/base/queue/queue.go
index b3a8757a..4389c292 100644
--- a/internal/base/queue/queue.go
+++ b/internal/base/queue/queue.go
@@ -102,13 +102,11 @@ func (q *Queue[T]) Close() {
// startWorker starts the background goroutine that processes messages.
func (q *Queue[T]) startWorker() {
- q.wg.Add(1)
- go func() {
- defer q.wg.Done()
+ q.wg.Go(func() {
for msg := range q.queue {
q.processMessage(msg)
}
- }()
+ })
}
// processMessage handles a single message with proper synchronization.
diff --git a/internal/base/queue/queue_test.go b/internal/base/queue/queue_test.go
index 23f0fda7..b84cbde0 100644
--- a/internal/base/queue/queue_test.go
+++ b/internal/base/queue/queue_test.go
@@ -200,13 +200,11 @@ func TestQueue_ConcurrentRegisterHandler(t *testing.T) {
// Concurrently register handlers - should not race
var wg sync.WaitGroup
for range 10 {
- wg.Add(1)
- go func() {
- defer wg.Done()
+ wg.Go(func() {
q.RegisterHandler(func(ctx context.Context, msg *testMessage) error {
return nil
})
- }()
+ })
}
wg.Wait()
}
diff --git a/internal/controller/template_render/tags.go b/internal/controller/template_render/tags.go
index 6a6dacc9..d7798c63 100644
--- a/internal/controller/template_render/tags.go
+++ b/internal/controller/template_render/tags.go
@@ -20,10 +20,11 @@
package templaterender
import (
+ "context"
+
"github.com/apache/answer/internal/base/pager"
"github.com/apache/answer/internal/schema"
"github.com/jinzhu/copier"
- "golang.org/x/net/context"
)
func (q *TemplateRenderController) TagList(ctx context.Context, req *schema.GetTagWithPageReq) (resp *pager.PageModel, err error) {
diff --git a/internal/controller/template_render/userinfo.go b/internal/controller/template_render/userinfo.go
index 1734f65c..eb4fb91c 100644
--- a/internal/controller/template_render/userinfo.go
+++ b/internal/controller/template_render/userinfo.go
@@ -20,8 +20,9 @@
package templaterender
import (
+ "context"
+
"github.com/apache/answer/internal/schema"
- "golang.org/x/net/context"
)
func (q *TemplateRenderController) UserInfo(ctx context.Context, req *schema.GetOtherUserInfoByUsernameReq) (resp *schema.GetOtherUserInfoByUsernameResp, err error) {
diff --git a/internal/service/content/question_service.go b/internal/service/content/question_service.go
index 474c1fcd..73f66a4c 100644
--- a/internal/service/content/question_service.go
+++ b/internal/service/content/question_service.go
@@ -20,6 +20,7 @@
package content
import (
+ "context"
"encoding/json"
"fmt"
"strings"
@@ -64,7 +65,6 @@ import (
"github.com/jinzhu/copier"
"github.com/segmentfault/pacman/errors"
"github.com/segmentfault/pacman/log"
- "golang.org/x/net/context"
)
// QuestionRepo question repository
diff --git a/internal/service/export/email_service.go b/internal/service/export/email_service.go
index bb00b828..5b649354 100644
--- a/internal/service/export/email_service.go
+++ b/internal/service/export/email_service.go
@@ -20,6 +20,7 @@
package export
import (
+ "context"
"crypto/tls"
"encoding/json"
"fmt"
@@ -40,7 +41,6 @@ import (
"github.com/apache/answer/internal/service/siteinfo_common"
"github.com/segmentfault/pacman/errors"
"github.com/segmentfault/pacman/log"
- "golang.org/x/net/context"
"gopkg.in/gomail.v2"
)
diff --git a/internal/service/report/report_service.go b/internal/service/report/report_service.go
index 84c15d59..3edbc1b4 100644
--- a/internal/service/report/report_service.go
+++ b/internal/service/report/report_service.go
@@ -20,6 +20,7 @@
package report
import (
+ "context"
"encoding/json"
"github.com/apache/answer/internal/service/eventqueue"
@@ -44,7 +45,6 @@ import (
"github.com/jinzhu/copier"
"github.com/segmentfault/pacman/errors"
"github.com/segmentfault/pacman/log"
- "golang.org/x/net/context"
)
// ReportService user service
diff --git a/internal/service/user_external_login/user_external_login_service.go b/internal/service/user_external_login/user_external_login_service.go
index 2d209dbb..08f17ad4 100644
--- a/internal/service/user_external_login/user_external_login_service.go
+++ b/internal/service/user_external_login/user_external_login_service.go
@@ -186,18 +186,16 @@ func (us *UserExternalLoginService) ExternalLogin(
}, nil
}
- oldUserInfo, exist, err := us.userRepo.GetByEmail(ctx, externalUserInfo.Email)
- if err != nil {
+ if _, exist, err := us.userRepo.GetByEmail(ctx, externalUserInfo.Email); err != nil {
return nil, err
- }
- if exist {
+ } else if exist {
return &schema.UserExternalLoginResp{
ErrTitle: translator.Tr(handler.GetLangByCtx(ctx), reason.UserAccessDenied),
ErrMsg: translator.Tr(handler.GetLangByCtx(ctx), reason.UserAccessDenied),
}, nil
}
// if user is not a member, register a new user
- oldUserInfo, err = us.registerNewUser(ctx, externalUserInfo)
+ oldUserInfo, err := us.registerNewUser(ctx, externalUserInfo)
if err != nil {
return nil, err
}
@@ -363,21 +361,18 @@ func (us *UserExternalLoginService) ExternalLoginBindingUserSendEmail(
return &schema.ExternalLoginBindingUserSendEmailResp{}, nil
}
- userInfo, exist, err := us.userRepo.GetByEmail(ctx, req.Email)
- if err != nil {
+ if _, exist, err := us.userRepo.GetByEmail(ctx, req.Email); err != nil {
return nil, err
- }
- if exist && !req.Must {
+ } else if exist && !req.Must {
resp.EmailExistAndMustBeConfirmed = true
return resp, nil
- }
- if exist {
+ } else if exist {
resp.EmailExistAndMustBeConfirmed = true
return resp, nil
}
externalLoginInfo.Email = req.Email
- userInfo, err = us.registerNewUser(ctx, externalLoginInfo)
+ userInfo, err := us.registerNewUser(ctx, externalLoginInfo)
if err != nil {
return nil, err
}
(answer) 02/04: Harden avatar cleanup ownership checks
Posted by li...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
LinkinStars pushed a commit to branch fix/2.0.2/user
in repository https://gitbox.apache.org/repos/asf/answer.git
commit 3f30215e716e78cbfc7787d288ff22cef300fed2
Author: LinkinStars <li...@foxmail.com>
AuthorDate: Tue Jul 7 14:33:21 2026 +0800
Harden avatar cleanup ownership checks
---
internal/service/content/user_service.go | 10 +++++++++-
1 file changed, 9 insertions(+), 1 deletion(-)
diff --git a/internal/service/content/user_service.go b/internal/service/content/user_service.go
index d0ebe875..c1f800ff 100644
--- a/internal/service/content/user_service.go
+++ b/internal/service/content/user_service.go
@@ -360,7 +360,7 @@ func (us *UserService) UpdateInfo(ctx context.Context, req *schema.UpdateInfoReq
cond := us.formatUserInfoForUpdateInfo(oldUserInfo, req)
- us.cleanUpRemovedAvatar(ctx, oldUserInfo.Avatar, cond.Avatar)
+ us.cleanUpRemovedAvatar(ctx, req.UserID, oldUserInfo.Avatar, cond.Avatar)
err = us.userRepo.UpdateInfo(ctx, cond)
if err != nil {
@@ -407,6 +407,7 @@ func (us *UserService) validateAvatarInfo(
func (us *UserService) cleanUpRemovedAvatar(
ctx context.Context,
+ updatingUserID string,
oldAvatarJSON string,
newAvatarJSON string,
) {
@@ -434,6 +435,13 @@ func (us *UserService) cleanUpRemovedAvatar(
log.Warn("no file record found for old avatar url:", oldAvatar.Custom)
return
}
+ if fileRecord.UserID != updatingUserID || fileRecord.Source != string(plugin.UserAvatar) {
+ log.Warnf(
+ "refuse to clean avatar url %q: file record owner/source mismatch (owner=%s source=%s updating_user=%s)",
+ oldAvatar.Custom, fileRecord.UserID, fileRecord.Source, updatingUserID,
+ )
+ return
+ }
if err := us.fileRecordService.DeleteAndMoveFileRecord(ctx, fileRecord); err != nil {
log.Error(err)
}
(answer) 03/04: Harden Accept-Language parsing
Posted by li...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
LinkinStars pushed a commit to branch fix/2.0.2/user
in repository https://gitbox.apache.org/repos/asf/answer.git
commit e424fce03fa049303afab5bceaca6c797aa77354
Author: LinkinStars <li...@foxmail.com>
AuthorDate: Tue Jul 7 15:05:47 2026 +0800
Harden Accept-Language parsing
---
go.mod | 14 ++++++-------
go.sum | 32 ++++++++++++++---------------
internal/base/middleware/accept_language.go | 6 ++++++
3 files changed, 29 insertions(+), 23 deletions(-)
diff --git a/go.mod b/go.mod
index 11c3a816..7b68c180 100644
--- a/go.mod
+++ b/go.mod
@@ -17,7 +17,7 @@
module github.com/apache/answer
-go 1.24.0
+go 1.25.0
require (
github.com/Machiel/slugify v1.0.1
@@ -62,11 +62,11 @@ require (
github.com/tidwall/gjson v1.17.3
github.com/yuin/goldmark v1.7.4
go.uber.org/mock v0.6.0
- golang.org/x/crypto v0.41.0
+ golang.org/x/crypto v0.53.0
golang.org/x/image v0.20.0
- golang.org/x/net v0.43.0
- golang.org/x/term v0.34.0
- golang.org/x/text v0.28.0
+ golang.org/x/net v0.56.0
+ golang.org/x/term v0.44.0
+ golang.org/x/text v0.39.0
gopkg.in/gomail.v2 v2.0.0-20160411212932-81ebce5c23df
gopkg.in/yaml.v3 v3.0.1
modernc.org/sqlite v1.33.0
@@ -171,8 +171,8 @@ require (
go.uber.org/zap v1.27.0 // indirect
golang.org/x/arch v0.10.0 // indirect
golang.org/x/exp v0.0.0-20240909161429-701f63a606c0 // indirect
- golang.org/x/sys v0.35.0 // indirect
- golang.org/x/tools v0.36.0 // indirect
+ golang.org/x/sys v0.46.0 // indirect
+ golang.org/x/tools v0.47.0 // indirect
google.golang.org/protobuf v1.34.2 // indirect
gopkg.in/alexcesaro/quotedprintable.v3 v3.0.0-20150716171945-2caba252f4dc // indirect
gopkg.in/ini.v1 v1.67.0 // indirect
diff --git a/go.sum b/go.sum
index be61e11f..1001f1da 100644
--- a/go.sum
+++ b/go.sum
@@ -705,8 +705,8 @@ golang.org/x/crypto v0.0.0-20201203163018-be400aefbc4c/go.mod h1:jdWPYTVW3xRLrWP
golang.org/x/crypto v0.0.0-20210322153248-0c34fe9e7dc2/go.mod h1:T9bdIzuCu7OtxOm1hfPfRQxPLYneinmdGuTeoZ9dtd4=
golang.org/x/crypto v0.0.0-20210616213533-5ff15b29337e/go.mod h1:GvvjBRRGRdwPK5ydBHafDWAxML/pGHZbMvKqRZ5+Abc=
golang.org/x/crypto v0.0.0-20210921155107-089bfa567519/go.mod h1:GvvjBRRGRdwPK5ydBHafDWAxML/pGHZbMvKqRZ5+Abc=
-golang.org/x/crypto v0.41.0 h1:WKYxWedPGCTVVl5+WHSSrOBT0O8lx32+zxmHxijgXp4=
-golang.org/x/crypto v0.41.0/go.mod h1:pO5AFd7FA68rFak7rOAGVuygIISepHftHnr8dr6+sUc=
+golang.org/x/crypto v0.53.0 h1:QZ4Muo8THX6CizN2vPPd5fBGHyogrdK9fG4wLPFUsto=
+golang.org/x/crypto v0.53.0/go.mod h1:DNLU434OwVakk9PzuwV8w62mAJpRJL3vsgcfp4Qnsio=
golang.org/x/exp v0.0.0-20190121172915-509febef88a4/go.mod h1:CJ0aWSM057203Lf6IL+f9T1iT9GByDxfZKAQTCR3kQA=
golang.org/x/exp v0.0.0-20240909161429-701f63a606c0 h1:e66Fs6Z+fZTbFBAxKfP3PALWBtpfqks2bwGcexMxgtk=
golang.org/x/exp v0.0.0-20240909161429-701f63a606c0/go.mod h1:2TbTHSBQa924w8M6Xs1QcRcFwyucIwBGpK1p2f1YFFY=
@@ -723,8 +723,8 @@ golang.org/x/mod v0.1.1-0.20191105210325-c90efee705ee/go.mod h1:QqPTAvyqsEbceGzB
golang.org/x/mod v0.2.0/go.mod h1:s0Qsj1ACt9ePp/hMypM3fl4fZqREWJwdYDEqhRiZZUA=
golang.org/x/mod v0.3.0/go.mod h1:s0Qsj1ACt9ePp/hMypM3fl4fZqREWJwdYDEqhRiZZUA=
golang.org/x/mod v0.6.0-dev.0.20220419223038-86c51ed26bb4/go.mod h1:jJ57K6gSWd91VN4djpZkiMVwK6gcyfeH4XE8wZrZaV4=
-golang.org/x/mod v0.27.0 h1:kb+q2PyFnEADO2IEF935ehFUXlWiNjJWtRNgBLSfbxQ=
-golang.org/x/mod v0.27.0/go.mod h1:rWI627Fq0DEoudcK+MBkNkCe0EetEaDSwJJkCcjpazc=
+golang.org/x/mod v0.37.0 h1:vF1DjpVEshcIqoEaauuHebaLk1O1forxjxBaVn884JQ=
+golang.org/x/mod v0.37.0/go.mod h1:m8S8VeM9r4dzDwjrKO0a1sZP3YjeMamRRlD+fmR2Q/0=
golang.org/x/net v0.0.0-20180724234803-3673e40ba225/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4=
golang.org/x/net v0.0.0-20180826012351-8a410e7b638d/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4=
golang.org/x/net v0.0.0-20180906233101-161cd47e91fd/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4=
@@ -751,8 +751,8 @@ golang.org/x/net v0.0.0-20201021035429-f5854403a974/go.mod h1:sp8m0HH+o8qH0wwXwY
golang.org/x/net v0.0.0-20210226172049-e18ecbb05110/go.mod h1:m0MpNAwzfU5UDzcl9v0D8zg8gWTRqZa9RBIspLL5mdg=
golang.org/x/net v0.0.0-20220722155237-a158d28d115b/go.mod h1:XRhObCWvk6IyKnWLug+ECip1KBveYUHfp+8e9klMJ9c=
golang.org/x/net v0.7.0/go.mod h1:2Tu9+aMcznHK/AK1HMvgo6xiTLG5rD5rZLDS+rp2Bjs=
-golang.org/x/net v0.43.0 h1:lat02VYK2j4aLzMzecihNvTlJNQUq316m2Mr9rnM6YE=
-golang.org/x/net v0.43.0/go.mod h1:vhO1fvI4dGsIjh73sWfUVjj3N7CA9WkKJNQm2svM6Jg=
+golang.org/x/net v0.56.0 h1:Rw8j/hFzGvJUZwNBXnAtf5sVDVt+65SK2C7IxCxZt5o=
+golang.org/x/net v0.56.0/go.mod h1:D3Ku6r+V6JROoZK144D2XfMHFcMq/0zSfLelVTCFKec=
golang.org/x/oauth2 v0.0.0-20180821212333-d2e6202438be/go.mod h1:N/0e6XlmueqKjAGxoOufVs8QHGRruUQn6yWY3a++T0U=
golang.org/x/oauth2 v0.0.0-20190226205417-e64efc72b421/go.mod h1:gOpvHmFTYa4IltrdGE7lF6nIHvwfUNPOp7c8zoXwtLw=
golang.org/x/sync v0.0.0-20180314180146-1d60e4601c6f/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
@@ -763,8 +763,8 @@ golang.org/x/sync v0.0.0-20190423024810-112230192c58/go.mod h1:RxMgew5VJxzue5/jJ
golang.org/x/sync v0.0.0-20190911185100-cd5d95a43a6e/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
golang.org/x/sync v0.0.0-20201020160332-67f06af15bc9/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
golang.org/x/sync v0.0.0-20220722155255-886fb9371eb4/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
-golang.org/x/sync v0.16.0 h1:ycBJEhp9p4vXvUZNszeOq0kGTPghopOL8q0fq3vstxw=
-golang.org/x/sync v0.16.0/go.mod h1:1dzgHSNfp02xaA81J2MS99Qcpr2w7fw1gpm99rleRqA=
+golang.org/x/sync v0.21.0 h1:HLII4xRRTtCRkxYp4HNFF0Js/Og6q2i++KXbg0gHCwM=
+golang.org/x/sync v0.21.0/go.mod h1:9xrNwdLfx4jkKbNva9FpL6vEN7evnE43NNNJQ2LF3+0=
golang.org/x/sys v0.0.0-20180823144017-11551d06cbcc/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY=
golang.org/x/sys v0.0.0-20180830151530-49385e6e1522/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY=
golang.org/x/sys v0.0.0-20180905080454-ebe1bf3edb33/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY=
@@ -799,14 +799,14 @@ golang.org/x/sys v0.0.0-20220715151400-c0bba94af5f8/go.mod h1:oPkhp1MJrh7nUepCBc
golang.org/x/sys v0.0.0-20220722155257-8c9f86f7a55f/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
golang.org/x/sys v0.5.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
golang.org/x/sys v0.6.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
-golang.org/x/sys v0.35.0 h1:vz1N37gP5bs89s7He8XuIYXpyY0+QlsKmzipCbUtyxI=
-golang.org/x/sys v0.35.0/go.mod h1:BJP2sWEmIv4KK5OTEluFJCKSidICx8ciO85XgH3Ak8k=
+golang.org/x/sys v0.46.0 h1:noSf2Fq6F8DBgS+LysIkx7rIExoNHJsxOAtPp4rthXw=
+golang.org/x/sys v0.46.0/go.mod h1:4GL1E5IUh+htKOUEOaiffhrAeqysfVGipDYzABqnCmw=
golang.org/x/term v0.0.0-20201117132131-f5c789dd3221/go.mod h1:Nr5EML6q2oocZ2LXRh80K7BxOlk5/8JxuGnuhpl+muw=
golang.org/x/term v0.0.0-20201126162022-7de9c90e9dd1/go.mod h1:bj7SfCRtBDWHUb9snDiAeCFNEtKQo2Wmx5Cou7ajbmo=
golang.org/x/term v0.0.0-20210927222741-03fcf44c2211/go.mod h1:jbD1KX2456YbFQfuXm/mYQcufACuNUgVhRMnK/tPxf8=
golang.org/x/term v0.5.0/go.mod h1:jMB1sMXY+tzblOD4FWmEbocvup2/aLOaQEp7JmGp78k=
-golang.org/x/term v0.34.0 h1:O/2T7POpk0ZZ7MAzMeWFSg6S5IpWd/RXDlM9hgM3DR4=
-golang.org/x/term v0.34.0/go.mod h1:5jC53AEywhIVebHgPVeg0mj8OD3VO9OzclacVrqpaAw=
+golang.org/x/term v0.44.0 h1:0rLvDRCtNj0gZkyIXhCyOb2OAzEhLVqc4B+hrsBhrmc=
+golang.org/x/term v0.44.0/go.mod h1:7ze4MdzUzLXpSAoFP1H0bOI9aXDqveSvatT5vKcFh2Y=
golang.org/x/text v0.3.0/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ=
golang.org/x/text v0.3.2/go.mod h1:bEr9sfX3Q8Zfm5fL9x+3itogRgK3+ptLWKqgva+5dAk=
golang.org/x/text v0.3.3/go.mod h1:5Zoc/QRtKVWzQhOtBMvqHzDpF6irO9z98xDceosuGiQ=
@@ -815,8 +815,8 @@ golang.org/x/text v0.3.6/go.mod h1:5Zoc/QRtKVWzQhOtBMvqHzDpF6irO9z98xDceosuGiQ=
golang.org/x/text v0.3.7/go.mod h1:u+2+/6zg+i71rQMx5EYifcz6MCKuco9NR6JIITiCfzQ=
golang.org/x/text v0.4.0/go.mod h1:mrYo+phRRbMaCq/xk9113O4dZlRixOauAjOtrjsXDZ8=
golang.org/x/text v0.7.0/go.mod h1:mrYo+phRRbMaCq/xk9113O4dZlRixOauAjOtrjsXDZ8=
-golang.org/x/text v0.28.0 h1:rhazDwis8INMIwQ4tpjLDzUhx6RlXqZNPEM0huQojng=
-golang.org/x/text v0.28.0/go.mod h1:U8nCwOR8jO/marOQ0QbDiOngZVEBB7MAiitBuMjXiNU=
+golang.org/x/text v0.39.0 h1:UbZz4pLOvn600D6Oh6GGEI6VAmndrEBLv8/6BEXzyus=
+golang.org/x/text v0.39.0/go.mod h1:3UwRclnC2g0TU9x8PZiyfOajCd1zaUNHF9cvqcQZ+ZM=
golang.org/x/time v0.0.0-20180412165947-fbb02b2291d2/go.mod h1:tRJNPiyCQ0inRvYxbN9jk5I+vvW/OXSQhTDSoE431IQ=
golang.org/x/time v0.0.0-20191024005414-555d28b269f0/go.mod h1:tRJNPiyCQ0inRvYxbN9jk5I+vvW/OXSQhTDSoE431IQ=
golang.org/x/time v0.12.0 h1:ScB/8o8olJvc+CQPWrK3fPZNfh7qgwCrY0zJmoEQLSE=
@@ -842,8 +842,8 @@ golang.org/x/tools v0.0.0-20200619180055-7c47624df98f/go.mod h1:EkVYQZoAsY45+roY
golang.org/x/tools v0.0.0-20201124115921-2c860bdd6e78/go.mod h1:emZCQorbCU4vsT4fOWvOPXz4eW1wZW4PmDk9uLelYpA=
golang.org/x/tools v0.0.0-20210106214847-113979e3529a/go.mod h1:emZCQorbCU4vsT4fOWvOPXz4eW1wZW4PmDk9uLelYpA=
golang.org/x/tools v0.1.12/go.mod h1:hNGJHUnrk76NpqgfD5Aqm5Crs+Hm0VOH/i9J2+nxYbc=
-golang.org/x/tools v0.36.0 h1:kWS0uv/zsvHEle1LbV5LE8QujrxB3wfQyxHfhOk0Qkg=
-golang.org/x/tools v0.36.0/go.mod h1:WBDiHKJK8YgLHlcQPYQzNCkUxUypCaa5ZegCVutKm+s=
+golang.org/x/tools v0.47.0 h1:7Kn5x/d1svx/PzryTsqeoZN4TZwqeH5pGWjefhLi/1Q=
+golang.org/x/tools v0.47.0/go.mod h1:dFHnyTvFWY212G+h7ZY4Vsp/K3U4/7W9TyVaAul8uCA=
golang.org/x/xerrors v0.0.0-20190410155217-1f06c39b4373/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0=
golang.org/x/xerrors v0.0.0-20190513163551-3ee3066db522/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0=
golang.org/x/xerrors v0.0.0-20190717185122-a985d3407aa7/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0=
diff --git a/internal/base/middleware/accept_language.go b/internal/base/middleware/accept_language.go
index 5d1b12b2..a4e1b2f5 100644
--- a/internal/base/middleware/accept_language.go
+++ b/internal/base/middleware/accept_language.go
@@ -29,10 +29,16 @@ import (
"golang.org/x/text/language"
)
+const maxAcceptLanguageLength = 256
+
// ExtractAndSetAcceptLanguage extract accept language from header and set to context
func ExtractAndSetAcceptLanguage(ctx *gin.Context) {
// The language of our front-end configuration, like en_US
acceptLanguage := ctx.GetHeader(constant.AcceptLanguageFlag)
+ if len(acceptLanguage) > maxAcceptLanguageLength {
+ ctx.Set(constant.AcceptLanguageFlag, i18n.LanguageEnglish)
+ return
+ }
tag, _, err := language.ParseAcceptLanguage(acceptLanguage)
if err != nil || len(tag) == 0 {
ctx.Set(constant.AcceptLanguageFlag, i18n.LanguageEnglish)