fix: wrap Register api in an atomic transaction to avoid dead locks

This commit is contained in:
Derrick Hammer 2023-08-04 11:51:18 -04:00
parent dff3ca4589
commit e09e51bb52
Signed by: pcfreak30
GPG Key ID: C997C339BE476FF2
1 changed files with 34 additions and 46 deletions

View File

@ -7,7 +7,6 @@ import (
"git.lumeweb.com/LumeWeb/portal/model" "git.lumeweb.com/LumeWeb/portal/model"
"go.uber.org/zap" "go.uber.org/zap"
"gorm.io/gorm" "gorm.io/gorm"
"strings"
) )
var ( var (
@ -19,53 +18,42 @@ var (
) )
func Register(email string, password string, pubkey string) error { func Register(email string, password string, pubkey string) error {
// Check if an account with the same email address already exists. err := db.Get().Transaction(func(tx *gorm.DB) error {
existingAccount := model.Account{} existingAccount := model.Account{}
err := db.Get().Where("email = ?", email).First(&existingAccount).Error err := tx.Where("email = ?", email).First(&existingAccount).Error
if err == nil { if err == nil {
logger.Get().Debug(ErrEmailExists.Error(), zap.Error(err), zap.String("email", email)) return ErrEmailExists
// An account with the same email address already exists. } else if !errors.Is(err, gorm.ErrRecordNotFound) {
// Return an error response to the client.
return ErrEmailExists
} else if !errors.Is(err, gorm.ErrRecordNotFound) {
logger.Get().Error(ErrQueryingAcct.Error(), zap.Error(err))
return ErrQueryingAcct
}
if len(pubkey) > 0 {
pubkey = strings.ToLower(pubkey)
var count int64
err := db.Get().Model(&model.Key{}).Where("pubkey = ?", pubkey).Count(&count).Error
if err != nil && !errors.Is(err, gorm.ErrRecordNotFound) {
logger.Get().Error(ErrQueryingAcct.Error(), zap.Error(err), zap.String("pubkey", pubkey))
return ErrQueryingAcct
}
if count > 0 {
logger.Get().Debug(ErrPubkeyExists.Error(), zap.Error(err), zap.String("pubkey", pubkey))
// An account with the same pubkey already exists.
// Return an error response to the client.
return ErrPubkeyExists
}
}
// Create a new Account model with the provided email and hashed password.
account := model.Account{
Email: email,
}
// Hash the password before saving it to the database.
if len(password) > 0 {
hashedPassword, err := hashPassword(password)
if err != nil {
return err return err
} }
account.Password = &hashedPassword if len(pubkey) > 0 {
} var count int64
err := tx.Model(&model.Key{}).Where("pubkey = ?", pubkey).Count(&count).Error
if err != nil && !errors.Is(err, gorm.ErrRecordNotFound) {
return err
}
if count > 0 {
// An account with the same pubkey already exists.
// Return an error response to the client.
return ErrPubkeyExists
}
}
// Create a new Account model with the provided email and hashed password.
account := model.Account{
Email: email,
}
// Hash the password before saving it to the database.
if len(password) > 0 {
hashedPassword, err := hashPassword(password)
if err != nil {
return err
}
account.Password = &hashedPassword
}
err = db.Get().Transaction(func(tx *gorm.DB) error {
// do some database operations in the transaction (use 'tx' from this point, not 'db')
if err := tx.Create(&account).Error; err != nil { if err := tx.Create(&account).Error; err != nil {
return err return err
} }
@ -76,12 +64,12 @@ func Register(email string, password string, pubkey string) error {
} }
} }
// return nil will commit the whole transaction
return nil return nil
}) })
if err != nil { if err != nil {
logger.Get().Error(ErrFailedCreateAccount.Error(), zap.Error(err)) logger.Get().Error(ErrFailedCreateAccount.Error(), zap.Error(err))
return ErrFailedCreateAccount return err
} }
return nil return nil