diff --git a/archivestore/credentials_test.go b/archivestore/credentials_test.go index c549f9d..e84956b 100644 --- a/archivestore/credentials_test.go +++ b/archivestore/credentials_test.go @@ -140,7 +140,7 @@ func TestArchiveIncompleteCredentialOverride(t *testing.T) { func TestReview318CredentialsSurviveEnvScrub(t *testing.T) { scrubbed := []string{ "AWS_ACCESS_KEY_ID", "AWS_ACCESS_KEY", "AWS_SECRET_ACCESS_KEY", "AWS_SECRET_KEY", "AWS_SESSION_TOKEN", - "AWS_CONTAINER_CREDENTIALS_FULL_URI", "AWS_CONTAINER_CREDENTIALS_RELATIVE_URI", "AWS_CONTAINER_AUTHORIZATION_TOKEN", + "AWS_CONTAINER_CREDENTIALS_FULL_URI", "AWS_CONTAINER_CREDENTIALS_RELATIVE_URI", "AWS_CONTAINER_AUTHORIZATION_TOKEN", "AWS_CONTAINER_AUTHORIZATION_TOKEN_FILE", "AWS_WEB_IDENTITY_TOKEN_FILE", "AWS_ROLE_ARN", } for _, mode := range []string{"environment", "environment-alternate-names", "container", "web-identity"} { diff --git a/server/env_scrub.go b/server/env_scrub.go index 188bd2a..63a548e 100644 --- a/server/env_scrub.go +++ b/server/env_scrub.go @@ -20,7 +20,7 @@ var secretEnv = []string{ "ARTEX_LLM_PROXY", "ARTEX_LLM_BASE_URL", "ARTEX_ARCHIVE_S3_ACCESS_KEY_ID", "ARTEX_ARCHIVE_S3_SECRET_ACCESS_KEY", "ARTEX_ARCHIVE_S3_SESSION_TOKEN", "AWS_ACCESS_KEY_ID", "AWS_ACCESS_KEY", "AWS_SECRET_ACCESS_KEY", "AWS_SECRET_KEY", "AWS_SESSION_TOKEN", - "AWS_CONTAINER_CREDENTIALS_FULL_URI", "AWS_CONTAINER_CREDENTIALS_RELATIVE_URI", "AWS_CONTAINER_AUTHORIZATION_TOKEN", + "AWS_CONTAINER_CREDENTIALS_FULL_URI", "AWS_CONTAINER_CREDENTIALS_RELATIVE_URI", "AWS_CONTAINER_AUTHORIZATION_TOKEN", "AWS_CONTAINER_AUTHORIZATION_TOKEN_FILE", "AWS_WEB_IDENTITY_TOKEN_FILE", "AWS_ROLE_ARN", } diff --git a/server/envseal_linux_test.go b/server/envseal_linux_test.go index 65f9faf..3a50e09 100644 --- a/server/envseal_linux_test.go +++ b/server/envseal_linux_test.go @@ -69,6 +69,7 @@ func TestSealedEnvironmentHandoff(t *testing.T) { "AWS_CONTAINER_CREDENTIALS_FULL_URI": "http://127.0.0.1:8080/credentials?id=1", "AWS_CONTAINER_CREDENTIALS_RELATIVE_URI": "/v2/credentials/test", "AWS_CONTAINER_AUTHORIZATION_TOKEN": "container-token-test", + "AWS_CONTAINER_AUTHORIZATION_TOKEN_FILE": "/var/run/secrets/token-file", "AWS_WEB_IDENTITY_TOKEN_FILE": "/var/run/secrets/token", "AWS_ROLE_ARN": "arn:aws:iam::123456789012:role/test", } diff --git a/server/task_archive_startup_test.go b/server/task_archive_startup_test.go index faccb2b..def27d0 100644 --- a/server/task_archive_startup_test.go +++ b/server/task_archive_startup_test.go @@ -91,7 +91,7 @@ func TestReview318AmbientAWSCredentialsScrubbedAfterArchiveInit(t *testing.T) { } awsNames := []string{ "AWS_ACCESS_KEY_ID", "AWS_ACCESS_KEY", "AWS_SECRET_ACCESS_KEY", "AWS_SECRET_KEY", "AWS_SESSION_TOKEN", - "AWS_CONTAINER_CREDENTIALS_FULL_URI", "AWS_CONTAINER_CREDENTIALS_RELATIVE_URI", "AWS_CONTAINER_AUTHORIZATION_TOKEN", + "AWS_CONTAINER_CREDENTIALS_FULL_URI", "AWS_CONTAINER_CREDENTIALS_RELATIVE_URI", "AWS_CONTAINER_AUTHORIZATION_TOKEN", "AWS_CONTAINER_AUTHORIZATION_TOKEN_FILE", "AWS_WEB_IDENTITY_TOKEN_FILE", "AWS_ROLE_ARN", } // New scrubs all startup secrets; t.Setenv restores them for the tests that follow.