- Referer 开放重定向:safeRedirectPath 仅放行同站相对路径, 外部 URL/协议跳转一律回退 /inbox - 发信配额 TOCTOU:新增 TryReserveQuota 原子预扣 (UPDATE ... WHERE used_bytes + n <= quota_bytes),超配额即拒发; 附件保存失败按大小补偿回退 - 移除危险模板函数 safeHTML/safeJS:新增 jsonify(json.Marshal, < > & 转义为 \u003c 等,无法逃出 </script>),compose 页 quill.innerHTML 改用 jsonify;srcdoc 改回默认属性转义 - 会话治理:登录成功后 session.Clear() 清旧状态;记录 loginAt, 绝对过期 7 天 + 滑动续期(活跃会话 12h 写回刷新) - 确认 #15 Content-Disposition 编码随 P1 #4 已完成 - 新增 12 个测试:重定向路径矩阵、配额原子性(含超额不部分扣费)、 jsonify 逃逸防护、会话绝对过期/有效访问(签名会话构造) 至此 16 项安全审计项(P0-P3)全部修复完成。
171 lines
5.3 KiB
Go
171 lines
5.3 KiB
Go
package store
|
|
|
|
import (
|
|
"strings"
|
|
|
|
"mail_go/internal/db"
|
|
|
|
"golang.org/x/crypto/bcrypt"
|
|
"gorm.io/gorm"
|
|
)
|
|
|
|
// UserStore defines the interface for user data operations.
|
|
type UserStore interface {
|
|
Create(user *db.User) error
|
|
GetByID(id uint) (*db.User, error)
|
|
GetByUsername(username string, domainID uint) (*db.User, error)
|
|
GetByEmail(email string) (*db.User, error)
|
|
Authenticate(email, password string) (*db.User, error)
|
|
Update(user *db.User) error
|
|
Delete(id uint) error
|
|
List(domainID uint, page, size int) ([]db.User, int64, error)
|
|
ListAll(page, size int) ([]db.User, int64, error)
|
|
UpdateUsedBytes(id uint, delta int64) error
|
|
UpdatePassword(userID uint, hashedPassword string) error
|
|
// TryReserveQuota 原子预扣 delta 字节:仅在不超过配额时生效并返回 true,
|
|
// 否则不做任何修改返回 false。防止并发提交绕过配额检查(TOCTOU)。
|
|
TryReserveQuota(userID uint, delta int64) (bool, error)
|
|
}
|
|
|
|
// userStoreGorm implements UserStore using GORM.
|
|
type userStoreGorm struct {
|
|
db *gorm.DB
|
|
}
|
|
|
|
// newUserStore creates a new GORM-backed UserStore.
|
|
func newUserStore(database *gorm.DB) UserStore {
|
|
return &userStoreGorm{db: database}
|
|
}
|
|
|
|
// Create inserts a new user record.
|
|
func (s *userStoreGorm) Create(user *db.User) error {
|
|
return s.db.Create(user).Error
|
|
}
|
|
|
|
// GetByID retrieves a user by primary key.
|
|
func (s *userStoreGorm) GetByID(id uint) (*db.User, error) {
|
|
var user db.User
|
|
if err := s.db.Preload("Domain").First(&user, id).Error; err != nil {
|
|
return nil, err
|
|
}
|
|
return &user, nil
|
|
}
|
|
|
|
// GetByUsername retrieves a user by username and domain ID.
|
|
func (s *userStoreGorm) GetByUsername(username string, domainID uint) (*db.User, error) {
|
|
var user db.User
|
|
if err := s.db.Where("username = ? AND domain_id = ?", username, domainID).First(&user).Error; err != nil {
|
|
return nil, err
|
|
}
|
|
return &user, nil
|
|
}
|
|
|
|
// GetByEmail retrieves a user by email address (user@domain format).
|
|
func (s *userStoreGorm) GetByEmail(email string) (*db.User, error) {
|
|
parts := strings.SplitN(email, "@", 2)
|
|
if len(parts) != 2 {
|
|
return nil, ErrInvalidEmail
|
|
}
|
|
username := parts[0]
|
|
domainName := parts[1]
|
|
|
|
var user db.User
|
|
if err := s.db.Joins("JOIN domains ON domains.id = users.domain_id").
|
|
Where("users.username = ? AND domains.name = ?", username, domainName).
|
|
Preload("Domain").
|
|
First(&user).Error; err != nil {
|
|
return nil, err
|
|
}
|
|
return &user, nil
|
|
}
|
|
|
|
// Authenticate verifies an email/password combination and returns the user on success.
|
|
func (s *userStoreGorm) Authenticate(email, password string) (*db.User, error) {
|
|
user, err := s.GetByEmail(email)
|
|
if err != nil {
|
|
return nil, ErrInvalidCredentials
|
|
}
|
|
if !user.IsActive {
|
|
return nil, ErrUserInactive
|
|
}
|
|
if err := bcrypt.CompareHashAndPassword([]byte(user.PasswordHash), []byte(password)); err != nil {
|
|
return nil, ErrInvalidCredentials
|
|
}
|
|
return user, nil
|
|
}
|
|
|
|
// Update saves changes to an existing user record.
|
|
func (s *userStoreGorm) Update(user *db.User) error {
|
|
return s.db.Save(user).Error
|
|
}
|
|
|
|
// Delete removes a user by ID (soft delete if supported, hard delete otherwise).
|
|
func (s *userStoreGorm) Delete(id uint) error {
|
|
return s.db.Delete(&db.User{}, id).Error
|
|
}
|
|
|
|
// List retrieves a paginated list of users for a given domain.
|
|
func (s *userStoreGorm) List(domainID uint, page, size int) ([]db.User, int64, error) {
|
|
var users []db.User
|
|
var total int64
|
|
|
|
query := s.db.Where("domain_id = ?", domainID)
|
|
if err := query.Model(&db.User{}).Count(&total).Error; err != nil {
|
|
return nil, 0, err
|
|
}
|
|
|
|
offset := (page - 1) * size
|
|
if err := s.db.Preload("Domain").Where("domain_id = ?", domainID).Offset(offset).Limit(size).Find(&users).Error; err != nil {
|
|
return nil, 0, err
|
|
}
|
|
return users, total, nil
|
|
}
|
|
|
|
// UpdateUsedBytes atomically adjusts the UsedBytes field by delta.
|
|
func (s *userStoreGorm) UpdateUsedBytes(id uint, delta int64) error {
|
|
return s.db.Model(&db.User{}).Where("id = ?", id).
|
|
Update("used_bytes", gorm.Expr("used_bytes + ?", delta)).Error
|
|
}
|
|
|
|
// TryReserveQuota atomically reserves delta bytes for a user within quota.
|
|
// The reservation is applied (used_bytes incremented) only when it does not
|
|
// exceed quota_bytes; otherwise no change is made and false is returned.
|
|
func (s *userStoreGorm) TryReserveQuota(userID uint, delta int64) (bool, error) {
|
|
if delta <= 0 {
|
|
return false, nil
|
|
}
|
|
res := s.db.Model(&db.User{}).
|
|
Where("id = ? AND used_bytes + ? <= quota_bytes", userID, delta).
|
|
Update("used_bytes", gorm.Expr("used_bytes + ?", delta))
|
|
if res.Error != nil {
|
|
return false, res.Error
|
|
}
|
|
return res.RowsAffected == 1, nil
|
|
}
|
|
|
|
// UpdatePassword updates the password hash for a user and clears the
|
|
// must-change-password flag (the user has now set their own password).
|
|
func (s *userStoreGorm) UpdatePassword(userID uint, hashedPassword string) error {
|
|
return s.db.Model(&db.User{}).Where("id = ?", userID).
|
|
Updates(map[string]interface{}{
|
|
"password_hash": hashedPassword,
|
|
"must_change_password": false,
|
|
}).Error
|
|
}
|
|
|
|
// ListAll retrieves a paginated list of all users across all domains.
|
|
func (s *userStoreGorm) ListAll(page, size int) ([]db.User, int64, error) {
|
|
var users []db.User
|
|
var total int64
|
|
|
|
if err := s.db.Model(&db.User{}).Count(&total).Error; err != nil {
|
|
return nil, 0, err
|
|
}
|
|
|
|
offset := (page - 1) * size
|
|
if err := s.db.Preload("Domain").Offset(offset).Limit(size).Find(&users).Error; err != nil {
|
|
return nil, 0, err
|
|
}
|
|
return users, total, nil
|
|
}
|