Database governance built for humans and agents — controlling changes and access across every major database.
Go cicddata-governancedata-maskingdata-securitydatabase-accessdatabase-governancedevopsdevsecopsflywaygitopsliquibasemongodbmysqloraclepostgresqlschema-migrationssecuritysql-clientsqlservertidb
fix(instance): harden MySQL/TiDB role sync for anonymous users (#19825)
p0nyc6bf0392c9bd
diff --git a/backend/plugin/db/mysql/role.go b/backend/plugin/db/mysql/role.goindex adfd5e909d..8b4f69b505 100644--- a/backend/plugin/db/mysql/role.go+++ b/backend/plugin/db/mysql/role.go@@ -12,7 +12,7 @@ import (storepb "github.com/bytebase/bytebase/backend/generated-go/store")-func (d *Driver) getInstanceRoles(ctx context.Context) ([]*storepb.InstanceRole, error) {+func (d *Driver) getInstanceRoles(ctx context.Context) []*storepb.InstanceRole {var instanceRoles []*storepb.InstanceRolevar users []stringvar err error@@ -22,7 +22,7 @@ func (d *Driver) getInstanceRoles(ctx context.Context) ([]*storepb.InstanceRole,users, err = d.getUsersFromUserAttributes(ctx)if err != nil {slog.Info("failed to get users", log.BBError(err))- return nil, nil+ return nil}}@@ -32,7 +32,8 @@ func (d *Driver) getInstanceRoles(ctx context.Context) ([]*storepb.InstanceRole,for _, name := range users {grantList, err := d.getGrantFromUser(ctx, name)if err != nil {- return nil, errors.Wrapf(err, "failed to get grants for %s", name)+ slog.Info("failed to get grants for user", slog.String("user", name), log.BBError(err))+ continue}attribute := strings.Join(grantList, "\n")instanceRoles = append(instanceRoles, &storepb.InstanceRole{@@ -40,7 +41,7 @@ func (d *Driver) getInstanceRoles(ctx context.Context) ([]*storepb.InstanceRole,Attribute: &attribute,})}- return instanceRoles, nil+ return instanceRoles}// getGrantFromUser reads grants for user with format "'<user>'@'<host>'".@@ -50,8 +51,7 @@ func (d *Driver) getGrantFromUser(ctx context.Context, name string) ([]string, egrantQuery,)if err != nil {- slog.Info("failed to get grants", slog.String("user", name), log.BBError(err))- return nil, nil+ return nil, errors.Wrapf(err, "failed to query grants for %s", name)}defer grantRows.Close()@@ -59,7 +59,7 @@ func (d *Driver) getGrantFromUser(ctx context.Context, name string) ([]string, efor grantRows.Next() {var grant stringif err := grantRows.Scan(&grant); err != nil {- return nil, err+ return nil, errors.Wrapf(err, "failed to scan grants for %s", name)}grants = append(grants, grant)}@@ -77,7 +77,8 @@ func (d *Driver) getUsersFromUserAttributes(ctx context.Context) ([]string, errouser,hostFROM information_schema.user_attributes- WHERE user NOT LIKE 'mysql.%'+ WHERE user <> ''+ AND user NOT LIKE 'mysql.%'`roleRows, err := d.db.QueryContext(ctx, query)if err != nil {@@ -109,7 +110,8 @@ func (d *Driver) getUsersFromMySQLUser(ctx context.Context) ([]string, error) {user,hostFROM mysql.user- WHERE user NOT LIKE 'mysql.%'+ WHERE user <> ''+ AND user NOT LIKE 'mysql.%'`roleRows, err := d.db.QueryContext(ctx, query)if err != nil {diff --git a/backend/plugin/db/mysql/sync.go b/backend/plugin/db/mysql/sync.goindex 33727d46a2..4d10fa16c7 100644--- a/backend/plugin/db/mysql/sync.go+++ b/backend/plugin/db/mysql/sync.go@@ -77,10 +77,7 @@ func (d *Driver) SyncInstance(ctx context.Context) (*db.InstanceMetadata, error)}}- instanceRoles, err := d.getInstanceRoles(ctx)- if err != nil {- return nil, err- }+ instanceRoles := d.getInstanceRoles(ctx)// Query db infowhere := fmt.Sprintf("LOWER(SCHEMA_NAME) NOT IN (%s)", systemDatabaseClause)diff --git a/backend/plugin/db/tidb/role.go b/backend/plugin/db/tidb/role.goindex 3170652f80..cfa241c2f8 100644--- a/backend/plugin/db/tidb/role.go+++ b/backend/plugin/db/tidb/role.go@@ -12,7 +12,7 @@ import (storepb "github.com/bytebase/bytebase/backend/generated-go/store")-func (d *Driver) getInstanceRoles(ctx context.Context) ([]*storepb.InstanceRole, error) {+func (d *Driver) getInstanceRoles(ctx context.Context) []*storepb.InstanceRole {var instanceRoles []*storepb.InstanceRolevar users []stringvar err error@@ -22,7 +22,7 @@ func (d *Driver) getInstanceRoles(ctx context.Context) ([]*storepb.InstanceRole,users, err = d.getUsersFromUserAttributes(ctx)if err != nil {slog.Info("failed to get users", log.BBError(err))- return nil, nil+ return nil}}@@ -32,7 +32,8 @@ func (d *Driver) getInstanceRoles(ctx context.Context) ([]*storepb.InstanceRole,for _, name := range users {grantList, err := d.getGrantFromUser(ctx, name)if err != nil {- return nil, errors.Wrapf(err, "failed to get grants for %s", name)+ slog.Info("failed to get grants for user", slog.String("user", name), log.BBError(err))+ continue}attribute := strings.Join(grantList, "\n")instanceRoles = append(instanceRoles, &storepb.InstanceRole{@@ -40,7 +41,7 @@ func (d *Driver) getInstanceRoles(ctx context.Context) ([]*storepb.InstanceRole,Attribute: &attribute,})}- return instanceRoles, nil+ return instanceRoles}// getGrantFromUser reads grants for user with format "'<user>'@'<host>'".@@ -50,8 +51,7 @@ func (d *Driver) getGrantFromUser(ctx context.Context, name string) ([]string, egrantQuery,)if err != nil {- slog.Info("failed to get grants", slog.String("user", name), log.BBError(err))- return nil, nil+ return nil, errors.Wrapf(err, "failed to query grants for %s", name)}defer grantRows.Close()@@ -59,7 +59,7 @@ func (d *Driver) getGrantFromUser(ctx context.Context, name string) ([]string, efor grantRows.Next() {var grant stringif err := grantRows.Scan(&grant); err != nil {- return nil, err+ return nil, errors.Wrapf(err, "failed to scan grants for %s", name)}grants = append(grants, grant)}@@ -77,7 +77,8 @@ func (d *Driver) getUsersFromUserAttributes(ctx context.Context) ([]string, errouser,hostFROM information_schema.user_attributes- WHERE user NOT LIKE 'mysql.%'+ WHERE user <> ''+ AND user NOT LIKE 'mysql.%'`roleRows, err := d.db.QueryContext(ctx, query)if err != nil {@@ -109,7 +110,8 @@ func (d *Driver) getUsersFromMySQLUser(ctx context.Context) ([]string, error) {user,hostFROM mysql.user- WHERE user NOT LIKE 'mysql.%'+ WHERE user <> ''+ AND user NOT LIKE 'mysql.%'`roleRows, err := d.db.QueryContext(ctx, query)if err != nil {diff --git a/backend/plugin/db/tidb/sync.go b/backend/plugin/db/tidb/sync.goindex 3549795cc6..872dacd945 100644--- a/backend/plugin/db/tidb/sync.go+++ b/backend/plugin/db/tidb/sync.go@@ -71,10 +71,7 @@ func (d *Driver) SyncInstance(ctx context.Context) (*db.InstanceMetadata, error)}}- instanceRoles, err := d.getInstanceRoles(ctx)- if err != nil {- return nil, err- }+ instanceRoles := d.getInstanceRoles(ctx)// Query db infowhere := fmt.Sprintf("LOWER(SCHEMA_NAME) NOT IN (%s)", systemDatabaseClause)