Spring/spring-vault
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Move AWS IAM authentication into nested class.

Browse Source 
Having the AWS IAM authentication code inside the method body creating AwsIamAuthentication causes class loading of the AwsCredentialsProvider class although the return type is ClientAuthentication.

With the code moved to an inner class, we mitigate that issue without actually knowing why the JVM attempts to load AwsIamAuthentication even the method isn't used.

Closes gh-786
This commit is contained in:
Mark Paluch
2023-04-20 18:02:05 +02:00
parent 33c1492548
commit 053a67fbed
1 changed files with 15 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

21
spring-vault-core/src/main/java/org/springframework/vault/config/EnvironmentVaultConfiguration.java
View File

@@ -39,7 +39,6 @@ import org.springframework.vault.authentication.AppRoleAuthenticationOptions.App
import org.springframework.vault.authentication.AppRoleAuthenticationOptions.RoleId;
import org.springframework.vault.authentication.AppRoleAuthenticationOptions.SecretId;
import org.springframework.vault.authentication.AwsEc2AuthenticationOptions.AwsEc2AuthenticationOptionsBuilder;
import org.springframework.vault.authentication.AwsIamAuthenticationOptions.AwsIamAuthenticationOptionsBuilder;
import org.springframework.vault.authentication.AzureMsiAuthenticationOptions.AzureMsiAuthenticationOptionsBuilder;
import org.springframework.vault.authentication.CubbyholeAuthenticationOptions.CubbyholeAuthenticationOptionsBuilder;
import org.springframework.vault.authentication.KubernetesAuthenticationOptions.KubernetesAuthenticationOptionsBuilder;
@@ -389,11 +388,7 @@ public class EnvironmentVaultConfiguration extends AbstractVaultConfiguration im
Assert.isTrue(StringUtils.hasText(role),
"Vault AWS-IAM authentication: Role (vault.aws-iam.role) must not be empty");
AwsIamAuthenticationOptionsBuilder builder = AwsIamAuthenticationOptions.builder()
.role(role)
.credentialsProvider(DefaultCredentialsProvider.create());
return new AwsIamAuthentication(builder.build(), restOperations());
return AwsIam.doCreateIamAuthentication(role, restOperations());
}
protected ClientAuthentication azureMsiAuthentication() {
@@ -491,4 +486,18 @@ public class EnvironmentVaultConfiguration extends AbstractVaultConfiguration im
}
static class AwsIam {
static ClientAuthentication doCreateIamAuthentication(String role, RestOperations restOperations) {
AwsIamAuthenticationOptions.AwsIamAuthenticationOptionsBuilder builder = AwsIamAuthenticationOptions
.builder()
.role(role)
.credentialsProvider(DefaultCredentialsProvider.create());
return new AwsIamAuthentication(builder.build(), restOperations);
}
}
}