feat(tenant): 按租户隔离用户身份与后台权限
This commit is contained in:
@@ -9,6 +9,7 @@ import (
|
||||
"hfb_sys/backend/internal/logging"
|
||||
"hfb_sys/backend/internal/model"
|
||||
"hfb_sys/backend/internal/modules/adminrole"
|
||||
"hfb_sys/backend/internal/tenancy"
|
||||
|
||||
"github.com/redis/go-redis/v9"
|
||||
"golang.org/x/crypto/bcrypt"
|
||||
@@ -26,7 +27,7 @@ func NewRepository(db *gorm.DB, redis *redis.Client) *Repository {
|
||||
}
|
||||
|
||||
func (r *Repository) List(ctx context.Context, page, pageSize int) (*PaginatedResult, error) {
|
||||
db := r.db.WithContext(ctx)
|
||||
db := r.scopedAdminQuery(ctx)
|
||||
var total int64
|
||||
if err := db.Model(&model.AdminUser{}).Count(&total).Error; err != nil {
|
||||
return nil, err
|
||||
@@ -55,7 +56,7 @@ func (r *Repository) List(ctx context.Context, page, pageSize int) (*PaginatedRe
|
||||
|
||||
func (r *Repository) FindByID(ctx context.Context, id uint64) (*AdminUserDTO, error) {
|
||||
var admin model.AdminUser
|
||||
if err := r.db.WithContext(ctx).First(&admin, id).Error; err != nil {
|
||||
if err := r.scopedAdminQuery(ctx).Where("admin_users.id = ?", id).First(&admin).Error; err != nil {
|
||||
return nil, err
|
||||
}
|
||||
roles, _ := r.getAdminRoles(ctx, admin.ID)
|
||||
@@ -89,13 +90,22 @@ func (r *Repository) Create(ctx context.Context, req CreateAdminRequest) (*Admin
|
||||
if err := r.db.WithContext(ctx).Create(&admin).Error; err != nil {
|
||||
return nil, err
|
||||
}
|
||||
return r.FindByID(ctx, admin.ID)
|
||||
return &AdminUserDTO{
|
||||
ID: admin.ID,
|
||||
Username: admin.Username,
|
||||
Nickname: admin.Nickname,
|
||||
Status: admin.Status,
|
||||
Roles: []adminrole.RoleDTO{},
|
||||
LastLoginAt: admin.LastLoginAt,
|
||||
CreatedAt: admin.CreatedAt,
|
||||
UpdatedAt: admin.UpdatedAt,
|
||||
}, nil
|
||||
}
|
||||
|
||||
func (r *Repository) Update(ctx context.Context, id uint64, req UpdateAdminRequest) (*AdminUserDTO, error) {
|
||||
db := r.db.WithContext(ctx)
|
||||
var admin model.AdminUser
|
||||
if err := db.First(&admin, id).Error; err != nil {
|
||||
if err := r.scopedAdminQuery(ctx).Where("admin_users.id = ?", id).First(&admin).Error; err != nil {
|
||||
return nil, err
|
||||
}
|
||||
if req.Nickname != "" {
|
||||
@@ -122,9 +132,43 @@ func (r *Repository) Delete(ctx context.Context, id uint64, currentAdminID uint6
|
||||
}
|
||||
db := r.db.WithContext(ctx)
|
||||
var admin model.AdminUser
|
||||
if err := db.First(&admin, id).Error; err != nil {
|
||||
if err := r.scopedAdminQuery(ctx).Where("admin_users.id = ?", id).First(&admin).Error; err != nil {
|
||||
return err
|
||||
}
|
||||
tenantID := tenancy.IDFromContext(ctx)
|
||||
if tenantID > 0 {
|
||||
isSuper, err := r.adminHasRoleCode(ctx, id, "super_admin")
|
||||
if err != nil {
|
||||
return err
|
||||
}
|
||||
if isSuper {
|
||||
return ErrLastSuperAdmin
|
||||
}
|
||||
err = db.Transaction(func(tx *gorm.DB) error {
|
||||
if err := tx.Where("admin_user_id = ? AND tenant_id = ?", id, tenantID).
|
||||
Delete(&model.AdminUserRole{}).Error; err != nil {
|
||||
return err
|
||||
}
|
||||
var remaining int64
|
||||
if err := tx.Model(&model.AdminUserRole{}).
|
||||
Where("admin_user_id = ?", id).Count(&remaining).Error; err != nil {
|
||||
return err
|
||||
}
|
||||
if remaining == 0 {
|
||||
if err := tx.Delete(&model.AdminUser{}, id).Error; err != nil {
|
||||
return err
|
||||
}
|
||||
} else if err := r.bumpTokenVersion(tx, ctx, id, "tenant_roles_removed"); err != nil {
|
||||
return err
|
||||
}
|
||||
return nil
|
||||
})
|
||||
if err != nil {
|
||||
return err
|
||||
}
|
||||
r.invalidatePermCache(ctx, id)
|
||||
return nil
|
||||
}
|
||||
// 检查是否是最后一个 super_admin
|
||||
isLastSuper, err := r.isLastSuperAdmin(ctx, id)
|
||||
if err != nil {
|
||||
@@ -133,30 +177,42 @@ func (r *Repository) Delete(ctx context.Context, id uint64, currentAdminID uint6
|
||||
if isLastSuper {
|
||||
return ErrLastSuperAdmin
|
||||
}
|
||||
return db.Transaction(func(tx *gorm.DB) error {
|
||||
err = db.Transaction(func(tx *gorm.DB) error {
|
||||
if err := tx.Where("admin_user_id = ?", id).Delete(&model.AdminUserRole{}).Error; err != nil {
|
||||
return err
|
||||
}
|
||||
if err := tx.Delete(&model.AdminUser{}, id).Error; err != nil {
|
||||
return err
|
||||
}
|
||||
r.invalidatePermCache(ctx, id)
|
||||
return nil
|
||||
})
|
||||
if err == nil {
|
||||
r.invalidatePermCache(ctx, id)
|
||||
}
|
||||
return err
|
||||
}
|
||||
|
||||
func (r *Repository) AssignRoles(ctx context.Context, adminID uint64, roleIDs []uint64) error {
|
||||
db := r.db.WithContext(ctx)
|
||||
tenantID := tenancy.IDFromContext(ctx)
|
||||
var admin model.AdminUser
|
||||
if err := db.First(&admin, adminID).Error; err != nil {
|
||||
return err
|
||||
}
|
||||
err := db.Transaction(func(tx *gorm.DB) error {
|
||||
if err := tx.Where("admin_user_id = ?", adminID).Delete(&model.AdminUserRole{}).Error; err != nil {
|
||||
roleIDs, err := r.validateTenantRoleIDs(ctx, roleIDs)
|
||||
if err != nil {
|
||||
return err
|
||||
}
|
||||
err = db.Transaction(func(tx *gorm.DB) error {
|
||||
deleteQuery := tx.Where("admin_user_id = ?", adminID)
|
||||
if tenantID > 0 {
|
||||
deleteQuery = deleteQuery.Where("tenant_id = ?", tenantID)
|
||||
}
|
||||
if err := deleteQuery.Delete(&model.AdminUserRole{}).Error; err != nil {
|
||||
return err
|
||||
}
|
||||
for _, rid := range roleIDs {
|
||||
aur := model.AdminUserRole{AdminID: adminID, RoleID: rid}
|
||||
aur := model.AdminUserRole{AdminID: adminID, RoleID: rid, TenantID: tenantID}
|
||||
if err := tx.Clauses(clause.OnConflict{DoNothing: true}).Create(&aur).Error; err != nil {
|
||||
return err
|
||||
}
|
||||
@@ -195,7 +251,7 @@ func (r *Repository) ChangeOwnPassword(ctx context.Context, id uint64, oldPwd, n
|
||||
|
||||
func (r *Repository) ResetPassword(ctx context.Context, id uint64, newPwd string) error {
|
||||
var admin model.AdminUser
|
||||
if err := r.db.WithContext(ctx).First(&admin, id).Error; err != nil {
|
||||
if err := r.scopedAdminQuery(ctx).Where("admin_users.id = ?", id).First(&admin).Error; err != nil {
|
||||
return err
|
||||
}
|
||||
hash, err := bcrypt.GenerateFromPassword([]byte(newPwd), bcrypt.DefaultCost)
|
||||
@@ -215,22 +271,35 @@ func (r *Repository) ResetPassword(ctx context.Context, id uint64, newPwd string
|
||||
}
|
||||
|
||||
func (r *Repository) GetPermissionCodes(ctx context.Context, adminID uint64) ([]string, error) {
|
||||
isSuper, err := r.adminHasRoleCode(ctx, adminID, "super_admin")
|
||||
if err != nil {
|
||||
return nil, err
|
||||
}
|
||||
if isSuper {
|
||||
return []string{"*"}, nil
|
||||
}
|
||||
var codes []string
|
||||
err := r.db.WithContext(ctx).Table("admin_user_roles aur").
|
||||
query := r.db.WithContext(ctx).Table("admin_user_roles aur").
|
||||
Select("DISTINCT p.code").
|
||||
Joins("JOIN role_permissions rp ON rp.role_id = aur.role_id").
|
||||
Joins("JOIN permissions p ON p.id = rp.permission_id").
|
||||
Where("aur.admin_user_id = ?", adminID).
|
||||
Pluck("code", &codes).Error
|
||||
Where("aur.admin_user_id = ?", adminID)
|
||||
if tenantID := tenancy.IDFromContext(ctx); tenantID > 0 {
|
||||
query = query.Where("aur.tenant_id = ?", tenantID)
|
||||
}
|
||||
err = query.Pluck("code", &codes).Error
|
||||
return codes, err
|
||||
}
|
||||
|
||||
func (r *Repository) getAdminRoles(ctx context.Context, adminID uint64) ([]adminrole.RoleDTO, error) {
|
||||
var roles []model.Role
|
||||
err := r.db.WithContext(ctx).Table("roles").
|
||||
query := r.db.WithContext(ctx).Table("roles").
|
||||
Joins("JOIN admin_user_roles aur ON aur.role_id = roles.id").
|
||||
Where("aur.admin_user_id = ?", adminID).
|
||||
Find(&roles).Error
|
||||
Where("aur.admin_user_id = ?", adminID)
|
||||
if tenantID := tenancy.IDFromContext(ctx); tenantID > 0 {
|
||||
query = query.Where("(aur.tenant_id = ? OR roles.code = ?)", tenantID, "super_admin")
|
||||
}
|
||||
err := query.Find(&roles).Error
|
||||
if err != nil {
|
||||
return nil, err
|
||||
}
|
||||
@@ -260,7 +329,26 @@ func (r *Repository) invalidatePermCache(ctx context.Context, adminID uint64) {
|
||||
if r.redis == nil {
|
||||
return
|
||||
}
|
||||
r.redis.Del(ctx, permCacheKey(adminID))
|
||||
patterns := []string{
|
||||
permCacheKey(adminID),
|
||||
fmt.Sprintf("admin:perms:%d:*", adminID),
|
||||
}
|
||||
for _, pattern := range patterns {
|
||||
var cursor uint64
|
||||
for {
|
||||
keys, next, err := r.redis.Scan(ctx, cursor, pattern, 100).Result()
|
||||
if err != nil {
|
||||
return
|
||||
}
|
||||
if len(keys) > 0 {
|
||||
_ = r.redis.Del(ctx, keys...).Err()
|
||||
}
|
||||
cursor = next
|
||||
if cursor == 0 {
|
||||
break
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
func (r *Repository) bumpTokenVersion(db *gorm.DB, ctx context.Context, adminID uint64, reason string) error {
|
||||
@@ -288,10 +376,55 @@ func permCacheKey(adminID uint64) string {
|
||||
return fmt.Sprintf("admin:perms:%d", adminID)
|
||||
}
|
||||
|
||||
func (r *Repository) scopedAdminQuery(ctx context.Context) *gorm.DB {
|
||||
query := r.db.WithContext(ctx).Model(&model.AdminUser{})
|
||||
tenantID := tenancy.IDFromContext(ctx)
|
||||
if tenantID > 0 {
|
||||
query = query.Where(`EXISTS (
|
||||
SELECT 1 FROM admin_user_roles aur
|
||||
JOIN roles r ON r.id = aur.role_id
|
||||
WHERE aur.admin_user_id = admin_users.id
|
||||
AND (aur.tenant_id = ? OR r.code = ?)
|
||||
)`, tenantID, "super_admin")
|
||||
}
|
||||
return query
|
||||
}
|
||||
|
||||
func (r *Repository) validateTenantRoleIDs(ctx context.Context, roleIDs []uint64) ([]uint64, error) {
|
||||
tenantID := tenancy.IDFromContext(ctx)
|
||||
if tenantID == 0 || len(roleIDs) == 0 {
|
||||
return roleIDs, nil
|
||||
}
|
||||
var count int64
|
||||
if err := r.db.WithContext(ctx).Model(&model.Role{}).
|
||||
Where("id IN ? AND code <> ?", roleIDs, "super_admin").
|
||||
Count(&count).Error; err != nil {
|
||||
return nil, err
|
||||
}
|
||||
unique := make(map[uint64]struct{}, len(roleIDs))
|
||||
for _, id := range roleIDs {
|
||||
unique[id] = struct{}{}
|
||||
}
|
||||
if count != int64(len(unique)) {
|
||||
return nil, ErrRoleOutsideTenant
|
||||
}
|
||||
return roleIDs, nil
|
||||
}
|
||||
|
||||
func (r *Repository) adminHasRoleCode(ctx context.Context, adminID uint64, code string) (bool, error) {
|
||||
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 r.code = ?", adminID, code).
|
||||
Count(&count).Error
|
||||
return count > 0, err
|
||||
}
|
||||
|
||||
var (
|
||||
ErrCannotDeleteSelf = errors.New("cannot delete self")
|
||||
ErrLastSuperAdmin = errors.New("cannot delete the last super admin")
|
||||
ErrWrongPassword = errors.New("wrong password")
|
||||
ErrCannotDeleteSelf = errors.New("cannot delete self")
|
||||
ErrLastSuperAdmin = errors.New("cannot delete the last super admin")
|
||||
ErrWrongPassword = errors.New("wrong password")
|
||||
ErrRoleOutsideTenant = errors.New("role is not available in current tenant")
|
||||
)
|
||||
|
||||
func IsNotFound(err error) bool {
|
||||
|
||||
Reference in New Issue
Block a user