fix(auth): 注册唯一性检查识别 Gmail 邮箱别名
合并 #681:注册唯一性检查识别 Gmail 邮箱别名
This commit is contained in:
1 parent
a71e03b131
commit
19841cb9c5
12 files changed
+316
-8
No files matched your search
@@ -0,0 +1,58 @@
|
||||
package repository
|
||||
|
||||
import (
|
||||
"infinite-canvas/backend/internal/emailidentity"
|
||||
"infinite-canvas/backend/internal/kernel"
|
||||
"infinite-canvas/backend/internal/model"
|
||||
|
||||
"gorm.io/gorm"
|
||||
)
|
||||
|
||||
// CheckEmailAvailable compares legacy rows without rewriting their login address.
|
||||
func (r *Repository) CheckEmailAvailable(email, ownID string) error {
|
||||
if email == "" {
|
||||
return nil
|
||||
}
|
||||
value := "lower(trim(email))"
|
||||
local := "split_part(" + value + ",'@',1)"
|
||||
if r.Dialect() == "sqlite" {
|
||||
local = "substr(" + value + ",1,instr(" + value + ",'@')-1)"
|
||||
}
|
||||
untagged := "split_part(" + local + ",'+',1)"
|
||||
if r.Dialect() == "sqlite" {
|
||||
untagged = "CASE WHEN instr(" + local + ",'+') > 0 THEN substr(" + local + ",1,instr(" + local + ",'+')-1) ELSE " + local + " END"
|
||||
}
|
||||
canonical := "CASE WHEN " + value + " LIKE '%@gmail.com' OR " + value + " LIKE '%@googlemail.com' THEN replace((" + untagged + "),'.','') || '@gmail.com' ELSE " + value + " END"
|
||||
var count int64
|
||||
if err := r.db.Model(&model.User{}).Where("id <> ? AND ("+canonical+") = ?", ownID, emailidentity.Canonical(email)).Count(&count).Error; err != nil {
|
||||
return err
|
||||
}
|
||||
if count > 0 {
|
||||
return kernel.BadAuthRequest("邮箱已被注册")
|
||||
}
|
||||
return nil
|
||||
}
|
||||
|
||||
// All public registration paths lock before checking and writing, including
|
||||
// registrations using different verification codes on different instances.
|
||||
func lockRegistrationEmail(tx *gorm.DB, email string) error {
|
||||
if tx.Dialector.Name() == "postgres" {
|
||||
return tx.Exec("SELECT pg_advisory_xact_lock(hashtext(?)::bigint)", "registration-email:"+emailidentity.Canonical(email)).Error
|
||||
}
|
||||
if tx.Dialector.Name() == "sqlite" {
|
||||
return tx.Exec("UPDATE users SET updated_at = updated_at WHERE 1 = 0").Error
|
||||
}
|
||||
return gorm.ErrInvalidData
|
||||
}
|
||||
|
||||
func (r *Repository) CreateRegisteredUser(user *model.User) error {
|
||||
return r.db.Transaction(func(tx *gorm.DB) error {
|
||||
if err := lockRegistrationEmail(tx, user.Email); err != nil {
|
||||
return err
|
||||
}
|
||||
if err := New(tx).CheckEmailAvailable(user.Email, ""); err != nil {
|
||||
return err
|
||||
}
|
||||
return tx.Create(user).Error
|
||||
})
|
||||
}
|
||||
@@ -0,0 +1,137 @@
|
||||
package repository
|
||||
|
||||
import (
|
||||
"path/filepath"
|
||||
"sync"
|
||||
"testing"
|
||||
"time"
|
||||
|
||||
"gorm.io/driver/sqlite"
|
||||
"gorm.io/gorm"
|
||||
"infinite-canvas/backend/internal/model"
|
||||
)
|
||||
|
||||
func TestGmailMailboxRegistrationConcurrent(t *testing.T) {
|
||||
dsn := filepath.Join(t.TempDir(), "users.db") + "?_busy_timeout=5000&_journal_mode=WAL"
|
||||
db, err := gorm.Open(sqlite.Open(dsn), &gorm.Config{})
|
||||
if err != nil {
|
||||
t.Fatal(err)
|
||||
}
|
||||
if err := db.AutoMigrate(&model.User{}, &model.EmailVerificationCode{}); err != nil {
|
||||
t.Fatal(err)
|
||||
}
|
||||
now := time.Now()
|
||||
for _, id := range []string{"one", "two"} {
|
||||
if err := db.Create(&model.EmailVerificationCode{ID: id, Email: id + "@gmail.com", ExpiresAt: now.Add(time.Hour)}).Error; err != nil {
|
||||
t.Fatal(err)
|
||||
}
|
||||
}
|
||||
var wg sync.WaitGroup
|
||||
errs := make(chan error, 2)
|
||||
start := make(chan struct{})
|
||||
for i, email := range []string{"a.b+first@gmail.com", "ab+second@googlemail.com"} {
|
||||
id := []string{"one", "two"}[i]
|
||||
peer, err := gorm.Open(sqlite.Open(dsn), &gorm.Config{})
|
||||
if err != nil {
|
||||
t.Fatal(err)
|
||||
}
|
||||
sqlDB, _ := peer.DB()
|
||||
t.Cleanup(func() { _ = sqlDB.Close() })
|
||||
wg.Add(1)
|
||||
go func() {
|
||||
defer wg.Done()
|
||||
<-start
|
||||
errs <- New(peer).CreateUserWithEmailVerification(&model.User{ID: id, Username: id, Email: email}, id, now)
|
||||
}()
|
||||
}
|
||||
close(start)
|
||||
wg.Wait()
|
||||
close(errs)
|
||||
success := 0
|
||||
for err := range errs {
|
||||
if err == nil {
|
||||
success++
|
||||
} else if err.Error() != "邮箱已被注册" {
|
||||
t.Fatalf("unexpected error: %v", err)
|
||||
}
|
||||
}
|
||||
if success != 1 {
|
||||
t.Fatalf("successful registrations=%d want 1", success)
|
||||
}
|
||||
var consumed int64
|
||||
if err := db.Model(&model.EmailVerificationCode{}).Where("used_at IS NOT NULL").Count(&consumed).Error; err != nil || consumed != 1 {
|
||||
t.Fatalf("consumed=%d err=%v", consumed, err)
|
||||
}
|
||||
}
|
||||
|
||||
func TestGmailMailboxLegacyLookupsRemainExact(t *testing.T) {
|
||||
db, err := gorm.Open(sqlite.Open(":memory:"), &gorm.Config{})
|
||||
if err != nil {
|
||||
t.Fatal(err)
|
||||
}
|
||||
if err := db.AutoMigrate(&model.User{}); err != nil {
|
||||
t.Fatal(err)
|
||||
}
|
||||
r := New(db)
|
||||
for _, user := range []model.User{{ID: "one", Username: "one", Email: "a.b+old@gmail.com"}, {ID: "two", Username: "two", Email: "ab@gmail.com"}} {
|
||||
if err := db.Create(&user).Error; err != nil {
|
||||
t.Fatal(err)
|
||||
}
|
||||
got, err := r.UserByEmail(user.Email)
|
||||
if err != nil || got.ID != user.ID {
|
||||
t.Fatalf("lookup %q=%v err=%v", user.Email, got, err)
|
||||
}
|
||||
}
|
||||
if err := r.CheckEmailAvailable("ab+new@googlemail.com", ""); err == nil {
|
||||
t.Fatal("legacy alias collision not detected")
|
||||
}
|
||||
if err := r.CheckEmailAvailable("a.b+new@example.com", ""); err != nil {
|
||||
t.Fatal(err)
|
||||
}
|
||||
}
|
||||
|
||||
func TestGmailMailboxVerificationEntryPoints(t *testing.T) {
|
||||
for _, mode := range []string{"ticket", "oauth", "bind", "first-user"} {
|
||||
t.Run(mode, func(t *testing.T) {
|
||||
db, err := gorm.Open(sqlite.Open(":memory:"), &gorm.Config{})
|
||||
if err != nil {
|
||||
t.Fatal(err)
|
||||
}
|
||||
sqlDB, _ := db.DB()
|
||||
t.Cleanup(func() { _ = sqlDB.Close() })
|
||||
if err := db.AutoMigrate(&model.User{}, &model.AuthVerification{}, &model.UserIdentity{}, &model.CreditAccount{}); err != nil {
|
||||
t.Fatal(err)
|
||||
}
|
||||
r := New(db)
|
||||
if err := db.Create(&model.User{ID: "owner", Username: "owner", Email: "a.b@gmail.com"}).Error; err != nil {
|
||||
t.Fatal(err)
|
||||
}
|
||||
user := model.User{ID: "new", Username: "new", Email: "ab+tag@googlemail.com", Status: model.UserStatusActive}
|
||||
v := model.AuthVerification{ID: "ticket", UserID: "new", Email: user.Email, Ready: true, ExpiresAt: time.Now().Add(time.Hour)}
|
||||
if err := db.Create(&v).Error; err != nil {
|
||||
t.Fatal(err)
|
||||
}
|
||||
switch mode {
|
||||
case "ticket":
|
||||
err = r.CreateUserWithVerification(&user, v.ID)
|
||||
case "oauth":
|
||||
err = r.CreateOAuthUser(&user, &model.UserIdentity{ID: "identity", UserID: user.ID, Provider: "linuxdo", Subject: "subject"})
|
||||
case "first-user":
|
||||
err = r.CreateRegisteredUser(&user)
|
||||
case "bind":
|
||||
user.Email = ""
|
||||
if err := db.Create(&user).Error; err != nil {
|
||||
t.Fatal(err)
|
||||
}
|
||||
_, err = r.CompleteAuthVerification(&v, true)
|
||||
}
|
||||
if err == nil || err.Error() != "邮箱已被注册" {
|
||||
t.Fatalf("alias accepted or unexpected error: %v", err)
|
||||
}
|
||||
stored, err := r.AuthVerification(v.ID)
|
||||
if err != nil || stored.UsedAt != nil {
|
||||
t.Fatalf("rejected collision consumed ticket: %v err=%v", stored, err)
|
||||
}
|
||||
})
|
||||
}
|
||||
}
|
||||
@@ -97,6 +97,12 @@ func consumeVerification(tx *gorm.DB, id string, now time.Time) error {
|
||||
}
|
||||
func (r *Repository) CreateUserWithVerification(user *model.User, id string) error {
|
||||
return r.db.Transaction(func(tx *gorm.DB) error {
|
||||
if err := lockRegistrationEmail(tx, user.Email); err != nil {
|
||||
return err
|
||||
}
|
||||
if err := New(tx).CheckEmailAvailable(user.Email, ""); err != nil {
|
||||
return err
|
||||
}
|
||||
if err := consumeVerification(tx, id, time.Now()); err != nil {
|
||||
return err
|
||||
}
|
||||
@@ -106,6 +112,14 @@ func (r *Repository) CreateUserWithVerification(user *model.User, id string) err
|
||||
func (r *Repository) CompleteAuthVerification(v *model.AuthVerification, bind bool) (*model.User, error) {
|
||||
var user model.User
|
||||
err := r.db.Transaction(func(tx *gorm.DB) error {
|
||||
if bind && v.Email != "" {
|
||||
if err := lockRegistrationEmail(tx, v.Email); err != nil {
|
||||
return err
|
||||
}
|
||||
if err := New(tx).CheckEmailAvailable(v.Email, v.UserID); err != nil {
|
||||
return err
|
||||
}
|
||||
}
|
||||
now := time.Now()
|
||||
if err := consumeVerification(tx, v.ID, now); err != nil {
|
||||
return err
|
||||
|
||||
@@ -50,6 +50,12 @@ func (r *Repository) ConsumeOAuthState(provider string, stateHash string) (*mode
|
||||
|
||||
func (r *Repository) CreateOAuthUser(user *model.User, identity *model.UserIdentity) error {
|
||||
return r.db.Transaction(func(tx *gorm.DB) error {
|
||||
if err := lockRegistrationEmail(tx, user.Email); err != nil {
|
||||
return err
|
||||
}
|
||||
if err := New(tx).CheckEmailAvailable(user.Email, ""); err != nil {
|
||||
return err
|
||||
}
|
||||
if err := tx.Create(user).Error; err != nil {
|
||||
return err
|
||||
}
|
||||
|
||||
@@ -134,6 +134,12 @@ func (r *Repository) DeleteEmailVerificationCode(id string) error {
|
||||
|
||||
func (r *Repository) CreateUserWithEmailVerification(user *model.User, verificationCodeID string, usedAt time.Time) error {
|
||||
return r.db.Transaction(func(tx *gorm.DB) error {
|
||||
if err := lockRegistrationEmail(tx, user.Email); err != nil {
|
||||
return err
|
||||
}
|
||||
if err := New(tx).CheckEmailAvailable(user.Email, ""); err != nil {
|
||||
return err
|
||||
}
|
||||
result := tx.Model(&model.EmailVerificationCode{}).Where("id = ? AND used_at IS NULL AND expires_at > ?", verificationCodeID, usedAt).Update("used_at", usedAt)
|
||||
if result.Error != nil {
|
||||
return result.Error
|
||||
|
||||
Reference in new issue
Block a user