perf(auth): 降低会话校验请求与重复查库
This commit is contained in:
@@ -7,6 +7,7 @@ import (
|
||||
"strings"
|
||||
|
||||
"hfb_sys/backend/internal/logging"
|
||||
"hfb_sys/backend/internal/model"
|
||||
"hfb_sys/backend/internal/modules/auth"
|
||||
"hfb_sys/backend/internal/sitecode"
|
||||
"hfb_sys/backend/internal/tenancy"
|
||||
@@ -17,6 +18,7 @@ import (
|
||||
|
||||
const (
|
||||
ContextUserID = "user_id"
|
||||
ContextUser = "auth_user"
|
||||
ContextPhone = "phone"
|
||||
ContextAdminID = "admin_id"
|
||||
ContextUsername = "username"
|
||||
@@ -37,7 +39,17 @@ type AdminTokenContext struct {
|
||||
|
||||
type AdminTokenValidatorFunc func(ctx context.Context, adminID uint64, tokenVersion int64) (AdminTokenContext, error)
|
||||
|
||||
type UserTokenValidatorFunc func(ctx context.Context, userID uint64, tokenVersion int64) error
|
||||
type UserTokenValidatorFunc func(ctx context.Context, userID uint64, tokenVersion int64) (*model.User, error)
|
||||
|
||||
// AuthenticatedUser 返回本次请求鉴权时已经加载的用户记录。
|
||||
func AuthenticatedUser(c *gin.Context) (*model.User, bool) {
|
||||
value, ok := c.Get(ContextUser)
|
||||
if !ok {
|
||||
return nil, false
|
||||
}
|
||||
user, ok := value.(*model.User)
|
||||
return user, ok && user != nil
|
||||
}
|
||||
|
||||
func extractBearerToken(c *gin.Context) string {
|
||||
header := c.GetHeader("Authorization")
|
||||
@@ -85,8 +97,11 @@ func Auth(jwtManager *auth.JWTManager, validate UserTokenValidatorFunc) gin.Hand
|
||||
c.Abort()
|
||||
return
|
||||
}
|
||||
var authenticatedUser *model.User
|
||||
if validate != nil {
|
||||
if err := validate(c.Request.Context(), claims.UserID, claims.TokenVersion); err != nil {
|
||||
var err error
|
||||
authenticatedUser, err = validate(c.Request.Context(), claims.UserID, claims.TokenVersion)
|
||||
if err != nil {
|
||||
if errors.Is(err, auth.ErrDependencyUnavailable) {
|
||||
response.ServiceUnavailable(c, "用户认证服务暂时不可用")
|
||||
} else {
|
||||
@@ -99,6 +114,9 @@ func Auth(jwtManager *auth.JWTManager, validate UserTokenValidatorFunc) gin.Hand
|
||||
|
||||
c.Set(ContextUserID, claims.UserID)
|
||||
c.Set(ContextPhone, claims.Phone)
|
||||
if authenticatedUser != nil {
|
||||
c.Set(ContextUser, authenticatedUser)
|
||||
}
|
||||
c.Next()
|
||||
}
|
||||
}
|
||||
@@ -125,14 +143,20 @@ func OptionalAuth(jwtManager *auth.JWTManager, validate UserTokenValidatorFunc)
|
||||
c.Next()
|
||||
return
|
||||
}
|
||||
var authenticatedUser *model.User
|
||||
if validate != nil {
|
||||
if err := validate(c.Request.Context(), claims.UserID, claims.TokenVersion); err != nil {
|
||||
var err error
|
||||
authenticatedUser, err = validate(c.Request.Context(), claims.UserID, claims.TokenVersion)
|
||||
if err != nil {
|
||||
c.Next()
|
||||
return
|
||||
}
|
||||
}
|
||||
c.Set(ContextUserID, claims.UserID)
|
||||
c.Set(ContextPhone, claims.Phone)
|
||||
if authenticatedUser != nil {
|
||||
c.Set(ContextUser, authenticatedUser)
|
||||
}
|
||||
c.Next()
|
||||
}
|
||||
}
|
||||
@@ -195,8 +219,11 @@ func AuthUserOrAdmin(jwtManager *auth.JWTManager, userValidate UserTokenValidato
|
||||
c.Abort()
|
||||
return
|
||||
}
|
||||
var authenticatedUser *model.User
|
||||
if userValidate != nil {
|
||||
if err := userValidate(c.Request.Context(), claims.UserID, claims.TokenVersion); err != nil {
|
||||
var err error
|
||||
authenticatedUser, err = userValidate(c.Request.Context(), claims.UserID, claims.TokenVersion)
|
||||
if err != nil {
|
||||
if errors.Is(err, auth.ErrDependencyUnavailable) {
|
||||
response.ServiceUnavailable(c, "用户认证服务暂时不可用")
|
||||
} else {
|
||||
@@ -209,6 +236,9 @@ func AuthUserOrAdmin(jwtManager *auth.JWTManager, userValidate UserTokenValidato
|
||||
|
||||
c.Set(ContextUserID, claims.UserID)
|
||||
c.Set(ContextPhone, claims.Phone)
|
||||
if authenticatedUser != nil {
|
||||
c.Set(ContextUser, authenticatedUser)
|
||||
}
|
||||
c.Next()
|
||||
}
|
||||
}
|
||||
|
||||
@@ -6,6 +6,7 @@ import (
|
||||
"net/http/httptest"
|
||||
"testing"
|
||||
|
||||
"hfb_sys/backend/internal/model"
|
||||
"hfb_sys/backend/internal/modules/auth"
|
||||
"hfb_sys/backend/internal/sitecode"
|
||||
"hfb_sys/backend/internal/tenancy"
|
||||
@@ -67,8 +68,8 @@ func TestAuthRejectsRevokedUserToken(t *testing.T) {
|
||||
}
|
||||
|
||||
engine := gin.New()
|
||||
engine.GET("/protected", Auth(manager, func(_ context.Context, _ uint64, _ int64) error {
|
||||
return auth.ErrTokenVersionMismatch
|
||||
engine.GET("/protected", Auth(manager, func(_ context.Context, _ uint64, _ int64) (*model.User, error) {
|
||||
return nil, auth.ErrTokenVersionMismatch
|
||||
}), func(c *gin.Context) {
|
||||
c.Status(http.StatusNoContent)
|
||||
})
|
||||
@@ -82,6 +83,38 @@ func TestAuthRejectsRevokedUserToken(t *testing.T) {
|
||||
}
|
||||
}
|
||||
|
||||
func TestUserAuthAttachesValidatedUser(t *testing.T) {
|
||||
gin.SetMode(gin.TestMode)
|
||||
manager := auth.NewJWTManager("test-auth-user-context-secret")
|
||||
pair, err := manager.GenerateSubjectPairWithVersion(7, "13900000007", "user", 1)
|
||||
if err != nil {
|
||||
t.Fatalf("生成令牌失败:%v", err)
|
||||
}
|
||||
|
||||
engine := gin.New()
|
||||
engine.GET("/protected", Auth(manager, func(_ context.Context, userID uint64, tokenVersion int64) (*model.User, error) {
|
||||
if userID != 7 || tokenVersion != 1 {
|
||||
t.Fatalf("校验参数 = (%d, %d), want (7, 1)", userID, tokenVersion)
|
||||
}
|
||||
return &model.User{ID: userID, Nickname: "已鉴权用户", Status: "active", TokenVersion: tokenVersion}, nil
|
||||
}), func(c *gin.Context) {
|
||||
user, ok := AuthenticatedUser(c)
|
||||
if !ok || user.Nickname != "已鉴权用户" {
|
||||
t.Fatalf("AuthenticatedUser() = %+v, %v", user, ok)
|
||||
}
|
||||
c.Status(http.StatusNoContent)
|
||||
})
|
||||
|
||||
request := httptest.NewRequest(http.MethodGet, "/protected", nil)
|
||||
request.Header.Set("Authorization", "Bearer "+pair.AccessToken)
|
||||
response := httptest.NewRecorder()
|
||||
engine.ServeHTTP(response, request)
|
||||
|
||||
if response.Code != http.StatusNoContent {
|
||||
t.Fatalf("响应状态 = %d, want %d", response.Code, http.StatusNoContent)
|
||||
}
|
||||
}
|
||||
|
||||
func TestUserAndAdminTokensRejectCrossTenantRequests(t *testing.T) {
|
||||
gin.SetMode(gin.TestMode)
|
||||
manager := auth.NewJWTManager("cross-tenant-auth-test-secret")
|
||||
|
||||
Reference in New Issue
Block a user