Skip to content

fix(verify): omit secret environment variables #16

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
auscaster wants to merge 1 commit into
base: main
Choose a base branch
from
Open

fix(verify): omit secret environment variables #16

Show file tree
Hide file tree
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
4 changes: 1 addition & 3 deletions internal/adapters/cli/verify/verify.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -313,8 +313,6 @@ func isolatedAcceptanceEnv(overrides []string) ([]string, func(), error) {
cleanup := func() { _ = os.RemoveAll(home) }
values := map[string]string{
"CI": firstNonEmpty(os.Getenv("CI"), "true"),
"GITHUB_TOKEN": "",
"GH_TOKEN": "",
"HOME": home,
"PATH": os.Getenv("PATH"),
"SCAFLD_VERIFY": "1",
Expand All @@ -328,7 +326,7 @@ func isolatedAcceptanceEnv(overrides []string) ([]string, func(), error) {
}
}
for _, key := range acceptanceSecretEnvKeys {
values[key] = ""
delete(values, key)
}
keys := make([]string, 0, len(values))
for key := range values {
Expand Down
26 changes: 26 additions & 0 deletions internal/adapters/cli/verify/verify_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,7 @@ import (
"encoding/base64"
"encoding/json"
"fmt"
"slices"
"strings"
"testing"
"time"
Expand All @@ -33,6 +34,31 @@ func TestParseTarget(t *testing.T) {
}
}

func TestIsolatedAcceptanceEnvOmitsCredentialVariables(t *testing.T) {
t.Parallel()
env, cleanup, err := isolatedAcceptanceEnv([]string{
"GITHUB_TOKEN=config-secret",
"GH_TOKEN=config-secret",
"ACTIONS_RUNTIME_TOKEN=config-secret",
"SCAFLD_TEST_MARKER=present",
})
if err != nil {
t.Fatal(err)
}
defer cleanup()
for _, item := range env {
key, _, _ := strings.Cut(item, "=")
for _, secret := range acceptanceSecretEnvKeys {
if key == secret {
t.Fatalf("secret variable %s is present in acceptance environment", key)
}
}
}
if !slices.Contains(env, "SCAFLD_TEST_MARKER=present") {
t.Fatal("non-secret configured environment variable was lost")
}
}

func TestSnapshotForVerifyPreservesDigestsAndFinalizeExclusionParity(t *testing.T) {
t.Parallel()

Expand Down
Loading