Skip to content

Fix sensitive TF path injection when list wildcards ([*]) are present #590

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

Open
marinamihaela711 wants to merge 2 commits into
base: main
Choose a base branch
from
+39 −2
Open

Fix sensitive TF path injection when list wildcards ([*]) are present #590

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
7b20966
replace wildcard with real index tfpath
Jan 20, 2026
4c78811
remove debug log
Jan 20, 2026
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
41 changes: 39 additions & 2 deletions pkg/resource/sensitive.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -238,9 +238,13 @@ func storeSensitiveData(ctx context.Context, client SecretClient, tfPath, jsonPa
if resource.IgnoreNotFound(err) != nil {
return errors.Wrapf(err, errFmtCannotGetSecretValue, ref)
}

expandedTFPath, _ := expandWildcardTFPath(tfPath, expandedJSONPath)

for key, value := range data {
if err = pavedTF.SetValue(fmt.Sprintf("%s.%s", tfPath, key), string(value)); err != nil {
return errors.Wrapf(err, "cannot set string as terraform attribute for fieldpath %q", fmt.Sprintf("%s.%s", tfPath, key))
fp := fmt.Sprintf("%s.%s", expandedTFPath, key)
if err = pavedTF.SetValue(fp, string(value)); err != nil {
return errors.Wrapf(err, "cannot set string as terraform attribute for fieldpath %q", fp)
}
}
continue
Expand Down Expand Up @@ -298,6 +302,39 @@ func storeSensitiveData(ctx context.Context, client SecretClient, tfPath, jsonPa
return nil
}

// expandWildcardTFPath replaces segments like "options[*]" with the concrete index
// found in expandedJSONPath (e.g. "...options[0]....").
// Example:
// tfPath: "options[*].configuration"
// expandedJSONPath: "spec.forProvider.options[0].configurationSecretRef"
// => "options[0].configuration"
func expandWildcardTFPath(tfPath, expandedJSONPath string) (string, error) {
segs := strings.Split(tfPath, ".")
// match "options[*]"
reWildcard := regexp.MustCompile(`^([A-Za-z0-9_-]+)\[\*\]$`)
// match "options[0]" in expandedJSONPath
// we build this per-field: fmt.Sprintf(`\b%s\[(\d+)\]`, field)
out := make([]string, 0, len(segs))

for _, s := range segs {
m := reWildcard.FindStringSubmatch(s)
if len(m) == 0 {
out = append(out, s)
continue
}
field := m[1]
reIndex := regexp.MustCompile(fmt.Sprintf(`\b%v\[(\d+)\]`, regexp.QuoteMeta(field)))
mi := reIndex.FindStringSubmatch(expandedJSONPath)
if len(mi) < 2 {
// if we cannot find an index, keep as-is (fallback)
out = append(out, s)
continue
}
out = append(out, fmt.Sprintf("%s[%s]", field, mi[1]))
}
return strings.Join(out, "."), nil
}

// GetSensitiveObservation will return sensitive information as terraform state
// attributes by reading them from connection details.
func GetSensitiveObservation(ctx context.Context, client SecretClient, from *v1.SecretReference, into map[string]any) error {
Expand Down