【feat】新增瓦片解密库; review by luox

Author: xiongjiaojiao

build/webpack.config.base.js

@@ -58,12 +58,7 @@ module.exports = {
 
     //其它解决方案配置
     resolve: {
-        extensions: ['.js', '.json', '.css'],
-        fallback: {
-          crypto: false,
-          stream: false,
-          vm: false
-        }
+        extensions: ['.js', '.json', '.css']
     },
 
     externals: {

package.json

@@ -133,6 +133,7 @@
     "@mapbox/vector-tile": "1.3.1",
     "@sinonjs/text-encoding": "^0.7.2",
     "@supermap/iclient-common": "file:src/common",
+    "@supermap/tile-decryptor": "^0.0.1",
     "@tensorflow/tfjs": "^3.9.0",
     "@turf/turf": "6.5.0",
     "canvg": "3.0.10",

src/common/package.json

@@ -15,6 +15,7 @@
   "license": "Apache-2.0",
   "dependencies": {
     "@antv/g6": "^4.8.14",
+    "@supermap/tile-decryptor": "^0.0.1",
     "echarts": "5.4.3",
     "fetch-ie8": "1.5.0",
     "fetch-jsonp": "1.1.3",

src/common/util/EncryptRequest.js

@@ -9,8 +9,8 @@ import {
 import URI from 'urijs';
 
 /**
- * @private
  * @name EncryptRequest
+ * @version 11.2.0
  * @namespace
  * @category BaseTypes Util
  * @classdesc 加密请求地址
@@ -173,7 +173,7 @@ export async function getServiceKey(serviceUrl) {
       method: 'get',
       url: svckeyUrl
     });
-    return await svcReponse.json();
+    return svcReponse.json();
   } catch (error) {
     console.error(error);
   }

src/common/util/RequestcryptUtil.js

@@ -1,7 +1,8 @@
-import pki from 'node-forge/lib/pki';
-import md from 'node-forge/lib/md';
-import cipher from 'node-forge/lib/cipher';
-import util from 'node-forge/lib/util';
+// import pki from 'node-forge/lib/pki';
+// import md from 'node-forge/lib/md';
+// import cipher from 'node-forge/lib/cipher';
+// import util from 'node-forge/lib/util';
+import { pki, md, cipher, util } from 'node-forge/dist/forge.min';
 
 /**
  * @private

src/openlayers/overlay/VectorTileSuperMapRest.js

@@ -4,7 +4,7 @@
 import { Util } from '../core/Util';
 import { SecurityManager } from '@supermap/iclient-common/security/SecurityManager';
 import { FetchRequest } from '@supermap/iclient-common/util/FetchRequest';
-import { EncryptRequest } from '@supermap/iclient-common/util/EncryptRequest';
+import { getServiceKey } from '@supermap/iclient-common/util/EncryptRequest';
 import { Unit } from '@supermap/iclient-common/REST';
 import { Util as CommonUtil } from '@supermap/iclient-common/commontypes/Util';
 import { Bounds } from '@supermap/iclient-common/commontypes/Bounds';
@@ -17,7 +17,7 @@ import GeoJSON from 'ol/format/GeoJSON';
 import * as olSize from 'ol/size';
 import Projection from 'ol/proj/Projection';
 import TileGrid from 'ol/tilegrid/TileGrid';
-import decodeUtil from './bundle.esm';
+import decryptTileUtil from '@supermap/tile-decryptor';
 
 /**
  * @class VectorTileSuperMapRest
@@ -271,10 +271,7 @@ export class VectorTileSuperMapRest extends VectorTile {
                             source = xhr.response;
                         }
                         if (source) {
-                            // console.time('瓦片解密完成');
                             source = me._decryptMvt(source);
-                            // console.timeEnd('瓦片解密完成');
-                            // console.log('瓦片解密字节大小: ', source.byteLength);
                             if (['4', '5'].indexOf(Util.getOlVersion()) > -1) {
                               success.call(
                                   this,
@@ -395,32 +392,15 @@ export class VectorTileSuperMapRest extends VectorTile {
           const firstSource = Object.keys(options.style.sources)[0];
           serviceUrl = options.style.sources[firstSource].tiles[0];
         }
-        const workspaceServerUrl = (serviceUrl && serviceUrl.match(/.+(?=(\/restjsr\/v1\/vectortile\/|\/rest\/maps\/))/) || [])[0];
-        if (!workspaceServerUrl) {
-          return;
-        }
-        const servicesResponse = await FetchRequest.get(workspaceServerUrl);
-        const servicesResult = await servicesResponse.json();
-        const matchRestData = (servicesResult || []).find(item => serviceUrl.includes(item.name) && item.serviceEncryptInfo);
-        if (!matchRestData) {
-          return;
-        }
-        const iserverHost = workspaceServerUrl.split('/services/')[0];
-        const encryptRequest = new EncryptRequest(iserverHost);
-        const svckeyUrl = matchRestData && `${iserverHost}/services/security/svckeys/${matchRestData.serviceEncryptInfo.encrptKeyID}.json`
-        const svcReponse = await encryptRequest.request({
-          method: 'get',
-          url: svckeyUrl
-        })
-        this.serviceKey = await svcReponse.json();
+        this.serviceKey = await getServiceKey(serviceUrl);
       } catch (error) {
         console.error(error);
       }
     }
 
     _decryptMvt(mvtData) {
       if (this.serviceKey) {
-        return decodeUtil(mvtData, this.serviceKey);
+        return decryptTileUtil(mvtData, this.serviceKey);
       }
       return mvtData;
     }

test/common/util/EncryptFetchRequestUtilSpec.js renamed to test/common/util/EncryptRequestSpec.js

@@ -53,13 +53,13 @@ describe('EncryptRequest', () => {
     const encryptRequest = new EncryptRequest(serverUrl);
     encryptRequest.encryptAESKey = 'SLbsaRbf4Rou8Bju';
     encryptRequest.encryptAESIV = 'rzLM7Z4RJGFd';
-    encryptRequest.request(options).then((result) => {
+    encryptRequest.request(options).then(res => res.json()).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(encryptRequest.tunnelUrl).not.toBeUndefined();
-      encryptRequest.request(options).then(result => {
+      encryptRequest.request(options).then(res => res.json()).then(result => {
         expect(result).toBe('l3nQtAUM4li87qMfO68exInHVFQ5gS3a6pb8ySIbib8=');
         expect(FetchRequest.get.calls.count()).toBe(1);
         expect(FetchRequest.post.calls.count()).toBe(1);

test/openlayers/overlay/VectorTileSuperMapRestSpec.js

@@ -1,6 +1,6 @@
 import { VectorTileSuperMapRest } from '../../../src/openlayers/overlay/VectorTileSuperMapRest';
 import { FetchRequest } from '@supermap/iclient-common/util/FetchRequest';
-import * as RequestcryptUtil from '@supermap/iclient-common/util/RequestcryptUtil';
+import { EncryptRequest } from '@supermap/iclient-common/util/EncryptRequest';
 import { MapService } from '../../../src/openlayers/services/MapService';
 import Map from 'ol/Map';
 import View from 'ol/View';
@@ -59,7 +59,7 @@ const mapObject = {
 };
 describe('openlayers_VectorTileSuperMapRest', () => {
   var testDiv, map, vectorTileOptions, vectorTileSource, originalTimeout, vectorLayer, spyGet, spyPost, spyCommit;
-  const mockCallback = (testUrl, method) => {
+  const mockCallback = (testUrl) => {
     if ((url.match(/.+(?=(\/restjsr\/v1\/vectortile\/|\/rest\/maps\/))/) || [])[0] === testUrl) {
       return Promise.resolve(
         new Response(
@@ -80,33 +80,6 @@ describe('openlayers_VectorTileSuperMapRest', () => {
           ])
         )
       );
-    } else if (testUrl.includes('/security/tunnel/v1/publickey')) {
-      return Promise.resolve(
-        new Response(
-          JSON.stringify({
-            keyLength: 2048,
-            publicKey:
-              'MIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEA2BQweGm/+YpzPn/QaRvkOYQQOwO0LI52NSdtJDehARLvFLfKfpaXs2Qks2VISYX8bl1aBRtS5m5/Z8mdo41k2XM9sRUKldF5M0gTUqKWUnDkS6INnNfsW4VsHNizIiZY7YvQA2cwl/4eYm4YF5Qy3KugPGrxt5KxZvh8O7b6si9JwLwIx53Y5oRbFttCHdjWR4mqFTzTR/yD4K1xYo/fizdvqUmWLhfpirHQsWv3WLaUOdEj36nDGBxuqahQ5JbH3VeASdbJQRTp+0QQcfpZ1x0GxXJWstemCrCUETQIQczYtj98qxSqknC8HZQhDz8F31NFV4341vrGKgOzrsq5HQIDAQAB',
-            keyScheme: 'PKCS#8'
-          })
-        )
-      );
-    } else if (testUrl.includes('/services/security/tunnel/v1/tunnels/')) {
-      const response =
-        '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) });
-    } else if (testUrl.includes('/services/security/tunnel/v1/tunnels')) {
-      const response = {
-        blockedUrlRegex: {
-          DELETE: [],
-          POST: [],
-          GET: ['.*/services/security/svckeys/[a-zA-Z]+\\.json'],
-          PUT: []
-        },
-        tunnelUrl:
-          'http://fake.iserver.com/iserver/services/security/tunnel/v1/tunnels/UUV6U25KNkVSNHhnQTYzcFVOTnZlNm9KVEVWZE4yeXVPNHlEVHAzeEZ2UnQ3WmtxS29qZURXQi9HcDBDYjNtM1FaOHFabGQwclduNGNzNjFjck1PbmFyakdOcGxQR25id2dQZ2ljY1NWdU5lMWg3dzV4UUtDQktyQ3doc3MzWnhmTkdNNWU3V01FZ21XNWJsR3pVdEtJenRpQXRTQ2RYQVBkN1oxRGNhNTh1a2pGSG1rUUZBeStjYVZPMXJ3NXFJcUdxN05ack1SNEEzNWRwNEZVNWV6ME96anYwN0tQempHZVl2U2VHa3YxRlc1R3ZXUW9KNmgwb290MjE1cEVZT2xNdzAwdXBidWpNOTQ2ck1iR1FFajFVUEtpeSt0OU9xdzdON0ZpZnhkTjEvRlF2cFpHN3ZBalVPV0ovVkNDdU9nN3RyU081SlhRMlZVQXhsbDlkMHZnPT0=.json'
-      };
-      return Promise.resolve(new Response(JSON.stringify(response)));
     }
     return Promise.resolve(new Response(JSON.stringify(mapObject)));
   };
