Skip to content

Fix NPE when using AnonymousCredentials in a credential provider chain with S3 CRT client. #6552

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

Fix NPE when using AnonymousCredentials in a credential provider chain with S3 CRT client. #6552

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: 6 additions & 0 deletions .changes/next-release/bugfix-AmazonS3-c6497dc.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,6 @@
{
"type": "bugfix",
"category": "Amazon S3",
"contributor": "",
"description": "Fix NullPointerException when using AnonymousCredentials in a CredentialsChain with the S3 CRT Client."
}
5 changes: 5 additions & 0 deletions ...n/java/software/amazon/awssdk/services/s3/internal/crt/CrtCredentialsProviderAdapter.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -48,6 +48,11 @@ public CrtCredentialsProviderAdapter(IdentityProvider<? extends AwsCredentialsId

AwsCredentialsIdentity sdkCredentials =
CompletableFutureUtils.joinLikeSync(credentialsProvider.resolveIdentity());

if (sdkCredentials.providerName().map("AnonymousCredentialsProvider"::equals).orElse(false)) {
return Credentials.createAnonymousCredentials();
}

byte[] accessKey = sdkCredentials.accessKeyId().getBytes(StandardCharsets.UTF_8);
byte[] secreteKey = sdkCredentials.secretAccessKey().getBytes(StandardCharsets.UTF_8);

Expand Down
18 changes: 18 additions & 0 deletions ...ava/software/amazon/awssdk/services/s3/internal/crt/CrtCredentialProviderAdapterTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,6 +25,7 @@
import org.mockito.Mockito;
import software.amazon.awssdk.auth.credentials.AnonymousCredentialsProvider;
import software.amazon.awssdk.auth.credentials.AwsBasicCredentials;
import software.amazon.awssdk.auth.credentials.AwsCredentialsProviderChain;
import software.amazon.awssdk.auth.credentials.AwsSessionCredentials;
import software.amazon.awssdk.auth.credentials.HttpCredentialsProvider;
import software.amazon.awssdk.auth.credentials.StaticCredentialsProvider;
Expand Down Expand Up @@ -96,4 +97,21 @@ void crtCredentials_anonymousCredentialsProvider_shouldWork() {
assertThat(crtCredentials.getAccessKeyId()).isNull();
assertThat(crtCredentials.getSecretAccessKey()).isNull();
}

@Test
void crtCredentials_anonymousCredentialsProviderFromChain_shouldWork() {
IdentityProvider<? extends AwsCredentialsIdentity> awsCredentialsProvider =
AwsCredentialsProviderChain
.builder()
.addCredentialsProvider(AnonymousCredentialsProvider.create())
.build();

CrtCredentialsProviderAdapter adapter = new CrtCredentialsProviderAdapter(awsCredentialsProvider);
CredentialsProvider crtCredentialsProvider = adapter.crtCredentials();

Credentials crtCredentials = crtCredentialsProvider.getCredentials().join();

assertThat(crtCredentials.getAccessKeyId()).isNull();
assertThat(crtCredentials.getSecretAccessKey()).isNull();
}
}
Loading