give up

GoogleChrome · Mar 14, 2017 · f61f42d · f61f42d
1 parent e6df2e5
commit f61f42d
Show file tree

Hide file tree

Showing 4 changed files with 33 additions and 5 deletions.
diff --git a/lighthouse-cli/test/smokehouse/byte-efficiency/expectations.js b/lighthouse-cli/test/smokehouse/byte-efficiency/expectations.js
@@ -39,10 +39,7 @@ module.exports = [
         extendedInfo: {
           value: {
             results: {
-              length: 4,
-              1: {
-                isCrossOrigin: true
-              }
+              length: 4
             }
           }
         }

diff --git a/lighthouse-core/gather/gatherers/dobetterweb/optimized-images.js b/lighthouse-core/gather/gatherers/dobetterweb/optimized-images.js
@@ -79,7 +79,7 @@ class OptimizedImages extends Gatherer {
 
       seenUrls.add(record._url);
       const isOptimizableImage = /image\/(png|bmp|jpeg)/.test(record._mimeType);
-      const isSameOrigin = URL.hostsMatch(pageUrl, record._url);
+      const isSameOrigin = URL.originsMatch(pageUrl, record._url);
       const isBase64DataUri = /^data:.{2,40}base64\s*,/.test(record._url);
 
       if (isOptimizableImage) {

diff --git a/lighthouse-core/lib/url-shim.js b/lighthouse-core/lib/url-shim.js
@@ -59,6 +59,19 @@ URL.hostsMatch = function hostsMatch(urlA, urlB) {
   }
 };
 
+/**
+ * @param {string} urlA
+ * @param {string} urlB
+ * @return {boolean}
+ */
+URL.originsMatch = function originsMatch(urlA, urlB) {
+  try {
+    return new URL(urlA).origin === new URL(urlB).origin;
+  } catch (e) {
+    return false;
+  }
+};
+
 /**
  * @param {string} url
  * @param {{numPathParts: number, preserveQuery: boolean, preserveHost: boolean}=} options

diff --git a/lighthouse-core/test/lib/url-shim-test.js b/lighthouse-core/test/lib/url-shim-test.js
@@ -58,6 +58,24 @@ describe('URL Shim', () => {
     assert.equal(URL.hostsMatch(urlA, urlB), false);
   });
 
+  it('safely identifies same origins', () => {
+    const urlA = 'https://5321212.fls.net/page?query=string#hash';
+    const urlB = 'https://5321212.fls.net/deeply/nested/page';
+    assert.ok(URL.originsMatch(urlA, urlB));
+  });
+
+  it('safely identifies different origins', () => {
+    const urlA = 'https://5321212.fls.net/page?query=string#hash';
+    const urlB = 'http://5321212.fls.net/deeply/nested/page';
+    assert.equal(URL.originsMatch(urlA, urlB), false);
+  });
+
+  it('safely identifies different invalid origins', () => {
+    const urlA = 'https://google.com/page?query=string#hash';
+    const urlB = 'anonymous:90';
+    assert.equal(URL.originsMatch(urlA, urlB), false);
+  });
+
   describe('getDisplayName', () => {
     it('respects numPathParts option', () => {
       const url = 'http://example.com/a/deep/nested/file.css';