【fix】优化判断同域的方法

songyumeng · songyumeng · commit fc8b637784ea · 2024-10-16T18:14:56.000+08:00
diff --git a/package.json b/package.json
@@ -160,6 +160,7 @@
     "promise-polyfill": "8.2.3",
     "rbush": "^2.0.2",
     "three": "0.150.1",
+    "urijs": "^1.19.11",
     "util": "^0.12.4",
     "xlsx": "https://cdn.sheetjs.com/xlsx-0.19.3/xlsx-0.19.3.tgz"
   },
diff --git a/src/common/commontypes/Util.js b/src/common/commontypes/Util.js
@@ -3,6 +3,7 @@
  * which accompanies this distribution and is available at http://www.apache.org/licenses/LICENSE-2.0.html.*/
 import { StringExt } from './BaseTypes';
 import { Geometry } from './Geometry';
+import URI from 'urijs';
 
 /**
  * @description 浏览器名称，依赖于 userAgent 属性，BROWSER_NAME 可以是空，或者以下浏览器：
@@ -129,28 +130,28 @@ const DOTS_PER_INCH = 96;
 const Util = {
 
   /**
-     * @memberOf CommonUtil
-     * @description 对象拷贝赋值。
-     * @param {Object} dest - 目标对象。
-     * @param {Object} arguments - 待拷贝的对象。
-     * @returns {Object} 赋值后的目标对象。
-     */
+   * @memberOf CommonUtil
+   * @description 对象拷贝赋值。
+   * @param {Object} dest - 目标对象。
+   * @param {Object} arguments - 待拷贝的对象。
+   * @returns {Object} 赋值后的目标对象。
+   */
   assign(dest) {
     for (var index = 0; index < Object.getOwnPropertyNames(arguments).length; index++) {
-        var arg = Object.getOwnPropertyNames(arguments)[index];
+      var arg = Object.getOwnPropertyNames(arguments)[index];
         if (arg == "caller" || arg == "callee" || arg == "length" || arg == "arguments") {
-            continue;
-        }
-        var obj = arguments[arg];
-        if (obj) {
-            for (var j = 0; j < Object.getOwnPropertyNames(obj).length; j++) {
-                var key = Object.getOwnPropertyNames(obj)[j];
+        continue;
+      }
+      var obj = arguments[arg];
+      if (obj) {
+        for (var j = 0; j < Object.getOwnPropertyNames(obj).length; j++) {
+          var key = Object.getOwnPropertyNames(obj)[j];
                 if (arg == "caller" || arg == "callee" || arg == "length" || arg == "arguments") {
-                    continue;
-                }
-                dest[key] = obj[key];
-            }
+            continue;
+          }
+          dest[key] = obj[key];
         }
+      }
     }
     return dest;
   },
@@ -667,46 +668,15 @@ const Util = {
     if (!url) {
       return true;
     }
-    var index = url.indexOf('//');
-    var documentUrl = document.location.toString();
-    var documentIndex = documentUrl.indexOf('//');
+    const index = url.indexOf('//');
     if (index === -1) {
       return true;
-    } else {
-      var protocol;
-      var substring = (protocol = url.substring(0, index));
-      var documentSubString = documentUrl.substring(documentIndex + 2);
-      documentIndex = documentSubString.indexOf('/');
-      var documentPortIndex = documentSubString.indexOf(':');
-      var documentDomainWithPort = documentSubString.substring(0, documentIndex);
-      //var documentPort;
-
-      var documentprotocol = document.location.protocol;
-      if (documentPortIndex !== -1) {
-        // documentPort = +documentSubString.substring(documentPortIndex, documentIndex);
-      } else {
-        documentDomainWithPort += ':' + (documentprotocol.toLowerCase() === 'http:' ? 80 : 443);
-      }
-      if (documentprotocol.toLowerCase() !== substring.toLowerCase()) {
-        return false;
-      }
-      substring = url.substring(index + 2);
-      var portIndex = substring.indexOf(':');
-      index = substring.indexOf('/');
-      var domainWithPort = substring.substring(0, index);
-      var domain;
-      if (portIndex !== -1) {
-        domain = substring.substring(0, portIndex);
-      } else {
-        domain = substring.substring(0, index);
-        domainWithPort += ':' + (protocol.toLowerCase() === 'http:' ? 80 : 443);
-      }
-      var documentDomain = document.domain;
-      if (domain === documentDomain && domainWithPort === documentDomainWithPort) {
-        return true;
-      }
     }
-    return false;
+    return Util.isSameDomain(url, document.location.toString());
+  },
+
+  isSameDomain(url, otherUrl) {
+    return new URI(url).normalize().origin() === new URI(otherUrl).normalize().origin();
   },
 
   /**
diff --git a/src/common/package.json b/src/common/package.json
@@ -25,6 +25,7 @@
     "mapv": "2.0.62",
     "flatgeobuf": "3.23.1",
     "rbush": "^2.0.2",
+    "urijs": "^1.19.11",
     "xlsx": "https://cdn.sheetjs.com/xlsx-0.19.3/xlsx-0.19.3.tgz"
   }
 }
diff --git a/test/common/commontypes/UtilSpec.js b/test/common/commontypes/UtilSpec.js
@@ -209,11 +209,21 @@ describe('Util', () => {
     it('isInTheSameDomain', () => {
         var Url = "https://iclient.supermap.io/examples/leaflet/editor.html#addressMatchService";
         var correct = Util.isInTheSameDomain(Url);
-        expect(correct).toBeFalsy(false);
-
+        expect(correct).toBeFalsy();
         var errorUrl = "httttttp:wwwwwww.bbbb";
         var error = Util.isInTheSameDomain(errorUrl);
-        expect(error).toBeTruthy(true);
+        expect(error).toBeTruthy();
+
+    });
+    it('isSameDomain', () => {
+        expect(Util.isSameDomain('https://test.com/b',"httttttp:wwwwwww.bbbb")).toBeFalsy();
+        expect(Util.isSameDomain('https://test.com/b','https://test.com')).toBeTruthy();
+        expect(Util.isSameDomain('https://test.com:443/b','https://test.com')).toBeTruthy();
+        expect(Util.isSameDomain('http://test.com/b','https://test.com')).toBeFalsy();
+        expect(Util.isSameDomain('http://test.com/b','http://test.com')).toBeTruthy();
+        expect(Util.isSameDomain('http://test.com:80/b','http://test.com')).toBeTruthy();
+        expect(Util.isSameDomain('https://test.com/b?epsg:4326','https://test.com')).toBeTruthy();
+
     });
 
     it("calculateDpi", () => {

Original file line number	Diff line number	Diff line change
`@@ -25,6 +25,7 @@`
`25`	`25`	`"mapv": "2.0.62",`
`26`	`26`	`"flatgeobuf": "3.23.1",`
`27`	`27`	`"rbush": "^2.0.2",`
	`28`	`+ "urijs": "^1.19.11",`
`28`	`29`	`"xlsx": "https://cdn.sheetjs.com/xlsx-0.19.3/xlsx-0.19.3.tgz"`
`29`	`30`	`}`
`30`	`31`	`}`