big-data/hadoop
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

HADOOP-16568. S3A FullCredentialsTokenBinding fails if local credentials are unset. (#1441)

Browse Source 
Contributed by Steve Loughran.

Move the loading to deployUnbonded (where they are required) and add a safety check when a new DT is requested
This commit is contained in:
Steve Loughran 2020-06-03 17:07:00 +01:00 committed by GitHub
parent 97c98ce531
commit 40d63e02f0
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 5 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
hadoop-tools/hadoop-aws/src/main/java/org/apache/hadoop/fs/s3a/auth/delegation/FullCredentialsTokenBinding.java
View File

@ -22,6 +22,8 @@
import java.net.URI; import java.net.URI;
import java.util.Optional; import java.util.Optional;
import com.google.common.base.Preconditions;
import org.apache.hadoop.conf.Configuration; import org.apache.hadoop.conf.Configuration;
import org.apache.hadoop.fs.s3a.AWSCredentialProviderList; import org.apache.hadoop.fs.s3a.AWSCredentialProviderList;
import org.apache.hadoop.fs.s3a.S3AUtils; import org.apache.hadoop.fs.s3a.S3AUtils;
@ -73,7 +75,6 @@ public FullCredentialsTokenBinding() {
@Override @Override
protected void serviceStart() throws Exception { protected void serviceStart() throws Exception {
super.serviceStart(); super.serviceStart();
loadAWSCredentials();
} }
/** /**
@ -116,6 +117,7 @@ private void loadAWSCredentials() throws IOException {
@Override @Override
public AWSCredentialProviderList deployUnbonded() throws IOException { public AWSCredentialProviderList deployUnbonded() throws IOException {
requireServiceStarted(); requireServiceStarted();
loadAWSCredentials();
return new AWSCredentialProviderList( return new AWSCredentialProviderList(
"Full Credentials Token Binding", "Full Credentials Token Binding",
new MarshalledCredentialProvider( new MarshalledCredentialProvider(
@ -142,7 +144,8 @@ public AbstractS3ATokenIdentifier createTokenIdentifier(
final EncryptionSecrets encryptionSecrets, final EncryptionSecrets encryptionSecrets,
final Text renewer) throws IOException { final Text renewer) throws IOException {
requireServiceStarted(); requireServiceStarted();
Preconditions.checkNotNull(
awsCredentials, "No AWS credentials to use for a delegation token");
return new FullCredentialsTokenIdentifier(getCanonicalUri(), return new FullCredentialsTokenIdentifier(getCanonicalUri(),
getOwnerText(), getOwnerText(),
renewer, renewer,