From 3f4425d9dbd4faedf00f221088ac13395862f439 Mon Sep 17 00:00:00 2001
From: Raymond Hill <rhill@raymondhill.net>
Date: Fri, 3 Jan 2020 08:39:39 -0500
Subject: [PATCH] Fix broken handling of blocked document parameters

Related issue:
- https://github.com/uBlockOrigin/uMatrix-issues/issues/214

Regression from:
- https://github.com/gorhill/uMatrix/commit/9b292304d33a#diff-67a98e071667dfff264d50da29bb3a5cL38-R39
---
 src/js/tab.js | 16 ++++++++--------
 1 file changed, 8 insertions(+), 8 deletions(-)

diff --git a/src/js/tab.js b/src/js/tab.js
index 0f8d7d6..5876fd5 100644
--- a/src/js/tab.js
+++ b/src/js/tab.js
@@ -55,7 +55,7 @@ const µm = µMatrix;
     //   its APIs, but since this is not the case, uMatrix inherits the duty to
     //   make it seamless on its side.
     if ( pageURL.startsWith('wyciwyg:') ) {
-        let match = /^wyciwyg:\/\/\d+\//.exec(pageURL);
+        const match = /^wyciwyg:\/\/\d+\//.exec(pageURL);
         if ( match !== null ) {
             pageURL = pageURL.slice(match[0].length);
         }
@@ -64,18 +64,18 @@ const µm = µMatrix;
     // If the URL is that of our "blocked page" document, return the URL of
     // the blocked page.
     if ( pageURL.startsWith(vAPI.getURL('main-blocked.html')) ) {
-        let matches = /main-blocked\.html\?details=([^&]+)/.exec(pageURL);
-        if ( matches && matches.length === 2 ) {
+        const parsedURL = new URL(pageURL);
+        const details = parsedURL.searchParams.get('details');
+        if ( details ) {
             try {
-                let details = JSON.parse(atob(matches[1]));
-                pageURL = details.url;
-            } catch (e) {
+                pageURL = JSON.parse(decodeURIComponent(details)).url;
+            } catch (ex) {
             }
         }
     }
 
-    let uri = this.URI.set(pageURL);
-    let scheme = uri.scheme;
+    const uri = this.URI.set(pageURL);
+    const scheme = uri.scheme;
     if ( scheme === 'https' || scheme === 'http' ) {
         return uri.normalizedURI();
     }