mirror of
https://github.com/BaaRai/ARTEX.git
synced 2026-11-22 16:10:53 +08:00
fix(server): scrub the container authorization token file path too
The SDK reads AWS_CONTAINER_AUTHORIZATION_TOKEN_FILE while LoadDefaultConfig builds the archive store and captures the path; the file itself is read lazily. Adding the name to secretEnv keeps that path out of agent child processes, the same way AWS_WEB_IDENTITY_TOKEN_FILE is already scrubbed, and does not affect the client.
This commit is contained in:
@@ -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"} {
|
||||
|
||||
+1
-1
@@ -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",
|
||||
}
|
||||
|
||||
|
||||
@@ -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",
|
||||
}
|
||||
|
||||
@@ -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.
|
||||
|
||||
Reference in New Issue
Block a user