Mirrors
/
uBlock
mirror of https://github.com/gorhill/uBlock.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Do not redirect when no query parameters are removed 

Related issue:
- https://github.com/uBlockOrigin/uBlock-issues/issues/1626
This commit is contained in:
Raymond Hill 2021-06-12 13:26:21 -04:00
parent 40c75b63e6
commit 8877ea290e
No known key found for this signature in database
GPG Key ID: 25E1490B761470C2
1 changed files with 14 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
src/js/static-net-filtering.js
View File

@ -4268,6 +4268,9 @@ FilterContainer.compareRedirectRequests = function(a, b) {
/******************************************************************************/
// https://github.com/uBlockOrigin/uBlock-issues/issues/1626
// Do not redirect when the number of query parameters does not change.
FilterContainer.prototype.filterQuery = function(fctxt) {
const directives = this.matchAndFetchModifiers(fctxt, 'queryprune');
if ( directives === undefined ) { return; }
@ -4277,6 +4280,7 @@ FilterContainer.prototype.filterQuery = function(fctxt) {
let hpos = url.indexOf('#', qpos + 1);
if ( hpos === -1 ) { hpos = url.length; }
const params = new Map(new self.URLSearchParams(url.slice(qpos + 1, hpos)));
const inParamCount = params.size;
const out = [];
for ( const directive of directives ) {
if ( params.size === 0 ) { break; }
@ -4322,14 +4326,16 @@ FilterContainer.prototype.filterQuery = function(fctxt) {
}
}
if ( out.length === 0 ) { return; }
fctxt.redirectURL = url.slice(0, qpos);
if ( params.size !== 0 ) {
fctxt.redirectURL += '?' + Array.from(params).map(a =>
a[1] === '' ? a[0] : `${a[0]}=${encodeURIComponent(a[1])}`
).join('&');
}
if ( hpos !== url.length ) {
fctxt.redirectURL += url.slice(hpos);
if ( params.size !== inParamCount ) {
fctxt.redirectURL = url.slice(0, qpos);
if ( params.size !== 0 ) {
fctxt.redirectURL += '?' + Array.from(params).map(a =>
a[1] === '' ? a[0] : `${a[0]}=${encodeURIComponent(a[1])}`
).join('&');
}
if ( hpos !== url.length ) {
fctxt.redirectURL += url.slice(hpos);
}
}
return out;
};