CodeMirror/uMatrix
1
0
Fork 0
mirror of https://github.com/gorhill/uMatrix.git synced 2024-05-06 05:13:42 +12:00
Code Issues Releases Wiki Activity

Fix broken handling of blocked document parameters

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

Regression from:
- https://github.com/gorhill/uMatrix/commit/9b292304d33a#diff-67a98e071667dfff264d50da29bb3a5cL38-R39
This commit is contained in:
Raymond Hill 2020-01-03 08:39:39 -05:00
parent f8c82add03
commit 3f4425d9db
No known key found for this signature in database
GPG key ID: 25E1490B761470C2
1 changed files with 8 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

16
src/js/tab.js
View file

@ -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();
}