Add OIDCCredentialsProvider into default credentials provider chain

Author: JacksonTian

aliyun-java-sdk-core/src/main/java/com/aliyuncs/DefaultAcsClient.java

@@ -319,7 +319,6 @@ private <T extends AcsResponse> HttpResponse doRealAction(AcsRequest<T> request,
                                                               String regionId, AlibabaCloudCredentials credentials, Signer signer, FormatType format)
             throws ClientException, ServerException {
 
-
         doActionWithProxy(request.getSysProtocol(), System.getenv("HTTPS_PROXY"), System.getenv("HTTP_PROXY"));
         doActionWithIgnoreSSL(request, X509TrustAll.ignoreSSLCerts);
 
@@ -584,7 +583,6 @@ public void shutdown() {
             IOUtils.closeQuietly(this.httpClient);
             this.httpClient = null;
         }
-
     }
 
     public DefaultProfile getProfile() {

aliyun-java-sdk-core/src/main/java/com/aliyuncs/auth/DefaultCredentialsProvider.java

@@ -2,6 +2,7 @@
 
 import com.aliyuncs.exceptions.ClientException;
 import com.aliyuncs.utils.AuthUtils;
+import com.aliyuncs.utils.StringUtils;
 
 import java.util.ArrayList;
 import java.util.List;
@@ -15,6 +16,14 @@ public class DefaultCredentialsProvider implements AlibabaCloudCredentialsProvid
     public DefaultCredentialsProvider() throws ClientException {
         defaultProviders.add(new SystemPropertiesCredentialsProvider());
         defaultProviders.add(new EnvironmentVariableCredentialsProvider());
+        // Add oidc credentials provider
+        String oidcProviderArn = System.getenv("ALIBABA_CLOUD_OIDC_PROVIDER_ARN");
+        String roleArn = System.getenv("ALIBABA_CLOUD_ROLE_ARN");
+        String oidcTokenFile = System.getenv("ALIBABA_CLOUD_OIDC_TOKEN_FILE");
+        if (!StringUtils.isEmpty(oidcProviderArn) && !StringUtils.isEmpty(oidcTokenFile) && !StringUtils.isEmpty(roleArn)) {
+            defaultProviders.add(new OIDCCredentialsProvider(roleArn, oidcProviderArn, oidcTokenFile, "java-sdk-v1-default-rsn", null));
+        }
+
         defaultProviders.add(new ProfileCredentialsProvider());
         String roleName = AuthUtils.getEnvironmentECSMetaData();
         if (roleName != null) {
@@ -42,6 +51,7 @@ public AlibabaCloudCredentials getCredentials() throws ClientException {
                 return credential;
             }
         }
+
         throw new ClientException("not found credentials");
     }
 

aliyun-java-sdk-core/src/main/java/com/aliyuncs/auth/SystemPropertiesCredentialsProvider.java

@@ -12,11 +12,13 @@ public AlibabaCloudCredentials getCredentials() throws ClientException, ServerEx
         if (!"default".equals(AuthUtils.getClientType())) {
             return null;
         }
+
         String accessKeyId = System.getProperty(AuthConstant.SYSTEM_ACCESSKEYID);
         String accessKeySecret = System.getProperty(AuthConstant.SYSTEM_ACCESSKEYSECRET);
         if (StringUtils.isEmpty(accessKeyId) || StringUtils.isEmpty(accessKeySecret)) {
             return null;
         }
+
         return new BasicCredentials(accessKeyId, accessKeySecret);
     }
 }

java-sdk-function-test/src/test/java/com/aliyuncs/CredentialsTest.java

@@ -45,4 +45,13 @@ public void oidcProviderTest() throws ClientException {
         Assert.assertTrue(response.getArn().endsWith("/sessionname"));
     }
 
+    @Test
+    public void oidcProviderForDefaultCredentialsProviderTest() throws ClientException {
+        DefaultAcsClient client = new DefaultAcsClient(this.regionId);
+        GetCallerIdentityRequest request = new GetCallerIdentityRequest();
+        GetCallerIdentityResponse response = client.getAcsResponse(request);
+        Assert.assertNotNull(response);
+        Assert.assertEquals("AssumedRoleUser", response.getIdentityType());
+        Assert.assertTrue(response.getArn().endsWith("/java-sdk-v1-default-rsn"));
+    }
 }