feat: support session token

Author: xuyaming0800

volcstack-java-sdk-core/src/main/java/com/volcengine/volcstack/ApiClient.java

@@ -25,6 +25,7 @@
 import com.volcengine.volcstack.version.Version;
 import okio.BufferedSink;
 import okio.Okio;
+import org.apache.commons.lang.StringUtils;
 import org.threeten.bp.LocalDate;
 import org.threeten.bp.OffsetDateTime;
 import org.threeten.bp.format.DateTimeFormatter;
@@ -48,7 +49,6 @@
 import java.security.cert.CertificateFactory;
 import java.security.cert.X509Certificate;
 import java.text.DateFormat;
-import java.text.SimpleDateFormat;
 import java.util.*;
 import java.util.Map.Entry;
 import java.util.concurrent.TimeUnit;
@@ -1021,14 +1021,6 @@ private ServiceInfo addPairAndGetServiceInfo(String path, List<Pair> queryParams
         return new ServiceInfo(param[3], param[4]);
     }
 
-    private void initRequestHeader(Map<String, String> headerParams) {
-        if (!headerParams.containsKey("X-Date")) {
-            SimpleDateFormat sdf = new SimpleDateFormat("yyyyMMdd'T'HHmmss'Z'");
-            sdf.setTimeZone(TimeZone.getTimeZone("GMT"));
-            headerParams.put("X-Date", sdf.format(new Date()));
-        }
-    }
-
     private String getTruePath(String path, Map<String, String> headerParams) {
         if (isApplicationJsonBody(headerParams) || isPostBody(headerParams)) {
             String[] param = path.split("/");
@@ -1151,7 +1143,6 @@ public Request buildRequest(String path, String method, List<Pair> queryParams,
         getDefaultContentType(headerParams);
 
         ServiceInfo serviceInfo = addPairAndGetServiceInfo(path, queryParams, headerParams);
-        initRequestHeader(headerParams);
         String truePath = getTruePath(path, headerParams);
         String contentType = headerParams.get("Content-Type");
         StringBuilder bodyBuilder = new StringBuilder();
@@ -1299,6 +1290,15 @@ public void updateParamsForAuth(String[] authNames, List<Pair> queryParams, Map<
             if (auth == null) throw new RuntimeException("Authentication undefined: " + authName);
             if (auth instanceof VolcstackSign) {
                 VolcstackSign volcstackSign = (VolcstackSign) auth;
+                if (volcstackSign.getCredentials() == null) {
+                    throw new RuntimeException("Credentials must set when ApiClient init");
+                }
+                if (StringUtils.isEmpty(credentials.getAccessKey()) || StringUtils.isEmpty(credentials.getSecretKey())){
+                    throw new RuntimeException("AccessKey and SecretKey must set when ApiClient init Credentials");
+                }
+                if (StringUtils.isEmpty(volcstackSign.getRegion())) {
+                    throw new RuntimeException("Region must set when ApiClient init");
+                }
                 volcstackSign.setMethod(serviceInfo.getMethod().toUpperCase());
                 volcstackSign.setService(serviceInfo.getServiceName());
             }

volcstack-java-sdk-core/src/main/java/com/volcengine/volcstack/sign/Credentials.java

@@ -7,6 +7,7 @@
 public class Credentials {
     private String accessKey;
     private String secretKey;
+    private String sessionToken;
 
     private Credentials() {
     }
@@ -27,17 +28,31 @@ public void setSecretKey(String secretKey) {
         this.secretKey = secretKey;
     }
 
+    public String getSessionToken() {
+        return sessionToken;
+    }
+
+    public void setSessionToken(String sessionToken) {
+        this.sessionToken = sessionToken;
+    }
+
     public static Credentials getEnvCredentials() {
         Credentials credentials = new Credentials();
         credentials.accessKey = System.getenv("VOLCSTACK_ACCESS_KEY");
         credentials.secretKey = System.getenv("VOLCSTACK_SECRET_KEY");
+        credentials.secretKey = System.getenv("VOLCSTACK_SESSION_TOKEN");
         return credentials;
     }
 
     public static Credentials getCredentials(String accessKey, String secretKey) {
+        return getCredentials(accessKey,secretKey,"");
+    }
+
+    public static Credentials getCredentials(String accessKey, String secretKey,String sessionToken) {
         Credentials credentials = new Credentials();
         credentials.accessKey = accessKey;
         credentials.secretKey = secretKey;
+        credentials.sessionToken = sessionToken;
         return credentials;
     }
 }

volcstack-java-sdk-core/src/main/java/com/volcengine/volcstack/sign/VolcstackSign.java

@@ -2,12 +2,14 @@
 
 import com.volcengine.volcstack.Pair;
 import com.volcengine.volcstack.auth.Authentication;
+import org.apache.commons.lang.StringUtils;
 
 import javax.crypto.Mac;
 import javax.crypto.spec.SecretKeySpec;
 import java.nio.ByteBuffer;
 import java.nio.charset.StandardCharsets;
 import java.security.MessageDigest;
+import java.text.SimpleDateFormat;
 import java.util.*;
 
 /**
@@ -44,7 +46,7 @@ private static class SignRequest {
         private StringBuilder canonicalHeaders;
         private StringBuilder credentialScope;
         private StringBuilder stringToSign;
-        private StringBuilder authorization;
+//        private StringBuilder authorization;
     }
 
 
@@ -187,6 +189,17 @@ private void buildSignedHeaders(Map<String, String> headerParams, SignRequest si
         signRequest.signedHeaders = signedHeaders;
     }
 
+    private void initHeaders(Map<String,String> headerParams){
+        if (!StringUtils.isEmpty(credentials.getSessionToken())){
+            headerParams.put("X-Security-Token",credentials.getSessionToken());
+        }
+        if (!headerParams.containsKey("X-Date")) {
+            SimpleDateFormat sdf = new SimpleDateFormat("yyyyMMdd'T'HHmmss'Z'");
+            sdf.setTimeZone(TimeZone.getTimeZone("GMT"));
+            headerParams.put("X-Date", sdf.format(new Date()));
+        }
+    }
+
     private void buildCanonicalRequest(Map<String, String> queryParams, SignRequest signRequest) throws Exception {
         //sort keys
         List<String> listParamKeys = sortParamKeys(queryParams);
@@ -214,6 +227,8 @@ private void buildCanonicalRequest(Map<String, String> queryParams, SignRequest
     private void sign(Map<String, String> queryParams, Map<String, String> headerParams, String payload) throws Exception {
 
         SignRequest signRequest = new SignRequest();
+        // initHeader
+        initHeaders(headerParams);
         // step 1
         buildCanonicalRequest(queryParams, signRequest);
         buildSignedHeaders(headerParams,signRequest);