PostgreSQL backup tool with Point-In-Time-Recovery and restore verification
TypeScript backupbackupsdatabasedatabase-backupdevopsdockergolangkubernetesmariadbmongodbmysqlpgpostgrespostgresqls3self-hostedsystem-administrationtoolsweb-ui
FIX (mysql \ mariadb): Add escaping underscoped DB names over heath check
Rostislav Duginff7362728792
diff --git a/backend/internal/features/databases/databases/mariadb/model.go b/backend/internal/features/databases/databases/mariadb/model.goindex 4e7bc0e1..06bdd61c 100644--- a/backend/internal/features/databases/databases/mariadb/model.go+++ b/backend/internal/features/databases/databases/mariadb/model.go@@ -515,9 +515,13 @@ func detectPrivileges(ctx context.Context, db *sql.DB, database string) (string,hasProcess := falsehasAllPrivileges := false+ // Escape underscores to match MariaDB's grant output format+ // MariaDB escapes _ as \_ in SHOW GRANTS output+ // Pattern matches either literal _ or escaped \_+ escapedDbName := strings.ReplaceAll(regexp.QuoteMeta(database), "_", `(_|\\_)`)dbPatternStr := fmt.Sprintf(`(?i)ON\s+[\x60'"]?%s[\x60'"]?\s*\.\s*\*`,- regexp.QuoteMeta(database),+ escapedDbName,)dbPattern := regexp.MustCompile(dbPatternStr)globalPattern := regexp.MustCompile(`(?i)ON\s+\*\s*\.\s*\*`)diff --git a/backend/internal/features/databases/databases/mariadb/model_test.go b/backend/internal/features/databases/databases/mariadb/model_test.goindex ec4bd8e0..96f6bc60 100644--- a/backend/internal/features/databases/databases/mariadb/model_test.go+++ b/backend/internal/features/databases/databases/mariadb/model_test.go@@ -694,6 +694,115 @@ func Test_TestConnection_DatabaseWithUnderscores_Success(t *testing.T) {assert.NoError(t, err)}+func Test_TestConnection_DatabaseWithUnderscoresAndAllPrivileges_Success(t *testing.T) {+ env := config.GetEnv()+ cases := []struct {+ name string+ version tools.MariadbVersion+ port string+ }{+ {"MariaDB 5.5", tools.MariadbVersion55, env.TestMariadb55Port},+ {"MariaDB 10.1", tools.MariadbVersion101, env.TestMariadb101Port},+ {"MariaDB 10.2", tools.MariadbVersion102, env.TestMariadb102Port},+ {"MariaDB 10.3", tools.MariadbVersion103, env.TestMariadb103Port},+ {"MariaDB 10.4", tools.MariadbVersion104, env.TestMariadb104Port},+ {"MariaDB 10.5", tools.MariadbVersion105, env.TestMariadb105Port},+ {"MariaDB 10.6", tools.MariadbVersion106, env.TestMariadb106Port},+ {"MariaDB 10.11", tools.MariadbVersion1011, env.TestMariadb1011Port},+ {"MariaDB 11.4", tools.MariadbVersion114, env.TestMariadb114Port},+ {"MariaDB 11.8", tools.MariadbVersion118, env.TestMariadb118Port},+ {"MariaDB 12.0", tools.MariadbVersion120, env.TestMariadb120Port},+ }++ for _, tc := range cases {+ t.Run(tc.name, func(t *testing.T) {+ t.Parallel()++ container := connectToMariadbContainer(t, tc.port, tc.version)+ defer container.DB.Close()++ underscoreDbName := "test_all_db"++ _, err := container.DB.Exec(+ fmt.Sprintf("DROP DATABASE IF EXISTS `%s`", underscoreDbName),+ )+ assert.NoError(t, err)++ _, err = container.DB.Exec(fmt.Sprintf("CREATE DATABASE `%s`", underscoreDbName))+ assert.NoError(t, err)++ defer func() {+ _, _ = container.DB.Exec(+ fmt.Sprintf("DROP DATABASE IF EXISTS `%s`", underscoreDbName),+ )+ }()++ underscoreDSN := fmt.Sprintf(+ "%s:%s@tcp(%s:%d)/%s?parseTime=true",+ container.Username,+ container.Password,+ container.Host,+ container.Port,+ underscoreDbName,+ )+ underscoreDB, err := sqlx.Connect("mysql", underscoreDSN)+ assert.NoError(t, err)+ defer underscoreDB.Close()++ _, err = underscoreDB.Exec(`+ CREATE TABLE all_priv_test (+ id INT AUTO_INCREMENT PRIMARY KEY,+ data VARCHAR(255) NOT NULL+ )+ `)+ assert.NoError(t, err)++ _, err = underscoreDB.Exec(`INSERT INTO all_priv_test (data) VALUES ('test1')`)+ assert.NoError(t, err)++ allPrivUsername := fmt.Sprintf("allpriv%s", uuid.New().String()[:8])+ allPrivPassword := "allprivpass123"++ _, err = underscoreDB.Exec(fmt.Sprintf(+ "CREATE USER '%s'@'%%' IDENTIFIED BY '%s'",+ allPrivUsername,+ allPrivPassword,+ ))+ assert.NoError(t, err)++ _, err = underscoreDB.Exec(fmt.Sprintf(+ "GRANT ALL PRIVILEGES ON `%s`.* TO '%s'@'%%'",+ underscoreDbName,+ allPrivUsername,+ ))+ assert.NoError(t, err)++ _, err = underscoreDB.Exec("FLUSH PRIVILEGES")+ assert.NoError(t, err)++ defer dropUserSafe(underscoreDB, allPrivUsername)++ mariadbModel := &MariadbDatabase{+ Version: tc.version,+ Host: container.Host,+ Port: container.Port,+ Username: allPrivUsername,+ Password: allPrivPassword,+ Database: &underscoreDbName,+ IsHttps: false,+ }++ logger := slog.New(slog.NewTextHandler(os.Stdout, nil))++ err = mariadbModel.TestConnection(logger, nil, uuid.New())+ assert.NoError(t, err)+ assert.NotEmpty(t, mariadbModel.Privileges)+ assert.Contains(t, mariadbModel.Privileges, "SELECT")+ assert.Contains(t, mariadbModel.Privileges, "SHOW VIEW")+ })+ }+}+type MariadbContainer struct {Host stringPort intdiff --git a/backend/internal/features/databases/databases/mysql/model.go b/backend/internal/features/databases/databases/mysql/model.goindex d76e0b00..96c626bc 100644--- a/backend/internal/features/databases/databases/mysql/model.go+++ b/backend/internal/features/databases/databases/mysql/model.go@@ -489,9 +489,13 @@ func detectPrivileges(ctx context.Context, db *sql.DB, database string) (string,hasProcess := falsehasAllPrivileges := false+ // Escape underscores to match MySQL's grant output format+ // MySQL escapes _ as \_ in SHOW GRANTS output+ // Pattern matches either literal _ or escaped \_+ escapedDbName := strings.ReplaceAll(regexp.QuoteMeta(database), "_", `(_|\\_)`)dbPatternStr := fmt.Sprintf(`(?i)ON\s+[\x60'"]?%s[\x60'"]?\s*\.\s*\*`,- regexp.QuoteMeta(database),+ escapedDbName,)dbPattern := regexp.MustCompile(dbPatternStr)globalPattern := regexp.MustCompile(`(?i)ON\s+\*\s*\.\s*\*`)diff --git a/backend/internal/features/databases/databases/mysql/model_test.go b/backend/internal/features/databases/databases/mysql/model_test.goindex b5d62d46..5eca837f 100644--- a/backend/internal/features/databases/databases/mysql/model_test.go+++ b/backend/internal/features/databases/databases/mysql/model_test.go@@ -674,6 +674,112 @@ func Test_TestConnection_DatabaseWithUnderscores_Success(t *testing.T) {assert.NoError(t, err)}+func Test_TestConnection_DatabaseWithUnderscoresAndAllPrivileges_Success(t *testing.T) {+ env := config.GetEnv()+ cases := []struct {+ name string+ version tools.MysqlVersion+ port string+ }{+ {"MySQL 5.7", tools.MysqlVersion57, env.TestMysql57Port},+ {"MySQL 8.0", tools.MysqlVersion80, env.TestMysql80Port},+ {"MySQL 8.4", tools.MysqlVersion84, env.TestMysql84Port},+ {"MySQL 9", tools.MysqlVersion9, env.TestMysql90Port},+ }++ for _, tc := range cases {+ t.Run(tc.name, func(t *testing.T) {+ t.Parallel()++ container := connectToMysqlContainer(t, tc.port, tc.version)+ defer container.DB.Close()++ underscoreDbName := "test_all_db"++ _, err := container.DB.Exec(+ fmt.Sprintf("DROP DATABASE IF EXISTS `%s`", underscoreDbName),+ )+ assert.NoError(t, err)++ _, err = container.DB.Exec(fmt.Sprintf("CREATE DATABASE `%s`", underscoreDbName))+ assert.NoError(t, err)++ defer func() {+ _, _ = container.DB.Exec(+ fmt.Sprintf("DROP DATABASE IF EXISTS `%s`", underscoreDbName),+ )+ }()++ underscoreDSN := fmt.Sprintf(+ "%s:%s@tcp(%s:%d)/%s?parseTime=true",+ container.Username,+ container.Password,+ container.Host,+ container.Port,+ underscoreDbName,+ )+ underscoreDB, err := sqlx.Connect("mysql", underscoreDSN)+ assert.NoError(t, err)+ defer underscoreDB.Close()++ _, err = underscoreDB.Exec(`+ CREATE TABLE all_priv_test (+ id INT AUTO_INCREMENT PRIMARY KEY,+ data VARCHAR(255) NOT NULL+ )+ `)+ assert.NoError(t, err)++ _, err = underscoreDB.Exec(`INSERT INTO all_priv_test (data) VALUES ('test1')`)+ assert.NoError(t, err)++ allPrivUsername := fmt.Sprintf("allpriv_%s", uuid.New().String()[:8])+ allPrivPassword := "allprivpass123"++ _, err = underscoreDB.Exec(fmt.Sprintf(+ "CREATE USER '%s'@'%%' IDENTIFIED BY '%s'",+ allPrivUsername,+ allPrivPassword,+ ))+ assert.NoError(t, err)++ _, err = underscoreDB.Exec(fmt.Sprintf(+ "GRANT ALL PRIVILEGES ON `%s`.* TO '%s'@'%%'",+ underscoreDbName,+ allPrivUsername,+ ))+ assert.NoError(t, err)++ _, err = underscoreDB.Exec("FLUSH PRIVILEGES")+ assert.NoError(t, err)++ defer func() {+ _, _ = container.DB.Exec(+ fmt.Sprintf("DROP USER IF EXISTS '%s'@'%%'", allPrivUsername),+ )+ }()++ mysqlModel := &MysqlDatabase{+ Version: tc.version,+ Host: container.Host,+ Port: container.Port,+ Username: allPrivUsername,+ Password: allPrivPassword,+ Database: &underscoreDbName,+ IsHttps: false,+ }++ logger := slog.New(slog.NewTextHandler(os.Stdout, nil))++ err = mysqlModel.TestConnection(logger, nil, uuid.New())+ assert.NoError(t, err)+ assert.NotEmpty(t, mysqlModel.Privileges)+ assert.Contains(t, mysqlModel.Privileges, "SELECT")+ assert.Contains(t, mysqlModel.Privileges, "SHOW VIEW")+ })+ }+}+type MysqlContainer struct {Host stringPort int