Merge branch 'integration_2024-06-13_288778989570' into 'master'

merge branch integration_2024-06-13_288778989570 into master

See merge request iaasng/volcengine-java-sdk!197

Author: liuweiwei-xyz

README.md

@@ -54,7 +54,7 @@
     <dependency>
       <groupId>com.volcengine</groupId>
 	  <artifactId>volcengine-java-sdk-bom</artifactId>
-       <version>0.1.114</version>
+       <version>0.1.115</version>
 	  <type>pom</type>
       <scope>import</scope>
     </dependency>
@@ -70,12 +70,12 @@
   <dependency>
     <groupId>com.volcengine</groupId>
     <artifactId>volcengine-java-sdk-vpc</artifactId>
-   <version>0.1.114</version>
+   <version>0.1.115</version>
   </dependency>
   <dependency>
     <groupId>com.volcengine</groupId>
     <artifactId>volcengine-java-sdk-ecs</artifactId>
-   <version>0.1.114</version>
+   <version>0.1.115</version>
   </dependency>
 </dependencies>
 ```

meta.json

@@ -1,4 +1,4 @@
 {
-	"lasted": "0.1.114",
-	"meta_commit": "a6ec2b06777897f8d3af4d52398034611e2bdf77"
+	"lasted": "0.1.115",
+	"meta_commit": "d033ebf8a2d2fc4821cf9297cbfa75a00e50216b"
 }

pom.xml

@@ -4,7 +4,7 @@
     <groupId>com.volcengine</groupId>
     <artifactId>volcengine-java-sdk</artifactId>
     <packaging>pom</packaging>
-    <version>0.1.114</version>
+    <version>0.1.115</version>
     <name>volcengine-java-sdk</name>
     <url>https://open.volcengineapi.com</url>
     <description>The Java SDK For Volcengine</description>

volcengine-java-sdk-alb/pom.xml

@@ -3,7 +3,7 @@
     <parent>
         <artifactId>volcengine-java-sdk</artifactId>
         <groupId>com.volcengine</groupId>
-        <version>0.1.114</version>
+        <version>0.1.115</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
     <modelVersion>4.0.0</modelVersion>

volcengine-java-sdk-ark-runtime/pom.xml

@@ -3,7 +3,7 @@
     <parent>
         <artifactId>volcengine-java-sdk</artifactId>
         <groupId>com.volcengine</groupId>
-        <version>0.1.114</version>
+        <version>0.1.115</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
     <build>

volcengine-java-sdk-ark-runtime/src/main/java/com/volcengine/ark/runtime/Const.java

@@ -7,7 +7,12 @@ public class Const {
     public static final String CLIENT_REQUEST_HEADER = "X-Client-Request-Id";
     public static final String SERVER_REQUEST_HEADER = "X-Request-Id";
     public static final String REQUEST_MODEL = "X-Request-Model";
+    public static final String REQUEST_BOT = "X-Request-Bot";
+    public static final String REQUEST_BOT_ID = "botId";
     public static final Integer DEFAULT_MANDATORY_REFRESH_TIMEOUT = 10 * 60;  // 10 min
     public static final Integer DEFAULT_ADVISORY_REFRESH_TIMEOUT = 30 * 60;  // 30 min
     public static final Integer DEFAULT_STS_TIMEOUT = 7 * 24 * 60 * 60;  // 7 days
+
+    public static final String RESOURCE_TYPE_BOT = "bot";
+    public static final String RESOURCE_TYPE_ENDPOINT = "endpoint";
 }

volcengine-java-sdk-ark-runtime/src/main/java/com/volcengine/ark/runtime/interceptor/ArkResourceStsAuthenticationInterceptor.java

@@ -0,0 +1,192 @@
+package com.volcengine.ark.runtime.interceptor;
+
+import com.volcengine.ApiClient;
+import com.volcengine.ApiException;
+import com.volcengine.StringUtil;
+import com.volcengine.ark.ArkApi;
+import com.volcengine.ark.model.GetApiKeyRequest;
+import com.volcengine.ark.model.GetApiKeyResponse;
+import com.volcengine.ark.runtime.Const;
+import com.volcengine.ark.runtime.exception.ArkException;
+import com.volcengine.sign.Credentials;
+import okhttp3.Interceptor;
+import okhttp3.Request;
+import okhttp3.Response;
+import org.apache.commons.lang.StringUtils;
+
+import java.io.IOException;
+import java.util.ArrayList;
+import java.util.List;
+import java.util.Map;
+import java.util.Objects;
+import java.util.concurrent.ConcurrentHashMap;
+import java.util.concurrent.locks.ReentrantReadWriteLock;
+import java.util.function.BiFunction;
+
+public class ArkResourceStsAuthenticationInterceptor implements Interceptor {
+
+    private final String ak;
+    private final String sk;
+    // cacheKey = resourceType/resourceId
+    private Map<String, ArkResourceStsTokenInfo> resourceStsTokens;
+    private final Integer advisoryRefreshTimeout = Const.DEFAULT_ADVISORY_REFRESH_TIMEOUT;
+    private final Integer mandatoryRefreshTimeout = Const.DEFAULT_MANDATORY_REFRESH_TIMEOUT;
+    private final ReentrantReadWriteLock lock = new ReentrantReadWriteLock();
+    private final ArkApi volcClient;
+
+    public ArkResourceStsAuthenticationInterceptor(String ak, String sk, String region) {
+        Objects.requireNonNull(ak, "Ak token required");
+        Objects.requireNonNull(sk, "Sk token required");
+        this.ak = ak;
+        this.sk = sk;
+        this.resourceStsTokens = new ConcurrentHashMap<>();
+
+        ApiClient apiClient = new ApiClient()
+                .setCredentials(Credentials.getCredentials(ak, sk))
+                .setRegion(region);
+        ArkApi arkApi = new ArkApi(apiClient);
+        this.volcClient = arkApi;
+    }
+
+    @Override
+    public Response intercept(Chain chain) throws IOException {
+        Request request = chain.request();
+        String requestResourceType = getRequestResourceType(request);
+        String requestResourceId = getRequestResourceId(request);
+
+        Request newRequest = chain.request()
+                .newBuilder()
+                .header("Authorization", "Bearer " + getResourceStsToken(requestResourceType, requestResourceId))
+                .build();
+        return chain.proceed(newRequest);
+    }
+
+    private String getRequestResourceType(Request request) {
+        if (StringUtils.isNotBlank(request.header(Const.REQUEST_BOT))) {
+            return Const.RESOURCE_TYPE_BOT;
+        }
+        return Const.RESOURCE_TYPE_ENDPOINT;
+    }
+
+    private String getRequestResourceId(Request request) {
+        if (StringUtils.isNotBlank(request.header(Const.REQUEST_BOT))) {
+            return request.header(Const.REQUEST_BOT);
+        }
+        return request.header(Const.REQUEST_MODEL);
+    }
+
+    private String getResourceStsToken(String resourceType, String resourceId) {
+        refresh(resourceType, resourceId);
+
+        ArkResourceStsTokenInfo tokenInfo = this.resourceStsTokens.get(getResourceKey(resourceType, resourceId));
+        if (tokenInfo == null) {
+            return "";
+        }
+        return tokenInfo.getToken();
+    }
+
+    private void refresh(String resourceType, String resourceId) {
+        if (!need_refresh(resourceType, resourceId, this.advisoryRefreshTimeout)) {
+            return;
+        }
+
+        if (lock.writeLock().tryLock()) {
+            if (!need_refresh(resourceType, resourceId, this.advisoryRefreshTimeout)) {
+                return;
+            }
+
+            try {
+                boolean isMandatoryRefresh = need_refresh(resourceType, resourceId, this.mandatoryRefreshTimeout);
+                protectedRefresh(resourceType, resourceId, isMandatoryRefresh);
+            } finally {
+                lock.writeLock().unlock();
+            }
+        } else if (need_refresh(resourceType, resourceId, this.mandatoryRefreshTimeout)) {
+            try {
+                lock.writeLock().lock();
+                if (!need_refresh(resourceType, resourceId, this.mandatoryRefreshTimeout)) {
+                    return;
+                }
+                protectedRefresh(resourceType, resourceId, true);
+            } finally {
+                lock.writeLock().unlock();
+            }
+        }
+    }
+
+    private boolean need_refresh(String resourceType, String resourceId, Integer refresh_in) {
+        ArkResourceStsTokenInfo tokenInfo = this.resourceStsTokens.get(getResourceKey(resourceType, resourceId));
+        if (tokenInfo == null) {
+            return true;
+        }
+
+        return tokenInfo.getExpiredTime() - System.currentTimeMillis() / 1000 < refresh_in;
+    }
+
+    private void protectedRefresh(String resourceType, String resourceId, boolean isMandatory) {
+        this.resourceStsTokens.compute(getResourceKey(resourceType, resourceId), new BiFunction<String, ArkResourceStsTokenInfo, ArkResourceStsTokenInfo>() {
+            @Override
+            public ArkResourceStsTokenInfo apply(String s, ArkResourceStsTokenInfo stringIntegerPair) {
+                try {
+                    ArkResourceStsTokenInfo tokenInfo = getToken(resourceType, resourceId, Const.DEFAULT_STS_TIMEOUT);
+                    return tokenInfo;
+                } catch (ApiException e) {
+                    if (isMandatory) {
+                        throw new RuntimeException(e);
+                    }
+                    return null;
+                }
+            }
+        });
+    }
+
+    private ArkResourceStsTokenInfo getEndpointToken(String endpointId, Integer ttl) throws ApiException {
+        return getToken("endpoint", endpointId, ttl);
+    }
+
+    private ArkResourceStsTokenInfo getToken(String resourceType, String resourceId, Integer ttl) throws ApiException {
+        if (ttl < this.advisoryRefreshTimeout * 2) {
+            throw new ArkException("ttl should not be under " + this.advisoryRefreshTimeout * 2 + " seconds.");
+        }
+
+        GetApiKeyRequest r = new GetApiKeyRequest();
+        r.durationSeconds(ttl);
+        r.resourceType(resourceType);
+        List<String> list = new ArrayList<>();
+        list.add(resourceId);
+        r.resourceIds(list);
+
+        GetApiKeyResponse response = this.volcClient.getApiKey(r);
+        return new ArkResourceStsTokenInfo(response.getApiKey(), response.getExpiredTime());
+    }
+
+    private String getResourceKey(String resourceType, String resourceId) {
+        return resourceType + "/" + resourceId;
+    }
+
+    public static class ArkResourceStsTokenInfo {
+        private String token;
+        private Integer expiredTime;
+
+        public ArkResourceStsTokenInfo(String token, Integer expiredTime) {
+            this.token = token;
+            this.expiredTime = expiredTime;
+        }
+
+        public String getToken() {
+            return token;
+        }
+
+        public void setToken(String token) {
+            this.token = token;
+        }
+
+        public Integer getExpiredTime() {
+            return expiredTime;
+        }
+
+        public void setExpiredTime(Integer expiredTime) {
+            this.expiredTime = expiredTime;
+        }
+    }
+}