@@ -121,8 +94,8 @@ describe('openlayers_VectorTileSuperMapRest', () => {
     window.document.body.appendChild(testDiv);
   });
   beforeEach(() => {
-    // originalTimeout = jasmine.DEFAULT_TIMEOUT_INTERVAL;
-    // jasmine.DEFAULT_TIMEOUT_INTERVAL = 5000;
+    originalTimeout = jasmine.DEFAULT_TIMEOUT_INTERVAL;
+    jasmine.DEFAULT_TIMEOUT_INTERVAL = 5000;
 
     spyGet = spyOn(FetchRequest, 'get').and.callFake((url) => mockCallback(url, 'GET'));
     spyPost = spyOn(FetchRequest, 'post').and.callFake((url) => mockCallback(url, 'POST'));
@@ -132,7 +105,7 @@ describe('openlayers_VectorTileSuperMapRest', () => {
     if (vectorLayer) {
       map.removeLayer(vectorLayer);
     }
-    // jasmine.DEFAULT_TIMEOUT_INTERVAL = originalTimeout;
+    jasmine.DEFAULT_TIMEOUT_INTERVAL = originalTimeout;
     spyGet.calls.reset();
     spyPost.calls.reset();
     spyCommit.calls.reset();
@@ -141,7 +114,7 @@ describe('openlayers_VectorTileSuperMapRest', () => {
     window.document.body.removeChild(testDiv);
   });
 
-  xit('initialize', (done) => {
+  it('initialize', (done) => {
     new MapService(url).getMapInfo((serviceResult) => {
       map = new Map({
         target: 'map',
@@ -169,7 +142,7 @@ describe('openlayers_VectorTileSuperMapRest', () => {
       map.addLayer(vectorLayer);
     });
   });
-  xit('custom_tileLoadFunction', (done) => {
+  it('custom_tileLoadFunction', (done) => {
     var spy = jasmine.createSpy('test');
     var tileLoadFunction = (tile) => {
       tile.setLoader(() => {
@@ -202,16 +175,7 @@ describe('openlayers_VectorTileSuperMapRest', () => {
 
   it('mvt_decrypt ', (done) => {
     const spy = jasmine.createSpy('test');
-    // function EncryptRequestTest() {}
-    // EncryptRequestTest.prototype.request = function (options) {
-    //   console.log(111111111111111111111111111, optios.url);
-    //   spy();
-    //   return Promise.resolve({ json: () => Promise.resolve('l3nQtAUM4li87qMfO68exInHVFQ5gS3a6pb8ySIbib8=') });
-    // };
-    // const spyEncrypt = spyOn(EncryptRequestHelper, 'EncryptRequest').and.returnValue(EncryptRequestTest);
-    // RequestcryptUtil.generateAESRandomKey = () => 'SLbsaRbf4Rou8Bju';
-    // RequestcryptUtil.generateAESRandomIV = () => 'rzLM7Z4RJGFd';
-    const spyEncrypt = spyOn(RequestcryptUtil, 'AESGCMDecrypt').and.returnValue(true);
+    const spyEncrypt = spyOn(EncryptRequest.prototype, 'request').and.callFake(() => ({ json: () => Promise.resolve('l3nQtAUM4li87qMfO68exInHVFQ5gS3a6pb8ySIbib8=')}));
     new MapService(url).getMapInfo((serviceResult) => {
       map = new Map({
         target: 'map',
@@ -239,6 +203,7 @@ describe('openlayers_VectorTileSuperMapRest', () => {
       vectorLayer.getSource().once('tileloadend', () => {
         expect(vectorTileOptions).not.toBeNull();
         expect(spy.calls.count()).toBe(1);
+        expect(spyEncrypt).toHaveBeenCalled();
         expect(vectorTileSource.serviceKey).not.toBeUndefined();
         spy.calls.reset();
         spyEncrypt.calls.reset();