feat(tenant): 按租户隔离用户身份与后台权限
This commit is contained in:
@@ -8,6 +8,7 @@ import (
|
||||
|
||||
type AdminDTO struct {
|
||||
ID uint64 `json:"id"`
|
||||
TenantID uint64 `json:"tenant_id"`
|
||||
Username string `json:"username"`
|
||||
Nickname string `json:"nickname"`
|
||||
Status string `json:"status"`
|
||||
|
||||
@@ -13,6 +13,7 @@ import (
|
||||
"hfb_sys/backend/internal/logging"
|
||||
"hfb_sys/backend/internal/model"
|
||||
"hfb_sys/backend/internal/modules/auth"
|
||||
"hfb_sys/backend/internal/tenancy"
|
||||
|
||||
"github.com/redis/go-redis/v9"
|
||||
"golang.org/x/crypto/bcrypt"
|
||||
@@ -52,16 +53,17 @@ func (r *Repository) Captcha(ctx context.Context) (*CaptchaDTO, error) {
|
||||
}
|
||||
|
||||
func (r *Repository) Login(ctx context.Context, username string, password string, captchaID string, captchaCode string, clientIP string) (LoginResult, error) {
|
||||
tenantID := tenancy.IDFromContext(ctx)
|
||||
if err := r.verifyCaptcha(ctx, captchaID, captchaCode); err != nil {
|
||||
return LoginResult{}, err
|
||||
}
|
||||
if err := r.ensureLoginNotLocked(ctx, username, clientIP); err != nil {
|
||||
if err := r.ensureLoginNotLocked(ctx, tenantID, username, clientIP); err != nil {
|
||||
return LoginResult{}, err
|
||||
}
|
||||
var admin model.AdminUser
|
||||
if err := r.db.WithContext(ctx).Where("username = ?", username).First(&admin).Error; err != nil {
|
||||
if errors.Is(err, gorm.ErrRecordNotFound) {
|
||||
r.recordLoginFailure(ctx, username, clientIP)
|
||||
r.recordLoginFailure(ctx, tenantID, username, clientIP)
|
||||
return LoginResult{}, ErrInvalidCredential
|
||||
}
|
||||
return LoginResult{}, err
|
||||
@@ -70,7 +72,15 @@ func (r *Repository) Login(ctx context.Context, username string, password string
|
||||
return LoginResult{}, ErrAdminDisabled
|
||||
}
|
||||
if err := bcrypt.CompareHashAndPassword([]byte(admin.PasswordHash), []byte(password)); err != nil {
|
||||
r.recordLoginFailure(ctx, username, clientIP)
|
||||
r.recordLoginFailure(ctx, tenantID, username, clientIP)
|
||||
return LoginResult{}, ErrInvalidCredential
|
||||
}
|
||||
allowed, err := r.adminHasTenantAccess(ctx, admin.ID)
|
||||
if err != nil {
|
||||
return LoginResult{}, err
|
||||
}
|
||||
if !allowed {
|
||||
r.recordLoginFailure(ctx, tenantID, username, clientIP)
|
||||
return LoginResult{}, ErrInvalidCredential
|
||||
}
|
||||
now := time.Now()
|
||||
@@ -81,12 +91,13 @@ func (r *Repository) Login(ctx context.Context, username string, password string
|
||||
if err := r.db.WithContext(ctx).Save(&admin).Error; err != nil {
|
||||
return LoginResult{}, err
|
||||
}
|
||||
r.clearLoginFailures(ctx, username, clientIP)
|
||||
tokens, err := r.jwt.GenerateSubjectPairWithVersion(admin.ID, admin.Username, "admin", admin.TokenVersion)
|
||||
r.clearLoginFailures(ctx, tenantID, username, clientIP)
|
||||
tokens, err := r.jwt.GenerateTenantPairWithVersion(admin.ID, admin.Username, "admin", admin.TokenVersion, tenantID)
|
||||
if err != nil {
|
||||
return LoginResult{}, err
|
||||
}
|
||||
dto := toDTO(admin)
|
||||
dto.TenantID = tenantID
|
||||
r.loadRolesAndPerms(ctx, &dto)
|
||||
return LoginResult{Admin: dto, Tokens: tokens}, nil
|
||||
}
|
||||
@@ -108,6 +119,13 @@ func (r *Repository) FindActiveForToken(ctx context.Context, id uint64, tokenVer
|
||||
if admin.TokenVersion <= 0 || admin.TokenVersion != tokenVersion {
|
||||
return nil, newTokenVersionMismatchError(tokenVersion, admin.TokenVersion)
|
||||
}
|
||||
allowed, err := r.adminHasTenantAccess(ctx, admin.ID)
|
||||
if err != nil {
|
||||
return nil, newTokenDependencyError(err)
|
||||
}
|
||||
if !allowed {
|
||||
return nil, newTokenValidationError("admin_tenant_forbidden", ErrAdminNotFound)
|
||||
}
|
||||
return &admin, nil
|
||||
}
|
||||
|
||||
@@ -158,6 +176,7 @@ func (r *Repository) FindByID(ctx context.Context, id uint64) (*AdminDTO, error)
|
||||
return nil, ErrAdminDisabled
|
||||
}
|
||||
dto := toDTO(admin)
|
||||
dto.TenantID = tenancy.IDFromContext(ctx)
|
||||
r.loadRolesAndPerms(ctx, &dto)
|
||||
return &dto, nil
|
||||
}
|
||||
@@ -204,10 +223,13 @@ func (r *Repository) loadRolesAndPerms(ctx context.Context, dto *AdminDTO) {
|
||||
}
|
||||
// 加载角色
|
||||
var roles []RoleDTO
|
||||
r.db.WithContext(ctx).Table("roles").
|
||||
roleQuery := r.db.WithContext(ctx).Table("roles").
|
||||
Joins("JOIN admin_user_roles aur ON aur.role_id = roles.id").
|
||||
Where("aur.admin_user_id = ?", dto.ID).
|
||||
Find(&roles)
|
||||
Where("aur.admin_user_id = ?", dto.ID)
|
||||
if tenantID := tenancy.IDFromContext(ctx); tenantID > 0 {
|
||||
roleQuery = roleQuery.Where("(aur.tenant_id = ? OR roles.code = ?)", tenantID, "super_admin")
|
||||
}
|
||||
roleQuery.Find(&roles)
|
||||
dto.Roles = roles
|
||||
dto.PasswordMustChange = dto.PasswordMustChange && rolesRequireInitialPasswordChange(roles)
|
||||
|
||||
@@ -221,12 +243,15 @@ func (r *Repository) loadRolesAndPerms(ctx context.Context, dto *AdminDTO) {
|
||||
}
|
||||
|
||||
var permCodes []string
|
||||
r.db.WithContext(ctx).Table("permissions").
|
||||
permQuery := r.db.WithContext(ctx).Table("permissions").
|
||||
Select("DISTINCT permissions.code").
|
||||
Joins("JOIN role_permissions rp ON rp.permission_id = permissions.id").
|
||||
Joins("JOIN admin_user_roles aur ON aur.role_id = rp.role_id").
|
||||
Where("aur.admin_user_id = ?", dto.ID).
|
||||
Pluck("code", &permCodes)
|
||||
Where("aur.admin_user_id = ?", dto.ID)
|
||||
if tenantID := tenancy.IDFromContext(ctx); tenantID > 0 {
|
||||
permQuery = permQuery.Where("aur.tenant_id = ?", tenantID)
|
||||
}
|
||||
permQuery.Pluck("code", &permCodes)
|
||||
dto.Permissions = permCodes
|
||||
|
||||
// 缓存权限到 Redis
|
||||
@@ -246,16 +271,16 @@ func cachePermissions(ctx context.Context, r *Repository, adminID uint64, permCo
|
||||
if r.redis == nil || len(permCodes) == 0 {
|
||||
return
|
||||
}
|
||||
key := fmt.Sprintf("admin:perms:%d", adminID)
|
||||
key := adminPermissionCacheKey(ctx, adminID)
|
||||
raw, _ := json.Marshal(permCodes)
|
||||
r.redis.Set(ctx, key, string(raw), 2*time.Hour)
|
||||
}
|
||||
|
||||
func (r *Repository) ensureLoginNotLocked(ctx context.Context, username string, clientIP string) error {
|
||||
func (r *Repository) ensureLoginNotLocked(ctx context.Context, tenantID uint64, username string, clientIP string) error {
|
||||
if r.redis == nil {
|
||||
return nil
|
||||
}
|
||||
locked, err := r.redis.Exists(ctx, loginLockKey(username, clientIP)).Result()
|
||||
locked, err := r.redis.Exists(ctx, loginLockKey(tenantID, username, clientIP)).Result()
|
||||
if err != nil {
|
||||
return err
|
||||
}
|
||||
@@ -265,11 +290,11 @@ func (r *Repository) ensureLoginNotLocked(ctx context.Context, username string,
|
||||
return nil
|
||||
}
|
||||
|
||||
func (r *Repository) recordLoginFailure(ctx context.Context, username string, clientIP string) {
|
||||
func (r *Repository) recordLoginFailure(ctx context.Context, tenantID uint64, username string, clientIP string) {
|
||||
if r.redis == nil {
|
||||
return
|
||||
}
|
||||
key := loginFailureKey(username, clientIP)
|
||||
key := loginFailureKey(tenantID, username, clientIP)
|
||||
count, err := r.redis.Incr(ctx, key).Result()
|
||||
if err != nil {
|
||||
return
|
||||
@@ -278,23 +303,51 @@ func (r *Repository) recordLoginFailure(ctx context.Context, username string, cl
|
||||
_ = r.redis.Expire(ctx, key, loginFailureTTL).Err()
|
||||
}
|
||||
if count >= loginMaxFailureCount {
|
||||
_ = r.redis.Set(ctx, loginLockKey(username, clientIP), "1", loginLockTTL).Err()
|
||||
_ = r.redis.Set(ctx, loginLockKey(tenantID, username, clientIP), "1", loginLockTTL).Err()
|
||||
}
|
||||
}
|
||||
|
||||
func (r *Repository) clearLoginFailures(ctx context.Context, username string, clientIP string) {
|
||||
func (r *Repository) clearLoginFailures(ctx context.Context, tenantID uint64, username string, clientIP string) {
|
||||
if r.redis == nil {
|
||||
return
|
||||
}
|
||||
_ = r.redis.Del(ctx, loginFailureKey(username, clientIP), loginLockKey(username, clientIP)).Err()
|
||||
_ = r.redis.Del(ctx, loginFailureKey(tenantID, username, clientIP), loginLockKey(tenantID, username, clientIP)).Err()
|
||||
}
|
||||
|
||||
func loginFailureKey(username string, clientIP string) string {
|
||||
return "admin:login:fail:" + loginKeyPart(clientIP) + ":" + loginKeyPart(username)
|
||||
func loginFailureKey(tenantID uint64, username string, clientIP string) string {
|
||||
return scopedAuthKey(tenantID, "admin:login:fail:"+loginKeyPart(clientIP)+":"+loginKeyPart(username))
|
||||
}
|
||||
|
||||
func loginLockKey(username string, clientIP string) string {
|
||||
return "admin:login:lock:" + loginKeyPart(clientIP) + ":" + loginKeyPart(username)
|
||||
func loginLockKey(tenantID uint64, username string, clientIP string) string {
|
||||
return scopedAuthKey(tenantID, "admin:login:lock:"+loginKeyPart(clientIP)+":"+loginKeyPart(username))
|
||||
}
|
||||
|
||||
func scopedAuthKey(tenantID uint64, base string) string {
|
||||
if tenantID == 0 {
|
||||
return base
|
||||
}
|
||||
return fmt.Sprintf("tenant:%d:%s", tenantID, base)
|
||||
}
|
||||
|
||||
func adminPermissionCacheKey(ctx context.Context, adminID uint64) string {
|
||||
key := fmt.Sprintf("admin:perms:%d", adminID)
|
||||
if scope := tenancy.ScopeKey(ctx); scope != "" {
|
||||
key += ":" + scope
|
||||
}
|
||||
return key
|
||||
}
|
||||
|
||||
func (r *Repository) adminHasTenantAccess(ctx context.Context, adminID uint64) (bool, error) {
|
||||
tenantID := tenancy.IDFromContext(ctx)
|
||||
if tenantID == 0 {
|
||||
return true, nil
|
||||
}
|
||||
var count int64
|
||||
err := r.db.WithContext(ctx).Table("admin_user_roles AS aur").
|
||||
Joins("JOIN roles AS r ON r.id = aur.role_id").
|
||||
Where("aur.admin_user_id = ? AND (aur.tenant_id = ? OR r.code = ?)", adminID, tenantID, "super_admin").
|
||||
Count(&count).Error
|
||||
return count > 0, err
|
||||
}
|
||||
|
||||
func loginKeyPart(value string) string {
|
||||
|
||||
@@ -6,6 +6,7 @@ import (
|
||||
"strings"
|
||||
|
||||
"hfb_sys/backend/internal/modules/auth"
|
||||
"hfb_sys/backend/internal/tenancy"
|
||||
)
|
||||
|
||||
var (
|
||||
@@ -100,6 +101,10 @@ func (s *Service) Refresh(ctx context.Context, refreshToken string) (*auth.Token
|
||||
if err != nil {
|
||||
return nil, newTokenValidationError(auth.TokenFailureReason(err), ErrInvalidRefreshToken)
|
||||
}
|
||||
tenantID := tenancy.IDFromContext(ctx)
|
||||
if claims.TenantID > 0 && claims.TenantID != tenantID {
|
||||
return nil, newTokenValidationError("tenant_mismatch", ErrInvalidRefreshToken)
|
||||
}
|
||||
if s.repo == nil {
|
||||
return nil, ErrDependencyUnavailable
|
||||
}
|
||||
@@ -113,7 +118,7 @@ func (s *Service) Refresh(ctx context.Context, refreshToken string) (*auth.Token
|
||||
}
|
||||
return nil, invalidRefreshTokenError(err)
|
||||
}
|
||||
pair, err := s.jwt.GenerateSubjectPairWithVersion(admin.ID, admin.Username, "admin", admin.TokenVersion)
|
||||
pair, err := s.jwt.GenerateTenantPairWithVersion(admin.ID, admin.Username, "admin", admin.TokenVersion, tenantID)
|
||||
if err != nil {
|
||||
return nil, err
|
||||
}
|
||||
|
||||
@@ -0,0 +1,85 @@
|
||||
package adminauth
|
||||
|
||||
import (
|
||||
"context"
|
||||
"errors"
|
||||
"testing"
|
||||
|
||||
"hfb_sys/backend/internal/database"
|
||||
"hfb_sys/backend/internal/model"
|
||||
"hfb_sys/backend/internal/tenancy"
|
||||
)
|
||||
|
||||
func adminTenantContext(tenantID uint64) context.Context {
|
||||
return tenancy.WithScope(context.Background(), tenancy.Scope{TenantID: tenantID})
|
||||
}
|
||||
|
||||
func TestAdminAccessAndPermissionsAreScopedByTenant(t *testing.T) {
|
||||
db := database.NewTestDB()
|
||||
roles := []model.Role{
|
||||
{Code: "super_admin", Name: "超级管理员"},
|
||||
{Code: "cs", Name: "客服"},
|
||||
{Code: "ops", Name: "运营"},
|
||||
}
|
||||
if err := db.Create(&roles).Error; err != nil {
|
||||
t.Fatal(err)
|
||||
}
|
||||
permission := model.Permission{Code: "qa:view", Name: "查看质检", Resource: "qa", Action: "view"}
|
||||
if err := db.Create(&permission).Error; err != nil {
|
||||
t.Fatal(err)
|
||||
}
|
||||
if err := db.Create(&model.RolePermission{RoleID: roles[1].ID, PermissionID: permission.ID}).Error; err != nil {
|
||||
t.Fatal(err)
|
||||
}
|
||||
|
||||
tenantAdmin := model.AdminUser{Username: "tenant-cs", PasswordHash: "x", Status: "active", TokenVersion: 1}
|
||||
otherAdmin := model.AdminUser{Username: "other-ops", PasswordHash: "x", Status: "active", TokenVersion: 1}
|
||||
superAdmin := model.AdminUser{Username: "root", PasswordHash: "x", Status: "active", TokenVersion: 1}
|
||||
if err := db.Create(&tenantAdmin).Error; err != nil {
|
||||
t.Fatal(err)
|
||||
}
|
||||
if err := db.Create(&otherAdmin).Error; err != nil {
|
||||
t.Fatal(err)
|
||||
}
|
||||
if err := db.Create(&superAdmin).Error; err != nil {
|
||||
t.Fatal(err)
|
||||
}
|
||||
for _, assignment := range []model.AdminUserRole{
|
||||
{AdminID: tenantAdmin.ID, RoleID: roles[1].ID, TenantID: 101},
|
||||
{AdminID: otherAdmin.ID, RoleID: roles[2].ID, TenantID: 202},
|
||||
{AdminID: superAdmin.ID, RoleID: roles[0].ID, TenantID: 0},
|
||||
} {
|
||||
if err := db.Create(&assignment).Error; err != nil {
|
||||
t.Fatal(err)
|
||||
}
|
||||
}
|
||||
|
||||
repo := NewRepository(db, nil, nil)
|
||||
if _, err := repo.FindActiveForToken(adminTenantContext(101), tenantAdmin.ID, 1); err != nil {
|
||||
t.Fatalf("tenant admin token in own tenant: %v", err)
|
||||
}
|
||||
if _, err := repo.FindActiveForToken(adminTenantContext(202), tenantAdmin.ID, 1); !errors.Is(err, ErrAdminNotFound) {
|
||||
t.Fatalf("tenant admin token in other tenant error = %v, want ErrAdminNotFound", err)
|
||||
}
|
||||
|
||||
tenantDTO, err := repo.FindByID(adminTenantContext(101), tenantAdmin.ID)
|
||||
if err != nil {
|
||||
t.Fatal(err)
|
||||
}
|
||||
if tenantDTO.TenantID != 101 || len(tenantDTO.Roles) != 1 || tenantDTO.Roles[0].Code != "cs" {
|
||||
t.Fatalf("tenant admin roles = %+v", tenantDTO)
|
||||
}
|
||||
if len(tenantDTO.Permissions) != 1 || tenantDTO.Permissions[0] != "qa:view" {
|
||||
t.Fatalf("tenant admin permissions = %+v", tenantDTO.Permissions)
|
||||
}
|
||||
|
||||
for _, tenantID := range []uint64{101, 202} {
|
||||
superDTO, err := repo.FindByID(adminTenantContext(tenantID), superAdmin.ID)
|
||||
if err != nil {
|
||||
t.Fatalf("load super admin in tenant %d: %v", tenantID, err)
|
||||
}
|
||||
if len(superDTO.Permissions) != 1 || superDTO.Permissions[0] != "*" {
|
||||
t.Fatalf("super admin permissions in tenant %d = %+v", tenantID, superDTO.Permissions)
|
||||
}
|
||||
}
|
||||
}
|
||||
Reference in New Issue
Block a user