1Panel-dev/1Panel
1
1
Fork 0
mirror of https://github.com/1Panel-dev/1Panel.git synced 2024-09-20 23:55:58 +08:00
Code Issues Actions Packages Projects Releases Wiki Activity

fix: 修复创建数据库时误删数据库用户的bug (#1358)

Browse source 
Co-authored-by: 凹凸曼 <xx@xx>
This commit is contained in:
凹凸曼 2023-06-13 10:29:47 +08:00 committed by GitHub
parent 03c8e4d3cb
commit 0bb31f6caf
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
1 changed files with 9 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

15
backend/app/service/database_mysql.go
View file

@ -484,10 +484,11 @@ func (u *MysqlService) createUser(container, password, version string, req dto.M
for _, user := range userlist {
if err := excSQL(container, password, fmt.Sprintf("create user %s identified by '%s';", user, req.Password)); err != nil {
handleCreateError(container, password, req.Name, userlist)
if strings.Contains(err.Error(), "ERROR 1396") {
handleCreateError(container, password, req.Name, userlist, false)
return buserr.New(constant.ErrUserIsExist)
}
handleCreateError(container, password, req.Name, userlist, true)
return err
}
grantStr := fmt.Sprintf("grant all privileges on `%s`.* to %s", req.Name, user)
@ -498,17 +499,19 @@ func (u *MysqlService) createUser(container, password, version string, req dto.M
grantStr = fmt.Sprintf("%s identified by '%s' with grant option;", grantStr, req.Password)
}
if err := excSQL(container, password, grantStr); err != nil {
handleCreateError(container, password, req.Name, userlist)
handleCreateError(container, password, req.Name, userlist, true)
return err
}
}
return nil
}
func handleCreateError(contaienr, password, dbName string, userlist []string) {
func handleCreateError(contaienr, password, dbName string, userlist []string, dropUser bool) {
_ = excSQL(contaienr, password, fmt.Sprintf("drop database `%s`", dbName))
for _, user := range userlist {
if err := excSQL(contaienr, password, fmt.Sprintf("drop user if exists %s", user)); err != nil {
global.LOG.Errorf("drop user failed, err: %v", err)
if dropUser {
for _, user := range userlist {
if err := excSQL(contaienr, password, fmt.Sprintf("drop user if exists %s", user)); err != nil {
global.LOG.Errorf("drop user failed, err: %v", err)
}
}
}
}