Mirrors/sftpgo
1
0
Fork 0
mirror of https://github.com/drakkan/sftpgo.git synced 2025-12-07 23:00:55 +03:00
Code Issues Packages Projects Releases Wiki Activity

normalize common database errors

Browse Source 
Signed-off-by: Nicola Murino <nicola.murino@gmail.com>
This commit is contained in:
Nicola Murino
2024-01-17 17:36:35 +01:00
parent 5ac99ee556
commit 87451560e3
13 changed files with 200 additions and 68 deletions
Download Patch File Download Diff File Expand all files Collapse all files

38
internal/dataprovider/mysql.go
View File

@@ -32,6 +32,7 @@ import (
"github.com/go-sql-driver/mysql"
"github.com/drakkan/sftpgo/v2/internal/logger"
"github.com/drakkan/sftpgo/v2/internal/util"
"github.com/drakkan/sftpgo/v2/internal/version"
"github.com/drakkan/sftpgo/v2/internal/vfs"
)
@@ -341,7 +342,7 @@ func (p *MySQLProvider) userExists(username, role string) (User, error) {
}
func (p *MySQLProvider) addUser(user *User) error {
return sqlCommonAddUser(user, p.dbHandle)
return p.normalizeError(sqlCommonAddUser(user, p.dbHandle), fieldUsername)
}
func (p *MySQLProvider) updateUser(user *User) error {
@@ -387,7 +388,7 @@ func (p *MySQLProvider) getFolderByName(name string) (vfs.BaseVirtualFolder, err
}
func (p *MySQLProvider) addFolder(folder *vfs.BaseVirtualFolder) error {
return sqlCommonAddFolder(folder, p.dbHandle)
return p.normalizeError(sqlCommonAddFolder(folder, p.dbHandle), fieldName)
}
func (p *MySQLProvider) updateFolder(folder *vfs.BaseVirtualFolder) error {
@@ -423,7 +424,7 @@ func (p *MySQLProvider) groupExists(name string) (Group, error) {
}
func (p *MySQLProvider) addGroup(group *Group) error {
return sqlCommonAddGroup(group, p.dbHandle)
return p.normalizeError(sqlCommonAddGroup(group, p.dbHandle), fieldName)
}
func (p *MySQLProvider) updateGroup(group *Group) error {
@@ -443,7 +444,7 @@ func (p *MySQLProvider) adminExists(username string) (Admin, error) {
}
func (p *MySQLProvider) addAdmin(admin *Admin) error {
return sqlCommonAddAdmin(admin, p.dbHandle)
return p.normalizeError(sqlCommonAddAdmin(admin, p.dbHandle), fieldUsername)
}
func (p *MySQLProvider) updateAdmin(admin *Admin) error {
@@ -603,7 +604,7 @@ func (p *MySQLProvider) eventActionExists(name string) (BaseEventAction, error)
}
func (p *MySQLProvider) addEventAction(action *BaseEventAction) error {
return sqlCommonAddEventAction(action, p.dbHandle)
return p.normalizeError(sqlCommonAddEventAction(action, p.dbHandle), fieldName)
}
func (p *MySQLProvider) updateEventAction(action *BaseEventAction) error {
@@ -631,7 +632,7 @@ func (p *MySQLProvider) eventRuleExists(name string) (EventRule, error) {
}
func (p *MySQLProvider) addEventRule(rule *EventRule) error {
return sqlCommonAddEventRule(rule, p.dbHandle)
return p.normalizeError(sqlCommonAddEventRule(rule, p.dbHandle), fieldName)
}
func (p *MySQLProvider) updateEventRule(rule *EventRule) error {
@@ -683,7 +684,7 @@ func (p *MySQLProvider) roleExists(name string) (Role, error) {
}
func (p *MySQLProvider) addRole(role *Role) error {
return sqlCommonAddRole(role, p.dbHandle)
return p.normalizeError(sqlCommonAddRole(role, p.dbHandle), fieldName)
}
func (p *MySQLProvider) updateRole(role *Role) error {
@@ -824,3 +825,26 @@ func (p *MySQLProvider) resetDatabase() error {
sql := sqlReplaceAll(mysqlResetSQL)
return sqlCommonExecSQLAndUpdateDBVersion(p.dbHandle, strings.Split(sql, ";"), 0, false)
}
func (p *MySQLProvider) normalizeError(err error, fieldType int) error {
if err == nil {
return nil
}
var mysqlErr *mysql.MySQLError
if errors.As(err, &mysqlErr) {
switch mysqlErr.Number {
case 1062:
message := util.I18nErrorDuplicatedName
if fieldType == fieldUsername {
message = util.I18nErrorDuplicatedUsername
}
return util.NewI18nError(
fmt.Errorf("%w: %s", ErrDuplicatedKey, err.Error()),
message,
)
case 1452:
return fmt.Errorf("%w: %s", ErrForeignKeyViolated, err.Error())
}
}
return err
}