@tmsfe/tms-core 0.0.163 → 0.0.166

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@tmsfe/tms-core",
-  "version": "0.0.163",
+  "version": "0.0.166",
   "description": "tms运行时框架",
   "repository": {
     "type": "git",

package/src/encrypt/encrypt-util.ts

@@ -127,9 +127,8 @@ const eccUtil = {
           method: 'POST',
           data,
           enableHttp2: true,
-          success: (res) => {
-            const success = eccUtil._updateGlobalPublicKeyInfo(false, res.header);
-            resolve(success);
+          success: () => {
+            resolve(true);
           },
           fail: () => {
             resolve(false);
@@ -529,43 +528,59 @@ const resDecrypt = async (requestTraceId: string, header, data, cryptoKeyInfo: C
 };
 // 处理接下来的请求开关
 let dealEncryptionSwitching = false;
-const dealEncryptionSwitch = async (path: string, traceId: string, resHeader): Promise<boolean> => {
+const dealEncryptionSwitch = async (path: string, traceId: string, resHeader): Promise<void> => {
   if ((!resHeader || dealEncryptionSwitching)) {
-    return true;
+    return;
   }
   dealEncryptionSwitching = true;
   const formatHeader = baseUtil.formatHeader(resHeader);
   // 加密关闭或者`login接口和lastkey接口`，都需要先执行验签
   const cryptoDisabled = formatHeader['x-crypto-enable'] === '0';
-  const specialPath = [
-    `${baseUtil.getSinanHost()}/user/login`,
-    `${baseUtil.getSinanHost()}/basic/crypto/lastkey2`,
-  ].indexOf(path) > -1;
-  if ((eccUtil.checkCryptoOpen() && cryptoDisabled) || specialPath) {
+  if ((eccUtil.checkCryptoOpen() && cryptoDisabled)) {
     const verified = eccUtil.verifyServerCryptoSign(traceId, formatHeader);
     if (!verified) {
       // 验签失败，表示响应被篡改
       dealEncryptionSwitching = false;
-      return false;
+      baseUtil.logInfo(`验签失败: ${path} : ${traceId}`);
+      return;
     }
   }
   if (cryptoDisabled) {
     eccUtil.closeCrypto();
   } else if (formatHeader['x-crypto-enable'] === '1') {
-    if (specialPath) {
-      eccUtil._updateGlobalPublicKeyInfo(false, formatHeader);
-    }
     await eccUtil.openCrypto();
   } // 0是关闭，1是开启, 2是保持
   dealEncryptionSwitching = false;
-  return true;
+  return;
+};
+
+/**
+ * 处理非加密请求的响应
+ * @params path traceId resHeader reqData
+ * @returns 是否需要根据响应内容处理加密开关
+ */
+const dealRes = (path: string, traceId: string, resHeader, reqData): BaseResp<boolean> => {
+  const specialPath = [
+    `${baseUtil.getSinanHost()}/user/login`,
+    `${baseUtil.getSinanHost()}/basic/crypto/lastkey2`,
+  ].indexOf(path) > -1;
+  if (specialPath) {
+    const formatHeader = baseUtil.formatHeader(resHeader);
+    const verified = eccUtil.verifyServerCryptoSign(traceId, formatHeader);
+    if (!verified) {
+      // 验签失败，表示响应被篡改
+      return new baseUtil.BaseRespFac(false, false, `验签失败: ${path} : ${traceId}`);
+    }
+    eccUtil._updateGlobalPublicKeyInfo(false, resHeader);
+  }
+  return new baseUtil.BaseRespFac(!cryptRuleUtil.isPerformanceReport(path, reqData));
 };
 
 const encryptUtil = {
   init,                       // 初始化加密工具
   isCryptoRuleMath,           // 请求是否符合加密规则
-  isPerformanceRuleMath: cryptRuleUtil.isPerformanceReport,     // 请求是否符合性能规则
   logInfo: baseUtil.logInfo,  // 本地日志打印
+  dealRes,                    // 处理不加密请求的响应
   reqEncrypt,                 // 请求加密：header和data
   resDecrypt,                 // 响应解密
   dealEncryptionSwitch,       // 处理加密开关

package/src/encrypt/index.ts

@@ -27,7 +27,7 @@ let originalRequestApi;
 let originalUploadFileApi;
 // 劫持wx.request和wx.uploadFile函数
 const requestInit = (utilFunc) => {
-  if (!wx.request.cryptoFlag) {
+  if (!wx.reqCryptoFlag) {
     originalRequestApi = wx.request;
     // 初始化参数加签函数和性能上报函数
     const { report, composeParamsFunc } = utilFunc;
@@ -37,12 +37,12 @@ const requestInit = (utilFunc) => {
       report('request_encrypt_log', ...args);
     };
     proxyWxRequest();
-    wx.request.cryptoFlag = true;
+    wx.reqCryptoFlag = true;
   }
-  if (!wx.uploadFile.cryptoFlag) {
+  if (!wx.uploadFileCryptoFlag) {
     originalUploadFileApi = wx.uploadFile;
     proxyWxUploadFile();
-    wx.uploadFile.cryptoFlag = true;
+    wx.uploadFileCryptoFlag = true;
   }
 };
 
@@ -79,9 +79,11 @@ function proxyWxRequest(): void {
         originalRequestApi.call(this, {
           ...originalOptions,
           success: async (res) => {
-            const dealSuccess = await encryptUtil.dealEncryptionSwitch(url, traceId, res.header);
+            const {
+              success: dealSuccess, res: needDealHeader } = encryptUtil.dealRes(url, traceId, res.header, formatData);
             // 性能埋点接口不走验签逻辑
-            if (dealSuccess || encryptUtil.isPerformanceRuleMath(url, formatData)) {
+            if (dealSuccess) {
+              needDealHeader && encryptUtil.dealEncryptionSwitch(url, traceId, res.header);
               success?.call(this, res);
             } else {
               util.reportFunc(url, traceparent, `加密验签不通过: ${JSON.stringify(res)}`);
@@ -122,7 +124,7 @@ function proxyWxRequest(): void {
             return;
           }
           if (decSuccess) {
-            util.logInfo(url, traceparent, '解密成功');
+            // util.logInfo(url, traceparent, '解密成功');
             encryptUtil.dealEncryptionSwitch(url, traceId, resHeader);
             success?.call(this, res);
           } else { // 不支持明文重试，且解密失败