Merge pull request #41 from alipay/risk_tee

Risk tee

Author: zhiwen-lw

pom.xml

@@ -4,7 +4,7 @@
     <groupId>com.alipay.global.sdk</groupId>
     <artifactId>global-open-sdk-java</artifactId>
     <packaging>jar</packaging>
-    <version>2.0.38</version>
+    <version>2.0.39</version>
     <name>global-open-sdk-java</name>
     <url>https://github.com/alipay/global-open-sdk-java</url>
     <description>

src/main/java/com/alipay/global/api/example/RiskDecideTeeDemoCode.java

@@ -16,13 +16,13 @@
 import com.alipay.global.api.request.ams.risk.RiskReportRequest;
 import com.alipay.global.api.request.ams.risk.SendPaymentResultRequest;
 import com.alipay.global.api.request.ams.risk.SendRefundResultRequest;
-import com.alipay.global.api.request.ams.risk.tee.encryptstrategy.RiskDecideEncryptStrategy;
-import com.alipay.global.api.request.ams.risk.tee.enums.EncryptKeyEnum;
 import com.alipay.global.api.request.ams.risk.tee.exception.CryptoException;
 import com.alipay.global.api.response.ams.risk.RiskDecideResponse;
 import com.alipay.global.api.response.ams.risk.RiskReportResponse;
 import com.alipay.global.api.response.ams.risk.SendPaymentResultResponse;
 import com.alipay.global.api.response.ams.risk.SendRefundResultResponse;
+import com.alipay.global.api.request.ams.risk.tee.encryptutil.RiskDecideEncryptUtil;
+import com.alipay.global.api.request.ams.risk.tee.enums.EncryptKeyEnum;
 
 import java.util.Arrays;
 import java.util.Collections;
@@ -95,8 +95,8 @@ public static RiskDecideResponse postAuthDecide() {
         return response;
     }
 
