Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Fix/Grant update failed: not allowed to create a user with grant #129

Open
wants to merge 4 commits into
base: master
Choose a base branch
from
Open

Fix/Grant update failed: not allowed to create a user with grant #129

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
49a9dde
Fix username variable reassignment bug in grant controller
alereca Feb 8, 2023
f336e56
Use the same variable convention in the rest of grant controller code
alereca Feb 8, 2023
987aeee
Use the same variable convention (user instead of username) in the re…
alereca Feb 8, 2023
3d7fdb9
Merge branch 'master' into fix/not-allowed-to-create-a-user-with-grant
alereca Aug 29, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion build
Open in desktop
Submodule build updated 9 files
+0 −11 CODEOWNERS
+1 −1 makelib/common.mk
+4 −8 makelib/controlplane.mk
+2 −9 makelib/docs.mk
+1 −1 makelib/golang.mk
+0 −34 makelib/helm.mk
+1 −3 makelib/k8s_tools.mk
+1 −1 makelib/local.xpkg.mk
+0 −8 makelib/xpkg.mk
45 changes: 25 additions & 20 deletions pkg/controller/mysql/grant/reconciler.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -137,11 +137,11 @@ func (c *external) Observe(ctx context.Context, mg resource.Managed) (managed.Ex
return managed.ExternalObservation{}, errors.New(errNotGrant)
}

username := *cr.Spec.ForProvider.User
user := *cr.Spec.ForProvider.User
dbname := defaultIdentifier(cr.Spec.ForProvider.Database)
table := defaultIdentifier(cr.Spec.ForProvider.Table)

observedPrivileges, result, err := c.getPrivileges(ctx, username, dbname, table)
observedPrivileges, result, err := c.getPrivileges(ctx, user, dbname, table)
if err != nil {
return managed.ExternalObservation{}, err
}
Expand Down Expand Up @@ -254,15 +254,15 @@ func (c *external) Create(ctx context.Context, mg resource.Managed) (managed.Ext
return managed.ExternalCreation{}, errors.New(errNotGrant)
}

username := *cr.Spec.ForProvider.User
user := *cr.Spec.ForProvider.User
dbname := defaultIdentifier(cr.Spec.ForProvider.Database)
table := defaultIdentifier(cr.Spec.ForProvider.Table)

privileges := strings.Join(cr.Spec.ForProvider.Privileges.ToStringSlice(), ", ")
privileges := cr.Spec.ForProvider.Privileges.ToStringSlice()
grantOption := hasGrantOption(cr)
binlog := cr.Spec.ForProvider.BinLog
query := createGrantQuery(privileges, dbname, username, table, grantOption)

query := createGrantQuery(privileges, dbname, user, table, grantOption)
if err := mysql.ExecWithBinlogAndFlush(ctx, c.db, mysql.ExecQuery{Query: query, ErrorValue: errCreateGrant}, mysql.ExecOptions{Binlog: binlog}); err != nil {
return managed.ExternalCreation{}, err
}
Expand All @@ -275,11 +275,10 @@ func (c *external) Update(ctx context.Context, mg resource.Managed) (managed.Ext
return managed.ExternalUpdate{}, errors.New(errNotGrant)
}

username := *cr.Spec.ForProvider.User
user := *cr.Spec.ForProvider.User
dbname := defaultIdentifier(cr.Spec.ForProvider.Database)
table := defaultIdentifier(cr.Spec.ForProvider.Table)

username, host := mysql.SplitUserHost(username)
binlog := cr.Spec.ForProvider.BinLog

observed := cr.Status.AtProvider.Privileges
Expand All @@ -289,14 +288,7 @@ func (c *external) Update(ctx context.Context, mg resource.Managed) (managed.Ext

if len(toRevoke) > 0 {
sort.Strings(toRevoke)
query := fmt.Sprintf("REVOKE %s ON %s.%s FROM %s@%s",
strings.Join(toRevoke, ", "),
dbname,
table,
mysql.QuoteValue(username),
mysql.QuoteValue(host),
)

query := createRevokeQuery(toRevoke, dbname, user, table)
if err := mysql.ExecWithBinlogAndFlush(ctx, c.db,
mysql.ExecQuery{
Query: query, ErrorValue: errRevokeGrant,
Expand All @@ -308,7 +300,7 @@ func (c *external) Update(ctx context.Context, mg resource.Managed) (managed.Ext

if len(toGrant) > 0 {
sort.Strings(toGrant)
query := createGrantQuery(strings.Join(toGrant, ", "), dbname, username, table, grantOption)
query := createGrantQuery(toGrant, dbname, user, table, grantOption)
if err := mysql.ExecWithBinlogAndFlush(ctx, c.db,
mysql.ExecQuery{
Query: query, ErrorValue: errCreateGrant,
Expand All @@ -330,10 +322,10 @@ func hasGrantOption(cr *v1alpha1.Grant) bool {
return false
}

func createGrantQuery(privileges, dbname, username string, table string, grantOption bool) string {
func createGrantQuery(toGrant []string, dbname, username string, table string, grantOption bool) string {
username, host := mysql.SplitUserHost(username)
result := fmt.Sprintf("GRANT %s ON %s.%s TO %s@%s",
privileges,
strings.Join(toGrant, ", "),
dbname,
table,
mysql.QuoteValue(username),
Expand All @@ -347,18 +339,31 @@ func createGrantQuery(privileges, dbname, username string, table string, grantOp
return result
}

func createRevokeQuery(toRevoke []string, dbname, username string, table string) string {
username, host := mysql.SplitUserHost(username)
query := fmt.Sprintf("REVOKE %s ON %s.%s FROM %s@%s",
strings.Join(toRevoke, ", "),
dbname,
table,
mysql.QuoteValue(username),
mysql.QuoteValue(host),
)

return query
}

func (c *external) Delete(ctx context.Context, mg resource.Managed) error {
cr, ok := mg.(*v1alpha1.Grant)
if !ok {
return errors.New(errNotGrant)
}

username := *cr.Spec.ForProvider.User
user := *cr.Spec.ForProvider.User
dbname := defaultIdentifier(cr.Spec.ForProvider.Database)
table := defaultIdentifier(cr.Spec.ForProvider.Table)

privileges := strings.Join(cr.Spec.ForProvider.Privileges.ToStringSlice(), ", ")
username, host := mysql.SplitUserHost(username)
username, host := mysql.SplitUserHost(user)
binlog := cr.Spec.ForProvider.BinLog

query := fmt.Sprintf("REVOKE %s ON %s.%s FROM %s@%s",
Expand Down
Loading