From e921a1cc21193902a84016d633a9e10d82555bbd Mon Sep 17 00:00:00 2001
From: Andrey Lushnikov <aslushnikov@gmail.com>
Date: Sun, 27 Aug 2017 12:41:09 -0700
Subject: [PATCH] Fix Request Interception (#565)

It turned out that either Network.requestIntercepted or
Network.requestWillBeSent occasionally report encoded URL.

This patch starts decoding URL's when generating request hash.

Fixes #558.
---
 lib/Multimap.js       |  7 +++++++
 lib/NetworkManager.js |  3 ++-
 test/test.js          | 22 ++++++++++++++++++++++
 3 files changed, 31 insertions(+), 1 deletion(-)

diff --git a/lib/Multimap.js b/lib/Multimap.js
index cbb859bedc6..213a782cb47 100644
--- a/lib/Multimap.js
+++ b/lib/Multimap.js
@@ -122,6 +122,13 @@ class Multimap {
     return result;
   }
 
+  /**
+   * @return {!Array<!K>}
+   */
+  keysArray() {
+    return Array.from(this._map.keys());
+  }
+
   clear() {
     this._map.clear();
   }
diff --git a/lib/NetworkManager.js b/lib/NetworkManager.js
index 948fe8aaff2..453848fb72a 100644
--- a/lib/NetworkManager.js
+++ b/lib/NetworkManager.js
@@ -340,7 +340,8 @@ helper.tracePublicAPI(Response);
  */
 function generateRequestHash(request) {
   const hash = {
-    url: request.url,
+    // Decoding is necessary to normalize URLs. @see crbug.com/759388
+    url: decodeURI(request.url),
     method: request.method,
     postData: request.postData,
     headers: {},
diff --git a/test/test.js b/test/test.js
index 02c892cb87f..8f228857c76 100644
--- a/test/test.js
+++ b/test/test.js
@@ -938,6 +938,28 @@ describe('Page', function() {
       expect(requests.length).toBe(1);
       expect(requests[0].url).toBe(EMPTY_PAGE);
     }));
+    it('should work with encoded URLs', SX(async function() {
+      // The requestWillBeSent will report encoded URL, whereas interception will
+      // report URL as-is. @see crbug.com/759388
+      await page.setRequestInterceptionEnabled(true);
+      page.on('request', request => request.continue());
+      const response = await page.goto(PREFIX + '/some nonexisting page');
+      expect(response.status).toBe(404);
+    }));
+    it('should work with encoded URLs - 2', SX(async function() {
+      // The requestWillBeSent will report URL as-is, whereas interception will
+      // report encoded URL for stylesheet. @see crbug.com/759388
+      await page.setRequestInterceptionEnabled(true);
+      const requests = [];
+      page.on('request', request => {
+        request.continue();
+        requests.push(request);
+      });
+      const response = await page.goto(`data:text/html,<link rel="stylesheet" href="${PREFIX}/fonts?helvetica|arial"/>`);
+      expect(response.status).toBe(200);
+      expect(requests.length).toBe(2);
+      expect(requests[1].response().status).toBe(404);
+    }));
   });
 
   describe('Page.Events.Dialog', function() {