fix: do not throw when checking URL equality (#1973)

GoogleChrome · Apr 7, 2017 · 75d2768 · 75d2768
1 parent 17046b3
commit 75d2768
Show file tree

Hide file tree

Showing 2 changed files with 19 additions and 6 deletions.
diff --git a/lighthouse-core/lib/url-shim.js b/lighthouse-core/lib/url-shim.js
@@ -152,14 +152,17 @@ function rewriteChromeInternalUrl(url) {
  */
 URL.equalWithExcludedFragments = function(url1, url2) {
   [url1, url2] = [url1, url2].map(rewriteChromeInternalUrl);
+  try {
+    url1 = new URL(url1);
+    url1.hash = '';
 
-  url1 = new URL(url1);
-  url1.hash = '';
-
-  url2 = new URL(url2);
-  url2.hash = '';
+    url2 = new URL(url2);
+    url2.hash = '';
 
-  return url1.href === url2.href;
+    return url1.href === url2.href;
+  } catch (e) {
+    return false;
+  }
 };
 
 module.exports = URL;
diff --git a/lighthouse-core/test/lib/url-shim-test.js b/lighthouse-core/test/lib/url-shim-test.js
@@ -29,6 +29,12 @@ describe('URL Shim', () => {
     assert.doesNotThrow(_ => new URL(url));
   });
 
+  it.skip('handles URLs with multiple dashes', () => {
+    // from https://github.com/GoogleChrome/lighthouse/issues/1972
+    const url = 'https://r15---sn-o097znl7.googlevideo.com/generate_204?conn2';
+    assert.doesNotThrow(_ => new URL(url));
+  });
+
   it('safely identifies valid URLs', () => {
     assert.ok(URL.isValid('https://5321212.fls.net/page?query=string#hash'));
     assert.ok(URL.isValid('https://localhost:8080/page?query=string#hash'));
@@ -177,5 +183,9 @@ describe('URL Shim', () => {
       ];
       assert.ok(URL.equalWithExcludedFragments(...pair));
     });
+
+    it('returns false for invalid URLs', () => {
+      assert.ok(!URL.equalWithExcludedFragments('utter nonsense', 'http://example.com'));
+    });
   });
 });