Skip to content

fix: ignore masked smtp pass in auth config #157

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
Sep 17, 2024
Merged

fix: ignore masked smtp pass in auth config #157

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
10 changes: 10 additions & 0 deletions internal/provider/settings_resource.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -312,6 +312,14 @@ func readAuthConfig(ctx context.Context, state *SettingsResourceModel, client *a
msg := fmt.Sprintf("Unable to read auth settings, got status %d: %s", httpResp.StatusCode(), httpResp.Body)
return diag.Diagnostics{diag.NewErrorDiagnostic("Client Error", msg)}
}
// API treats sensitive fields as write-only
var body api.AuthConfigResponse
if !state.Auth.IsNull() {
if diags := state.Auth.Unmarshal(&body); diags.HasError() {
return diags
}
}
httpResp.JSON200.SmtpPass = body.SmtpPass
if state.Auth, err = parseConfig(state.Auth, *httpResp.JSON200); err != nil {
msg := fmt.Sprintf("Unable to read auth settings, got error: %s", err)
return diag.Diagnostics{diag.NewErrorDiagnostic("Client Error", msg)}
Expand All @@ -334,6 +342,8 @@ func updateAuthConfig(ctx context.Context, plan *SettingsResourceModel, client *
msg := fmt.Sprintf("Unable to update auth settings, got status %d: %s", httpResp.StatusCode(), httpResp.Body)
return diag.Diagnostics{diag.NewErrorDiagnostic("Client Error", msg)}
}
// Copy over sensitive fields from TF plan
httpResp.JSON200.SmtpPass = body.SmtpPass

if plan.Auth, err = parseConfig(plan.Auth, *httpResp.JSON200); err != nil {
msg := fmt.Sprintf("Unable to update auth settings, got error: %s", err)
Expand Down
Loading