@tmsfe/tms-core 0.0.144 → 0.0.146

package/package.json

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

package/src/encrypt.js

@@ -56,6 +56,22 @@ function _getEccPublicKey() {
 function _getEccPublicId() {
   return wx.$_publicKey && wx.$_publicKey.id;
 }
+// 检查path是否符合下发的路由前缀
+function _checkPathInEnablePrefix(path) {
+  if (!_getEccPublicKey()) {
+    return false;
+  }
+  if (wx.$_publicKey && wx.$_publicKey.path === '*') {
+    return true;
+  }
+  const prefixArr = wx.$_publicKey && wx.$_publicKey.path ? wx.$_publicKey.path.split(',').map(item => item.trim()) : [];
+  for (let i = 0, len = prefixArr.length; i < len; i++) {
+    if (path.indexOf(prefixArr[i]) > -1) {
+      return true;
+    }
+  }
+  return false;
+}
 
 // 获取私钥
 let privateKeyInfo = null;
@@ -212,12 +228,13 @@ const updateDecryptKey = (publicKeyInfo) => {
     wx.$_publicKey = null;
     return;
   }
-  const { publicKey, expireDate, id } = publicKeyInfo;
+  const { publicKey, expireDate, id, path } = publicKeyInfo;
   // 1. 存储新的公钥
   wx.$_publicKey = {
     publicKey,
     expireDate,
     id,
+    path,
   };
   // 2. 生成新的私钥
   _getPrivateKeyInfo(true);
@@ -233,7 +250,9 @@ const encryptPathRule = {
   ],
 };
 function needsEncryption(url, params) {
-  if (!_getEccPublicKey()) {
+  // 判断是否属于加密白名单, 如果不符合，直接返回false, 如果符合，则走下面的逻辑
+  const enablePathPrefix = _checkPathInEnablePrefix(url);
+  if (!enablePathPrefix) {
     return false;
   }
   // 如果是日志上报接口，需要过滤性能日志，不需要加密

package/src/request.js

@@ -349,7 +349,8 @@ export default class Request {
   // wx请求封装成promise
   async wxRequest(path, method, header = {}, data, needReport, seqId) {
     if (needReport && path.indexOf('basic/event/upload') < 0) {
-      reporter.reportPerformance(
+      logger.log(
+        'tms-performance-log',
         'request_encrypt_log', 'main', 'send_unencrypt_request', seqId,
         !!wx.$_publicKey, Request.requestEncryptOpen, path,
       );
@@ -357,7 +358,7 @@ export default class Request {
     return new Promise((resolve, reject) => {
       wx.request({
         url: path,
-        header: { ...header, 'X-Trace-Id': seqId },
+        header: { ...header, 'X-Seq-Id': seqId },
         method,
         data,
         enableHttp2: true,
@@ -380,7 +381,7 @@ export default class Request {
       encryptObj.updateDecryptKey(res.data.resData);
     } catch (e) {
       encryptObj.updateDecryptKey(null);
-      reporter.reportPerformance('request_encrypt_log', 'main', 'refresh_encrypt_key_false', e);
+      logger.log('tms-performance-log', 'request_encrypt_log', 'main', 'refresh_encrypt_key_false', e);
     }
   }
 
@@ -477,7 +478,7 @@ export default class Request {
         header: encryptHeader, data: encryptData, aesKey,
       } = encryptObj.reqEncrypt(method, data, header, '');
       // 2. 发送请求
-      reporter.reportPerformance('request_encrypt_log', 'main', 'send_encrypt_request', seqId);
+      logger.log('tms-performance-log', 'request_encrypt_log', 'main', 'send_encrypt_request', seqId, '', '', path);
       const result = await this.wxRequest(finalUrl, method, encryptHeader, encryptData, false, seqId);
       const { header: resHeader, data: resData } = result;
       // 3. 解密响应
@@ -486,12 +487,12 @@ export default class Request {
         reporter.reportPerformance('request_encrypt_log', 'main', 'local_response_decrypt_fail', seqId);
         return this.createRequestTask(path, param, method, header, false);
       }
-      reporter.reportPerformance('request_encrypt_log', 'main', 'decrypt_response_success', seqId);
+      logger.log('tms-performance-log', 'request_encrypt_log', 'main', 'decrypt_response_success', seqId);
       // 4. 处理解密失败的响应
       const errCodeType = encryptObj.getErrcodeType(decryptData.errCode, decryptData.errMsg);
       if (errCodeType === encryptObj.reqErrType.pubKeyInvalid) {  // 秘钥失效
-        reporter.reportPerformance(
-          'request_encrypt_log', 'main', 'remote_response_decrypt_fail',
+        logger.log(
+          'tms-performance-log', 'request_encrypt_log', 'main', 'remote_response_decrypt_fail',
           seqId, decryptData.errCode, retryTimes,
         );
         const encryptSwitch = await this.dealEncryptionSwitch(resHeader, true);
@@ -501,8 +502,8 @@ export default class Request {
         return this.createRequestTask(path, param, method, header, encryptSwitch, retryTimes + 1);
       }
       if (errCodeType === encryptObj.reqErrType.decryptError) { // 解密失败
-        reporter.reportPerformance(
-          'request_encrypt_log', 'main', 'remote_response_decrypt_fail',
+        logger.log(
+          'tms-performance-log', 'request_encrypt_log', 'main', 'remote_response_decrypt_fail',
           seqId, decryptData.errCode, retryTimes,
         );
         return this.createRequestTask(path, param, method, header, false);