fix(tenant): 封堵审计文件与历史用户跨站访问

This commit is contained in:
yml
2026-11-15 22:46:58 +08:00
parent 0cb385d84f
commit 1108df195d
28 changed files with 531 additions and 60 deletions
+2
View File
@@ -311,6 +311,8 @@ func writeAuthError(c *gin.Context, err error) {
response.Error(c, http.StatusTooManyRequests, "login_locked", "登录失败次数过多,请 15 分钟后再试")
case errors.Is(err, ErrUserAlreadyExists):
response.BadRequest(c, "该手机号已注册,请直接登录或使用短信验证码登录")
case errors.Is(err, ErrLegacyDistributionUser):
response.Error(c, http.StatusForbidden, "legacy_distribution_user", "该手机号属于历史分销渠道,请从原分销站点登录")
default:
response.Error(c, http.StatusInternalServerError, "internal_error", "服务暂时不可用")
}
+52 -7
View File
@@ -36,7 +36,7 @@ func (r *UserRepository) FindByID(ctx context.Context, id uint64) (*model.User,
var user model.User
query := r.db.WithContext(ctx)
if tenantID := tenancy.IDFromContext(ctx); tenantID > 0 {
query = query.Where("tenant_id = ?", tenantID)
query = query.Where("tenant_id = ? AND distribution_site_id = 0", tenantID)
}
if err := query.First(&user, id).Error; err != nil {
return nil, err
@@ -52,7 +52,7 @@ func (r *UserRepository) FindActiveForToken(ctx context.Context, id uint64, toke
var user model.User
query := r.db.WithContext(ctx)
if tenantID := tenancy.IDFromContext(ctx); tenantID > 0 {
query = query.Where("tenant_id = ?", tenantID)
query = query.Where("tenant_id = ? AND distribution_site_id = 0", tenantID)
}
if err := query.
Select("id, phone, status, token_version").
@@ -71,7 +71,7 @@ func (r *UserRepository) FindActiveForToken(ctx context.Context, id uint64, toke
func (r *UserRepository) UpdateProfile(ctx context.Context, id uint64, nickname string, avatarURL string) (*model.User, error) {
query := r.db.WithContext(ctx).Model(&model.User{}).Where("id = ?", id)
if tenantID := tenancy.IDFromContext(ctx); tenantID > 0 {
query = query.Where("tenant_id = ?", tenantID)
query = query.Where("tenant_id = ? AND distribution_site_id = 0", tenantID)
}
if err := query.Updates(map[string]any{
"nickname": nickname,
@@ -98,6 +98,29 @@ func (r *UserRepository) FindOrCreateByPhone(ctx context.Context, phone string,
now := time.Now()
code := sanitizeTrackCode(trackCode)
tenantID := tenancy.IDFromContext(ctx)
if tenantID > 0 {
var existing model.User
query := r.db.WithContext(ctx).
Where("tenant_id = ? AND phone = ? AND distribution_site_id = 0", tenantID, phone)
if err := query.First(&existing).Error; err == nil {
_ = r.db.WithContext(ctx).Model(&existing).Updates(map[string]any{
"last_login_at": now,
"updated_at": now,
}).Error
return &existing, nil
} else if !errors.Is(err, gorm.ErrRecordNotFound) {
return nil, err
}
var legacyCount int64
if err := r.db.WithContext(ctx).Model(&model.User{}).
Where("tenant_id = ? AND phone = ? AND distribution_site_id > 0", tenantID, phone).
Count(&legacyCount).Error; err != nil {
return nil, err
}
if legacyCount > 0 {
return nil, ErrLegacyDistributionUser
}
}
var siteID uint64
if len(siteCode) > 0 {
siteID = r.resolveSiteID(ctx, siteCode[0])
@@ -131,7 +154,7 @@ func (r *UserRepository) FindOrCreateByPhone(ctx context.Context, phone string,
var found model.User
query := r.db.WithContext(ctx).Where("phone = ?", phone)
if tenantID > 0 {
query = query.Where("tenant_id = ?", tenantID)
query = query.Where("tenant_id = ? AND distribution_site_id = 0", tenantID)
}
if err := query.First(&found).Error; err != nil {
return nil, err
@@ -143,9 +166,20 @@ func (r *UserRepository) FindByPhone(ctx context.Context, phone string) (*model.
var user model.User
query := r.db.WithContext(ctx).Where("phone = ?", phone)
if tenantID := tenancy.IDFromContext(ctx); tenantID > 0 {
query = query.Where("tenant_id = ?", tenantID)
query = query.Where("tenant_id = ? AND distribution_site_id = 0", tenantID)
}
if err := query.First(&user).Error; err != nil {
if errors.Is(err, gorm.ErrRecordNotFound) && tenancy.IDFromContext(ctx) > 0 {
var legacyCount int64
if countErr := r.db.WithContext(ctx).Model(&model.User{}).
Where("tenant_id = ? AND phone = ? AND distribution_site_id > 0", tenancy.IDFromContext(ctx), phone).
Count(&legacyCount).Error; countErr != nil {
return nil, countErr
}
if legacyCount > 0 {
return nil, ErrLegacyDistributionUser
}
}
return nil, err
}
return &user, nil
@@ -154,7 +188,7 @@ func (r *UserRepository) FindByPhone(ctx context.Context, phone string) (*model.
func (r *UserRepository) SetPassword(ctx context.Context, userID uint64, hash string) error {
query := r.db.WithContext(ctx).Model(&model.User{}).Where("id = ?", userID)
if tenantID := tenancy.IDFromContext(ctx); tenantID > 0 {
query = query.Where("tenant_id = ?", tenantID)
query = query.Where("tenant_id = ? AND distribution_site_id = 0", tenantID)
}
return query.Updates(map[string]any{
"password_hash": hash,
@@ -166,7 +200,7 @@ func (r *UserRepository) SetPassword(ctx context.Context, userID uint64, hash st
func (r *UserRepository) RevokeTokens(ctx context.Context, userID uint64) error {
query := r.db.WithContext(ctx).Model(&model.User{}).Where("id = ?", userID)
if tenantID := tenancy.IDFromContext(ctx); tenantID > 0 {
query = query.Where("tenant_id = ?", tenantID)
query = query.Where("tenant_id = ? AND distribution_site_id = 0", tenantID)
}
return query.UpdateColumn("token_version", gorm.Expr("token_version + 1")).Error
}
@@ -175,6 +209,17 @@ func (r *UserRepository) RegisterWithPassword(ctx context.Context, phone string,
now := time.Now()
code := sanitizeTrackCode(trackCode)
tenantID := tenancy.IDFromContext(ctx)
if tenantID > 0 {
var legacyCount int64
if err := r.db.WithContext(ctx).Model(&model.User{}).
Where("tenant_id = ? AND phone = ? AND distribution_site_id > 0", tenantID, phone).
Count(&legacyCount).Error; err != nil {
return nil, err
}
if legacyCount > 0 {
return nil, ErrLegacyDistributionUser
}
}
var siteID uint64
if len(siteCode) > 0 {
siteID = r.resolveSiteID(ctx, siteCode[0])
+15 -14
View File
@@ -22,20 +22,21 @@ import (
)
var (
ErrDependencyUnavailable = errors.New("dependency unavailable")
ErrInvalidPhone = errors.New("invalid phone")
ErrCaptchaInvalid = errors.New("captcha invalid")
ErrCodeRateLimited = errors.New("sms code rate limited")
ErrCodeInvalid = errors.New("sms code invalid")
ErrSMSSendFailed = errors.New("sms send failed")
ErrUserDisabled = errors.New("user disabled")
ErrInvalidPassword = errors.New("invalid password")
ErrInvalidOldPassword = errors.New("invalid old password")
ErrPasswordNotSet = errors.New("password not set")
ErrPasswordTooWeak = errors.New("password too weak")
ErrLoginLocked = errors.New("login locked")
ErrUserAlreadyExists = errors.New("user already exists")
ErrTokenVersionMismatch = errors.New("user token version mismatch")
ErrDependencyUnavailable = errors.New("dependency unavailable")
ErrInvalidPhone = errors.New("invalid phone")
ErrCaptchaInvalid = errors.New("captcha invalid")
ErrCodeRateLimited = errors.New("sms code rate limited")
ErrCodeInvalid = errors.New("sms code invalid")
ErrSMSSendFailed = errors.New("sms send failed")
ErrUserDisabled = errors.New("user disabled")
ErrInvalidPassword = errors.New("invalid password")
ErrInvalidOldPassword = errors.New("invalid old password")
ErrPasswordNotSet = errors.New("password not set")
ErrPasswordTooWeak = errors.New("password too weak")
ErrLoginLocked = errors.New("login locked")
ErrUserAlreadyExists = errors.New("user already exists")
ErrLegacyDistributionUser = errors.New("user belongs to legacy distribution channel")
ErrTokenVersionMismatch = errors.New("user token version mismatch")
)
const (
@@ -2,6 +2,7 @@ package auth
import (
"context"
"errors"
"testing"
"hfb_sys/backend/internal/database"
@@ -85,3 +86,39 @@ func TestTenantUsersRemainSeparateRows(t *testing.T) {
t.Fatalf("same phone user count = %d, want 2", count)
}
}
func TestLegacyDistributionUserCannotEnterTenantSite(t *testing.T) {
db := database.NewTestDB()
site := model.DistributionSite{
SiteCode: "legacy_auth_scope", SiteName: "历史分销测试站",
Domain: "legacy-auth-scope.example.com", Status: "active",
}
if err := db.Create(&site).Error; err != nil {
t.Fatal(err)
}
legacy := model.User{
TenantID: 101, Phone: "13600000009", Status: "active",
DistributionSiteID: site.ID, TokenVersion: 1,
}
if err := db.Create(&legacy).Error; err != nil {
t.Fatal(err)
}
repo := NewUserRepository(db)
ctx := authTenantContext(101)
if _, err := repo.FindByID(ctx, legacy.ID); err == nil {
t.Fatal("tenant site must not load legacy distribution user")
}
if _, err := repo.FindByPhone(ctx, legacy.Phone); !errors.Is(err, ErrLegacyDistributionUser) {
t.Fatalf("legacy phone login error = %v", err)
}
if _, err := repo.FindOrCreateByPhone(ctx, legacy.Phone, ""); !errors.Is(err, ErrLegacyDistributionUser) {
t.Fatalf("legacy SMS login error = %v", err)
}
if _, err := repo.RegisterWithPassword(ctx, legacy.Phone, "hash", ""); !errors.Is(err, ErrLegacyDistributionUser) {
t.Fatalf("legacy registration error = %v", err)
}
if _, err := repo.FindByPhone(context.Background(), legacy.Phone); err != nil {
t.Fatalf("legacy distribution domain login failed: %v", err)
}
}