Skip to content

Fixed logging of sensitive information and potential SQL injections #226

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

Merged
merged 1 commit into from
Apr 29, 2025
Merged

Fixed logging of sensitive information and potential SQL injections #226

Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
75 changes: 35 additions & 40 deletions mysql/resource_user.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -160,38 +160,35 @@
authStm = " IDENTIFIED WITH " + auth
}
}

var hashed string
if v, ok := d.GetOk("auth_string_hashed"); ok {
hashed := v.(string)
hashed = v.(string)
if hashed != "" {
if authStm == "" {
return diag.Errorf("auth_string_hashed is not supported for auth plugin %s", auth)
}
authStm = fmt.Sprintf("%s AS '%s'", authStm, hashed)
authStm = fmt.Sprintf("%s AS ?", authStm)
}
}

var stmtSQL string
var args []interface{}

if createObj == "AADUSER" {
var aadIdentity = d.Get("aad_identity").(*schema.Set).List()[0].(map[string]interface{})

if aadIdentity["type"].(string) == "service_principal" {
// CREATE AADUSER 'mysqlProtocolLoginName"@"mysqlHostRestriction' IDENTIFIED BY 'identityId'
stmtSQL = fmt.Sprintf("CREATE AADUSER '%s'@'%s' IDENTIFIED BY '%s'",
d.Get("user").(string),
d.Get("host").(string),
aadIdentity["identity"].(string))
stmtSQL = "CREATE AADUSER ?@? IDENTIFIED BY ?"
args = []interface{}{d.Get("user").(string), d.Get("host").(string), aadIdentity["identity"].(string)}
} else {
// CREATE AADUSER 'identityName"@"mysqlHostRestriction' AS 'mysqlProtocolLoginName'
stmtSQL = fmt.Sprintf("CREATE AADUSER '%s'@'%s' AS '%s'",
aadIdentity["identity"].(string),
d.Get("host").(string),
d.Get("user").(string))
stmtSQL = "CREATE AADUSER ?@? AS ?"
args = []interface{}{aadIdentity["identity"].(string), d.Get("host").(string), d.Get("user").(string)}
}
} else {
stmtSQL = fmt.Sprintf("CREATE USER '%s'@'%s'",
d.Get("user").(string),
d.Get("host").(string))
stmtSQL = "CREATE USER ?@?"
args = []interface{}{d.Get("user").(string), d.Get("host").(string)}
}

var password string
Expand All @@ -206,47 +203,45 @@
}

if authStm != "" {
stmtSQL = stmtSQL + authStm
stmtSQL += authStm
if hashed != "" {
args = append(args, hashed)
}
if password != "" {
stmtSQL = stmtSQL + fmt.Sprintf(" BY '%s'", password)
stmtSQL += " BY ?"
args = append(args, password)
}
} else if password != "" {
stmtSQL = stmtSQL + fmt.Sprintf(" IDENTIFIED BY '%s'", password)
stmtSQL += " IDENTIFIED BY ?"
args = append(args, password)
}

requiredVersion, _ := version.NewVersion("5.7.0")

var updateStmtSql = ""
var updateStmtSql string
var updateArgs []interface{}

if getVersionFromMeta(ctx, meta).GreaterThan(requiredVersion) && d.Get("tls_option").(string) != "" {
if createObj == "AADUSER" {
updateStmtSql = fmt.Sprintf("ALTER USER '%s'@'%s' REQUIRE %s",
d.Get("user").(string),
d.Get("host").(string),
d.Get("tls_option").(string))
updateStmtSql = "ALTER USER ?@? REQUIRE " + d.Get("tls_option").(string)
updateArgs = []interface{}{d.Get("user").(string), d.Get("host").(string)}
} else {
stmtSQL += fmt.Sprintf(" REQUIRE %s", d.Get("tls_option").(string))
stmtSQL += " REQUIRE " + d.Get("tls_option").(string)
}
}

retainPassword := d.Get("retain_old_password").(bool)
if retainPassword {
err := checkRetainCurrentPasswordSupport(ctx, meta)
if err != nil {
return diag.Errorf("cannot use retain_current_password: %v", err)
// Redact sensitive values in args for logging
redactedArgs := make([]interface{}, len(args))
for i, arg := range args {
if (password != "" && arg == password) || (hashed != "" && arg == hashed) {
redactedArgs[i] = "<SENSITIVE>"
} else {
redactedArgs[i] = arg
}
}

discardOldPassword := d.Get("discard_old_password").(bool)
if discardOldPassword {
err := checkDiscardOldPasswordSupport(ctx, meta)
if err != nil {
return diag.Errorf("cannot use discard_old_password: %v", err)
}
}
log.Println("[DEBUG] Executing statement:", stmtSQL, "args:", redactedArgs)

log.Println("[DEBUG] Executing statement:", stmtSQL)
_, err = db.ExecContext(ctx, stmtSQL)
_, err = db.ExecContext(ctx, stmtSQL, args...)
if err != nil {
return diag.Errorf("failed executing SQL: %v", err)
}
Expand All @@ -255,8 +250,8 @@
d.SetId(user)

if updateStmtSql != "" {
log.Println("[DEBUG] Executing statement:", updateStmtSql)
_, err = db.ExecContext(ctx, updateStmtSql)
log.Println("[DEBUG] Executing statement:", updateStmtSql, "args:", updateArgs)
_, err = db.ExecContext(ctx, updateStmtSql, updateArgs...)
if err != nil {
d.Set("tls_option", "")
return diag.Errorf("failed executing SQL: %v", err)
Expand Down
Loading