【update】隧道加密优化; review by songym

Author: xiongjiaojiao

src/common/index.common.js

@@ -334,7 +334,7 @@ import {
     getMeterPerMapUnit,
     getWrapNum,
     conversionDegree,
-    EncryptFetchRequestUtil
+    EncryptRequest
 } from './util';
 import { CartoCSS, ThemeStyle } from './style';
 import {
@@ -499,7 +499,7 @@ export {
     isCORS,
     setCORS,
     FetchRequest,
-    EncryptFetchRequestUtil,
+    EncryptRequest,
     ColorsPickerUtil,
     ArrayStatistic,
     getMeterPerMapUnit,

src/common/namespace.js

@@ -337,7 +337,7 @@ import {
   isCORS,
   setCORS,
   FetchRequest,
-  EncryptFetchRequestUtil,
+  EncryptRequest,
   ColorsPickerUtil,
   ArrayStatistic,
   CartoCSS,
@@ -494,7 +494,7 @@ SuperMap.isCORS = isCORS;
 SuperMap.setRequestTimeout = setRequestTimeout;
 SuperMap.getRequestTimeout = getRequestTimeout;
 SuperMap.FetchRequest = FetchRequest;
-SuperMap.EncryptFetchRequestUtil = EncryptFetchRequestUtil;
+SuperMap.EncryptRequest = EncryptRequest;
 
 // commontypes
 SuperMap.inherit = inheritExt;

src/common/util/EncryptFetchRequestUtil.js renamed to src/common/util/EncryptRequest.js

@@ -9,13 +9,14 @@ import {
 
 /**
  * @private
- * @name EncryptFetchRequestUtil
+ * @name EncryptRequest
  * @namespace
  * @category BaseTypes Util
  * @classdesc 加密请求地址
+ * @param {string} serverUrl - 服务地址。
  */
-export class EncryptFetchRequestUtil {
-  constructor(serverUrl = 'http://172.16.13.234:8090/iserver') {
+export class EncryptRequest {
+  constructor(serverUrl = '') {
     this.serverUrl = serverUrl.split('').slice(-1)[0] === '/' ? serverUrl : `${serverUrl}/`;
     this.tunnelUrl = undefined;
     this.blockedUrlRegex = {
@@ -29,9 +30,22 @@ export class EncryptFetchRequestUtil {
     this.encryptAESIV = generateAESRandomIV();
   }
 
-  async encryptRequest(options) {
+  /**
+   * @function EncryptRequest.prototype.request
+   * @description 加密请求地址。
+   * @param {Object} config - 加密请求参数。
+   * @param {string} config.method - 请求方法。
+   * @param {string} config.url - 请求地址。
+   * @param {string} config.params - 请求参数。
+   * @param {Object} config.options - 请求的配置属性。
+   * @returns {Promise} Promise 对象。
+   */
+  async request(options) {
+    if (!this.serverUrl) {
+      throw 'serverUrl can not be empty.';
+    }
     const config = Object.assign({ baseURL: '' }, options);
-    const tunnelUrl = await this.createTunnel();
+    const tunnelUrl = await this._createTunnel();
     if (!tunnelUrl) {
       return;
     }
@@ -63,12 +77,23 @@ export class EncryptFetchRequestUtil {
         console.debug('解密请求响应失败');
         return;
       }
-      return JSON.parse(decryptResult).data;
+      const resultData = JSON.parse(decryptResult);
+      const resData = Object.create({
+        json: function () {
+          return Promise.resolve(resultData.data);
+        }
+      });
+      return Object.assign(resData, resultData);
     }
     return response;
   }
 
-  async getRSAPublicKey() {
+  /**
+   * @private
+   * @description 获取RSA public key
+   * @function EncryptRequest.prototype._getRSAPublicKey
+   */
+  async _getRSAPublicKey() {
     try {
       const response = await FetchRequest.get(`${this.serverUrl}services/security/tunnel/v1/publickey`);
       // 解析publicKey
@@ -88,10 +113,15 @@ export class EncryptFetchRequestUtil {
     }
   }
 
-  async createTunnel() {
+  /**
+   * @private
+   * @description 创建隧道
+   * @function EncryptRequest.prototype._createTunnel
+   */
+  async _createTunnel() {
     if (!this.tunnelUrl) {
       try {
-        const data = await this.getRSAPublicKey();
+        const data = await this._getRSAPublicKey();
         if (!data) {
           throw 'fetch RSA publicKey failed';
         }

src/common/util/index.js

@@ -11,7 +11,7 @@ import {
 
 import { ColorsPickerUtil } from './ColorsPickerUtil';
 
-import { EncryptFetchRequestUtil } from './EncryptFetchRequestUtil';
+import { EncryptRequest } from './EncryptRequest';
 
 import { ArrayStatistic } from './ArrayStatistic';
 import { getMeterPerMapUnit, getWrapNum, conversionDegree } from './MapCalculateUtil';
@@ -72,7 +72,7 @@ export {
   setRequestTimeout,
   getRequestTimeout,
   FetchRequest,
-  EncryptFetchRequestUtil,
+  EncryptRequest,
   ColorsPickerUtil,
   ArrayStatistic,
   getMeterPerMapUnit,

test/common/util/EncryptFetchRequestUtilSpec.js

@@ -1,18 +1,18 @@
 import { FetchRequest } from '../../../src/common//util/FetchRequest';
-import { EncryptFetchRequestUtil } from '../../../src/common//util/EncryptFetchRequestUtil';
+import { EncryptRequest } from '../../../src/common//util/EncryptRequest';
 
-describe('EncryptFetchRequestUtil', () => {
+describe('EncryptRequest', () => {
   const serverUrl = 'http://fake.iserver.com/iserver';
   const options = {
     url: 'http://fake.iserver.com/iserver/iserver/services/security/svckeys/keyIDNAME.json',
     method: 'get'
   };
 
-  it('encryptRequest fail', (done) => {
+  it('request fail', (done) => {
     const spyGet = spyOn(FetchRequest, 'get').and.returnValue('');
     const spyPost = spyOn(FetchRequest, 'post').and.returnValue({});
-    const encryptFetchRequestUtil = new EncryptFetchRequestUtil(serverUrl);
-    encryptFetchRequestUtil.encryptRequest(options).then((result) => {
+    const encryptRequest = new EncryptRequest(serverUrl);
+    encryptRequest.request(options).then((result) => {
       expect(result).toBeUndefined();
       expect(spyGet.calls.count()).toBe(1);
       expect(spyPost.calls.count()).toBe(0);
@@ -22,7 +22,7 @@ describe('EncryptFetchRequestUtil', () => {
     });
   });
 
-  it('encryptRequest succeed', (done) => {
+  it('request succeed', (done) => {
     const spyGet = spyOn(FetchRequest, 'get').and.callFake(() => {
       const response = {
         keyLength: 2048,
@@ -50,16 +50,16 @@ describe('EncryptFetchRequestUtil', () => {
         'HAsHE/ok/jROEySWBxWSr2FTLXcnIkeFAYzig+V7NGalR0f/VnBorkAOyOnbCSq9nM3YWrhEUFaWwAouSDeEVqe+BLuIA+7KmCBfD7hh+qyM0lC5cvZ8vOIjsI3eqhHhiPOi+IQLGHQsRbFl8hSkE0XU1GIojqjppSEAxW5jhFC2bH5hdCt/+PKuHPhATElgJqOI6FJHpVpbLWiqoP7WMYVYvZm7wubYCQIG77LUSivbUQ61gjW0mevsKRdoiRl8fafV8Zq5D+QBbCy+Mn4rWXDC+gjwvyyYxEdOixALJgfnjWL48RRHxvITPapzbEsEkcnZiu+INSULcT60BeuduKzxp+hUg6Q8sn2Bu//CNk0NlGMeT5hqTON72iI4GBgfEOnGrcBHjsT/N2jX0NnVz1bgR6B9O6TpQQr3zkjVPidw8ElSO+lM8P5AuRqtNH9ajYt2uDwWBhbG+OfyR4hKIJ9V5aDhAwkIzkUerRP78Colsg==';
       return Promise.resolve({ text: () => Promise.resolve(response) });
     });
-    const encryptFetchRequestUtil = new EncryptFetchRequestUtil(serverUrl);
-    encryptFetchRequestUtil.encryptAESKey = 'SLbsaRbf4Rou8Bju';
-    encryptFetchRequestUtil.encryptAESIV = 'rzLM7Z4RJGFd';
-    encryptFetchRequestUtil.encryptRequest(options).then((result) => {
+    const encryptRequest = new EncryptRequest(serverUrl);
+    encryptRequest.encryptAESKey = 'SLbsaRbf4Rou8Bju';
+    encryptRequest.encryptAESIV = 'rzLM7Z4RJGFd';
+    encryptRequest.request(options).then((result) => {
       expect(result).toBe('l3nQtAUM4li87qMfO68exInHVFQ5gS3a6pb8ySIbib8=');
       expect(spyGet.calls.count()).toBe(1);
       expect(spyPost.calls.count()).toBe(1);
       expect(spyCommit.calls.count()).toBe(1);
-      expect(encryptFetchRequestUtil.tunnelUrl).not.toBeUndefined();
-      encryptFetchRequestUtil.encryptRequest(options).then(result => {
+      expect(encryptRequest.tunnelUrl).not.toBeUndefined();
+      encryptRequest.request(options).then(result => {
         expect(result).toBe('l3nQtAUM4li87qMfO68exInHVFQ5gS3a6pb8ySIbib8=');
         expect(FetchRequest.get.calls.count()).toBe(1);
         expect(FetchRequest.post.calls.count()).toBe(1);