fix(auth): 注册唯一性检查识别 Gmail 邮箱别名

合并 #681:注册唯一性检查识别 Gmail 邮箱别名
This commit is contained in:
Catlaxy AI authored and GitHub committed 2026-10-06 09:23:04 +08:00
1 parent a71e03b131
commit 19841cb9c5
12 files changed
+316 -8

No files matched your search

+2 -4
View File
@@ -199,9 +199,7 @@ func (s *Service) Register(req RegisterRequest) (*AuthSessionResult, error) {
return nil, err
}
if email != "" {
if _, err := s.repo.UserByEmail(email); err == nil {
return nil, kernel.BadAuthRequest("邮箱已被注册")
} else if !errors.Is(err, gorm.ErrRecordNotFound) {
if err := s.repo.CheckEmailAvailable(email, ""); err != nil {
return nil, err
}
}
@@ -243,7 +241,7 @@ func (s *Service) Register(req RegisterRequest) (*AuthSessionResult, error) {
if err := s.repo.CreateUserWithEmailVerification(&user, verifiedCode.ID, time.Now()); err != nil {
return nil, err
}
} else if err := s.repo.Create(&user); err != nil {
} else if err := s.repo.CreateRegisteredUser(&user); err != nil {
return nil, err
}
if err := s.host.EnsureSignupBonus(user.ID); err != nil {
+1 -3
View File
@@ -168,9 +168,7 @@ func (s *Service) SendRegistrationEmailCode(rawEmail string) error {
if !registrationEnabled {
return kernel.Forbidden("管理员未开放新用户注册")
}
if _, err := s.repo.UserByEmail(email); err == nil {
return kernel.BadAuthRequest("邮箱已被注册")
} else if !errors.Is(err, gorm.ErrRecordNotFound) {
if err := s.repo.CheckEmailAvailable(email, ""); err != nil {
return err
}
_, setting, err := s.readEmailSetting()
@@ -0,0 +1,48 @@
package auth
import (
"strings"
"testing"
"time"
"infinite-canvas/backend/internal/model"
)
func TestGmailAliasRegistrationRejectsExistingMailbox(t *testing.T) {
svc, db := newRegistrationTestService(t)
for _, setting := range []model.SystemSetting{
{Key: registrationSettingKey, ValueJSON: `{"enabled":true}`},
} {
if err := db.Create(&setting).Error; err != nil {
t.Fatal(err)
}
}
if err := db.Model(&model.SystemSetting{}).Where("key = ?", emailSettingKey).Update("value_json", `{"enabled":true,"host":"smtp.example.com","port":587,"fromEmail":"sender@gmail.com","registrationAllowedDomains":["gmail.com","googlemail.com"]}`).Error; err != nil {
t.Fatal(err)
}
if err := db.Create(&model.User{ID: "existing", Username: "existing", Email: "a.b+old@googlemail.com", Role: model.UserRoleUser, Status: model.UserStatusActive}).Error; err != nil {
t.Fatal(err)
}
// A valid code isolates the registration uniqueness check from email delivery.
email, code := "ab+new@gmail.com", "123456"
now := time.Now()
hash, err := svc.emailVerificationCodeHash(registrationEmailPurpose, email, code)
if err != nil {
t.Fatal(err)
}
verification := model.EmailVerificationCode{ID: "code", Email: email, Purpose: registrationEmailPurpose, CodeHash: hash, ExpiresAt: now.Add(time.Hour), CreatedAt: now}
if err := db.Create(&verification).Error; err != nil {
t.Fatal(err)
}
_, err = svc.Register(RegisterRequest{Username: "new-member", Email: email, EmailCode: code, Password: "password", AcceptedTerms: true})
if err == nil || !strings.Contains(err.Error(), "邮箱已被注册") {
t.Fatalf("registration accepted a second account for the same Gmail mailbox or failed unexpectedly: %v", err)
}
var count int64
if err := db.Model(&model.User{}).Count(&count).Error; err != nil || count != 1 {
t.Fatalf("users=%d err=%v", count, err)
}
if err := db.First(&verification, "id = ?", "code").Error; err != nil || verification.UsedAt != nil {
t.Fatalf("verification consumed: %#v err=%v", verification, err)
}
}
+4 -1
View File
@@ -210,7 +210,10 @@ func (s *Service) contactAvailable(email, phone, ownID string) error {
if email == "" {
continue
}
user, err = s.repo.UserByEmail(email)
if err := s.repo.CheckEmailAvailable(email, ownID); err != nil {
return err
}
continue
} else {
if phone == "" {
continue