fix(auth): 修复历史分销用户登录后立即退出
This commit is contained in:
@@ -8,6 +8,7 @@ import (
|
||||
"time"
|
||||
|
||||
"hfb_sys/backend/internal/model"
|
||||
"hfb_sys/backend/internal/sitecode"
|
||||
"hfb_sys/backend/internal/tenancy"
|
||||
|
||||
"gorm.io/gorm"
|
||||
@@ -32,12 +33,23 @@ func NewUserRepository(db *gorm.DB) *UserRepository {
|
||||
return &UserRepository{db: db}
|
||||
}
|
||||
|
||||
func scopeUserQueryToBoundSite(ctx context.Context, query *gorm.DB) *gorm.DB {
|
||||
code := sitecode.BoundSiteCodeFromContext(ctx)
|
||||
if code == "" {
|
||||
return query
|
||||
}
|
||||
return query.
|
||||
Joins("JOIN distribution_sites AS auth_site ON auth_site.id = users.distribution_site_id").
|
||||
Where("auth_site.site_code = ? AND auth_site.status = ?", code, "active")
|
||||
}
|
||||
|
||||
func (r *UserRepository) FindByID(ctx context.Context, id uint64) (*model.User, error) {
|
||||
var user model.User
|
||||
query := r.db.WithContext(ctx)
|
||||
if tenantID := tenancy.IDFromContext(ctx); tenantID > 0 {
|
||||
query = query.Where("tenant_id = ? AND distribution_site_id = 0", tenantID)
|
||||
}
|
||||
query = scopeUserQueryToBoundSite(ctx, query)
|
||||
if err := query.First(&user, id).Error; err != nil {
|
||||
return nil, err
|
||||
}
|
||||
@@ -54,8 +66,9 @@ func (r *UserRepository) FindActiveForToken(ctx context.Context, id uint64, toke
|
||||
if tenantID := tenancy.IDFromContext(ctx); tenantID > 0 {
|
||||
query = query.Where("tenant_id = ? AND distribution_site_id = 0", tenantID)
|
||||
}
|
||||
query = scopeUserQueryToBoundSite(ctx, query)
|
||||
if err := query.
|
||||
Select("id, phone, status, token_version").
|
||||
Select("users.id, users.phone, users.status, users.token_version").
|
||||
First(&user, id).Error; err != nil {
|
||||
return nil, err
|
||||
}
|
||||
@@ -73,6 +86,7 @@ func (r *UserRepository) UpdateProfile(ctx context.Context, id uint64, nickname
|
||||
if tenantID := tenancy.IDFromContext(ctx); tenantID > 0 {
|
||||
query = query.Where("tenant_id = ? AND distribution_site_id = 0", tenantID)
|
||||
}
|
||||
query = scopeUserQueryToBoundSite(ctx, query)
|
||||
if err := query.Updates(map[string]any{
|
||||
"nickname": nickname,
|
||||
"avatar_url": avatarURL,
|
||||
@@ -187,6 +201,7 @@ func (r *UserRepository) SetPassword(ctx context.Context, userID uint64, hash st
|
||||
if tenantID := tenancy.IDFromContext(ctx); tenantID > 0 {
|
||||
query = query.Where("tenant_id = ? AND distribution_site_id = 0", tenantID)
|
||||
}
|
||||
query = scopeUserQueryToBoundSite(ctx, query)
|
||||
return query.Updates(map[string]any{
|
||||
"password_hash": hash,
|
||||
"token_version": gorm.Expr("token_version + 1"),
|
||||
@@ -199,6 +214,7 @@ func (r *UserRepository) RevokeTokens(ctx context.Context, userID uint64) error
|
||||
if tenantID := tenancy.IDFromContext(ctx); tenantID > 0 {
|
||||
query = query.Where("tenant_id = ? AND distribution_site_id = 0", tenantID)
|
||||
}
|
||||
query = scopeUserQueryToBoundSite(ctx, query)
|
||||
return query.UpdateColumn("token_version", gorm.Expr("token_version + 1")).Error
|
||||
}
|
||||
|
||||
|
||||
@@ -14,6 +14,7 @@ import (
|
||||
smsprovider "hfb_sys/backend/internal/integrations/sms"
|
||||
"hfb_sys/backend/internal/logging"
|
||||
"hfb_sys/backend/internal/model"
|
||||
"hfb_sys/backend/internal/sitecode"
|
||||
"hfb_sys/backend/internal/tenancy"
|
||||
|
||||
"github.com/redis/go-redis/v9"
|
||||
@@ -260,7 +261,9 @@ func (s *Service) RefreshToken(ctx context.Context, refreshToken string) (TokenP
|
||||
}
|
||||
tenantID := tenancy.IDFromContext(ctx)
|
||||
if claims.TenantID > 0 && claims.TenantID != tenantID {
|
||||
return TokenPair{}, ErrTokenVersionMismatch
|
||||
if tenantID != 0 || sitecode.BoundSiteCodeFromContext(ctx) == "" {
|
||||
return TokenPair{}, ErrTokenVersionMismatch
|
||||
}
|
||||
}
|
||||
user, err := s.users.FindActiveForToken(ctx, claims.UserID, claims.TokenVersion)
|
||||
if err != nil {
|
||||
|
||||
@@ -6,6 +6,7 @@ import (
|
||||
|
||||
"hfb_sys/backend/internal/database"
|
||||
"hfb_sys/backend/internal/model"
|
||||
"hfb_sys/backend/internal/sitecode"
|
||||
"hfb_sys/backend/internal/tenancy"
|
||||
)
|
||||
|
||||
@@ -122,3 +123,47 @@ func TestLegacyDistributionUserCannotEnterTenantSite(t *testing.T) {
|
||||
t.Fatalf("legacy distribution domain login failed: %v", err)
|
||||
}
|
||||
}
|
||||
|
||||
func TestLegacyDistributionUserSessionIsScopedToBoundSite(t *testing.T) {
|
||||
db := database.NewTestDB()
|
||||
sites := []model.DistributionSite{
|
||||
{SiteCode: "legacy_session_a", SiteName: "历史分销 A", Domain: "legacy-session-a.example.com", Status: "active"},
|
||||
{SiteCode: "legacy_session_b", SiteName: "历史分销 B", Domain: "legacy-session-b.example.com", Status: "active"},
|
||||
}
|
||||
if err := db.Create(&sites).Error; err != nil {
|
||||
t.Fatal(err)
|
||||
}
|
||||
legacy := model.User{
|
||||
TenantID: 101, Phone: "13600000019", Status: "active",
|
||||
DistributionSiteID: sites[0].ID, TokenVersion: 1,
|
||||
}
|
||||
if err := db.Create(&legacy).Error; err != nil {
|
||||
t.Fatal(err)
|
||||
}
|
||||
|
||||
repo := NewUserRepository(db)
|
||||
ctxA := sitecode.WithBoundSiteCode(context.Background(), sites[0].SiteCode)
|
||||
ctxB := sitecode.WithBoundSiteCode(context.Background(), sites[1].SiteCode)
|
||||
if _, err := repo.FindActiveForToken(ctxA, legacy.ID, legacy.TokenVersion); err != nil {
|
||||
t.Fatalf("bound own site token validation failed: %v", err)
|
||||
}
|
||||
if _, err := repo.FindActiveForToken(ctxB, legacy.ID, legacy.TokenVersion); !IsNotFound(err) {
|
||||
t.Fatalf("cross-site token validation error = %v, want not found", err)
|
||||
}
|
||||
if _, err := repo.FindActiveForToken(authTenantContext(legacy.TenantID), legacy.ID, legacy.TokenVersion); !IsNotFound(err) {
|
||||
t.Fatalf("tenant-site token validation error = %v, want not found", err)
|
||||
}
|
||||
|
||||
manager := NewJWTManager("legacy-distribution-session-test-secret")
|
||||
pair, err := manager.GenerateTenantPairWithVersion(legacy.ID, legacy.Phone, "user", legacy.TokenVersion, legacy.TenantID)
|
||||
if err != nil {
|
||||
t.Fatal(err)
|
||||
}
|
||||
service := NewService(repo, nil, manager, nil, nil)
|
||||
if _, err := service.RefreshToken(ctxA, pair.RefreshToken); err != nil {
|
||||
t.Fatalf("bound own site refresh failed: %v", err)
|
||||
}
|
||||
if _, err := service.RefreshToken(ctxB, pair.RefreshToken); err == nil {
|
||||
t.Fatal("cross-site refresh must fail")
|
||||
}
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user