Skip to content

fix: allow IPv6 EKS Pod Identity host regardless of IMDS endpoint mode #7086

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
jtuglu1 wants to merge 1 commit into
base: master
Choose a base branch
from
+15 −5
Open

fix: allow IPv6 EKS Pod Identity host regardless of IMDS endpoint mode #7086

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
6 changes: 1 addition & 5 deletions ...h/src/main/java/software/amazon/awssdk/auth/credentials/ContainerCredentialsProvider.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -307,11 +307,7 @@ private boolean matchesAllowedHostRules(InetAddress inetAddress) {
}

public boolean isMetadataServiceEndpoint(String host) {
String mode = SdkSystemSetting.AWS_EC2_METADATA_SERVICE_ENDPOINT_MODE.getStringValueOrThrow();
if ("IPV6".equalsIgnoreCase(mode)) {
return VALID_LOOP_BACK_IPV6.contains(host);
}
return VALID_LOOP_BACK_IPV4.contains(host);
return VALID_LOOP_BACK_IPV4.contains(host) || VALID_LOOP_BACK_IPV6.contains(host);
}
}

Expand Down
14 changes: 14 additions & 0 deletions ...ava/software/amazon/awssdk/auth/credentials/ContainerCredentialsEndpointProviderTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -164,6 +164,20 @@ private static Stream<Arguments> requestConstruction() {
.headers(new HashMap<>())
.build())),

// EKS Pod Identity sets the IPv6 container URI but does NOT set
// AWS_EC2_METADATA_SERVICE_ENDPOINT_MODE (that controls IMDS, not the
// container credentials endpoint). The IPv6 host must be allowed with the
// mode left at its IPv4 default.
Arguments.of("http link-local EKS URI with IPv6, default endpoint mode",
Collections.singletonList(Pair.of(FULL_URI_ENV, EKS_CONTAINER_HOST_IPV6 + "/credentials")),
EKS_CONTAINER_HOST_IPV6 + "/credentials",
new Result().type("success").sdkRequest(
SdkHttpFullRequest.builder()
.uri(URI.create(EKS_CONTAINER_HOST_IPV6 + "/credentials"))
.method(SdkHttpMethod.GET)
.headers(new HashMap<>())
.build())),

Arguments.of("complex full URI",
Collections.singletonList(Pair.of(FULL_URI_ENV, COMPLEX_URI)),
COMPLEX_URI,
Expand Down