Skip to content

fix(logs/secrets): check for disallowed/non-existent secrets #274

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
ecrupper merged 2 commits into from
Feb 21, 2022
Merged

fix(logs/secrets): check for disallowed/non-existent secrets #274

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
5848867
fixing secret mask bug
ecrupper Feb 18, 2022
f4b5e94
missed small thing
ecrupper Feb 18, 2022
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
12 changes: 6 additions & 6 deletions executor/linux/step.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -464,15 +464,15 @@ func getSecretValues(ctn *pipeline.Container) []string {
secretValues := []string{}
// gather secrets' values from the environment map for masking
for _, secret := range ctn.Secrets {
s := ctn.Environment[strings.ToUpper(secret.Target)]
// capture secret from environment
s, ok := ctn.Environment[strings.ToUpper(secret.Target)]
if !ok {
continue
}
// handle multi line secrets from files
s = strings.ReplaceAll(s, "\n", " ")

// drop any trailing spaces
if strings.HasSuffix(s, " ") {
s = s[:(len(s) - 1)]
}
secretValues = append(secretValues, s)
secretValues = append(secretValues, strings.TrimSuffix(s, " "))
}
return secretValues
}
4 changes: 4 additions & 0 deletions executor/linux/step_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -570,6 +570,10 @@ func TestLinux_getSecretValues(t *testing.T) {
Source: "someOtherSource",
Target: "secret_password",
},
{
Source: "disallowedSecret",
Target: "cannot_find",
},
},
},
},
Expand Down