-    public static void encryptRequest(RiskDecideRequest request) throws CryptoException {
-        // 2.1. build encryptList
+    private static void encryptRequest(RiskDecideRequest request) throws CryptoException {
+        // 2.1. please confirm selected encryptKey whit Ant Group, build encryptList
         List<EncryptKeyEnum> encryptList = Arrays.asList(
                 EncryptKeyEnum.BUYER_EMAIL,
                 EncryptKeyEnum.BUYER_PHONE_NO,
@@ -108,9 +108,8 @@ public static void encryptRequest(RiskDecideRequest request) throws CryptoExcept
                 EncryptKeyEnum.SHIP_TO_EMAIL,
                 EncryptKeyEnum.SHIPPING_PHONE_NO
         );
-        // 2.2. encrypt request by using RiskDecideEncryptStrategy
-        RiskDecideEncryptStrategy strategy = new RiskDecideEncryptStrategy();
-        strategy.encrypt(DATA_KEY, request, encryptList);
+        // 2.2. encrypt request by using RiskDecideEncryptUtil
+        RiskDecideEncryptUtil.encrypt(DATA_KEY, request, encryptList);
     }
 
     public static SendPaymentResultResponse sendPaymentResult() {

src/main/java/com/alipay/global/api/request/ams/risk/tee/encryptstrategy/EncryptStrategy.java

@@ -2,7 +2,7 @@
  * Ant Group
  * Copyright (c) 2004-2024 All Rights Reserved.
  */
-package com.alipay.global.api.request.ams.risk.tee.encryptstrategy;
+package com.alipay.global.api.request.ams.risk.tee.encryptutil;
 
 import com.alipay.global.api.model.ams.UserName;
 import com.alipay.global.api.model.risk.Order;
@@ -13,7 +13,6 @@
 import com.alipay.global.api.request.ams.risk.tee.enums.EncryptKeyEnum;
 import com.alipay.global.api.request.ams.risk.tee.enums.ErrorCodeEnum;
 import com.alipay.global.api.request.ams.risk.tee.exception.CryptoException;
-
 import javax.xml.bind.DatatypeConverter;
 import java.nio.charset.Charset;
 import java.util.List;
@@ -22,38 +21,31 @@
  * request encrypt strategy for risk decide API
  * risk decide API 的请求加密策略
  */
-public class RiskDecideEncryptStrategy implements EncryptStrategy {
+public class RiskDecideEncryptUtil {
 
-    Charset utf8Charset = Charset.forName("UTF-8");
+    private static Charset utf8Charset = Charset.forName("UTF-8");
 
-    @Override
-    public void encrypt(byte[] data_key, AlipayRequest<?> request, List<EncryptKeyEnum> encryptKeyList) {
+    public static void encrypt(String dataKeyBase64, AlipayRequest<?> request, List<EncryptKeyEnum> encryptKeyList) {
         if (request == null || encryptKeyList == null) {
             return;
         }
         if (!(request instanceof RiskDecideRequest)) {
-            throw new CryptoException(ErrorCodeEnum.MISMATCH_ENCRYPT_STRATEGY, "Request is not instance of RiskDecideRequest");
+            throw new CryptoException(ErrorCodeEnum.MISMATCH_ENCRYPT_UTIL, "Request is not instance of RiskDecideRequest");
         }
         RiskDecideRequest riskDecideRequest = (RiskDecideRequest) request;
         AESCrypto crypto = AESCrypto.getInstance();
-        doEncrypt(data_key, riskDecideRequest, encryptKeyList, crypto);
-    }
-
-    @Override
-    public void encrypt(String dataKeyBase64, AlipayRequest<?> request, List<EncryptKeyEnum> encryptKeyList) {
-        encrypt(DatatypeConverter.parseBase64Binary(dataKeyBase64), request, encryptKeyList);
+        doEncrypt(DatatypeConverter.parseBase64Binary(dataKeyBase64), riskDecideRequest, encryptKeyList, crypto);
     }
 
     /**
      * do encrypt by encryptKeyList
      * 根据 encryptKeyList 进行加密
-     *
-     * @param data_key       symmetric key
-     * @param request        plaintext RiskDecideRequest
+     * @param data_key symmetric key
+     * @param request plaintext RiskDecideRequest
      * @param encryptKeyList list of encrypt keys
-     * @param crypto         AESCrypto instance
+     * @param crypto AESCrypto instance
      */
-    private void doEncrypt(byte[] data_key, RiskDecideRequest request, List<EncryptKeyEnum> encryptKeyList,
+    private static void doEncrypt(byte[] data_key, RiskDecideRequest request, List<EncryptKeyEnum> encryptKeyList,
                            AESCrypto crypto) {
         List<Order> orders = request.getOrders();
         List<PaymentDetail> paymentDetails = request.getPaymentDetails();
@@ -146,12 +138,11 @@ private void doEncrypt(byte[] data_key, RiskDecideRequest request, List<EncryptK
     /**
      * encrypt username
      * 加密 username
-     *
      * @param data_key symmetric key
      * @param userName user name
-     * @param crypto   AESCrypto instance
+     * @param crypto AESCrypto instance
      */
-    private void encryptName(byte[] data_key, UserName userName, AESCrypto crypto) {
+    private static void encryptName(byte[] data_key, UserName userName, AESCrypto crypto) {
         if (userName == null) {
             return;
         }

src/main/java/com/alipay/global/api/request/ams/risk/tee/encryptstrategy/RiskDecideEncryptStrategy.java renamed to src/main/java/com/alipay/global/api/request/ams/risk/tee/encryptutil/RiskDecideEncryptUtil.java

@@ -12,7 +12,7 @@ public enum ErrorCodeEnum {
     PARAM_ILLEGAL("PARAM_ILLEGAL", "param illegal"),
     ENCRYPT_ERROR("ENCRYPT_ERROR", "encrypt error"),
     UNKNOWN_ENCRYPT_KEY("UNKNOWN_ENCRYPT_KEY", "unknown encrypt key"),
-    MISMATCH_ENCRYPT_STRATEGY("MISMATCH_ENCRYPT_STRATEGY", "mismatch encrypt strategy"),
+    MISMATCH_ENCRYPT_UTIL("MISMATCH_ENCRYPT_UTIL","mismatch encrypt util"),
     ;
 
     private final String code;
@@ -38,7 +38,5 @@ public String getCode() {
         return code;
     }
 
-    public String getDescription() {
-        return description;
-    }
+    public String getDescription() { return description; }
 }