prehistoric-systems/uBlock
1
0
Fork 0
mirror of https://github.com/gorhill/uBlock.git synced 2026-03-11 09:04:36 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

[mv3] Use parameter name as url filter where possible

Browse source 
Related issue:
https://github.com/uBlockOrigin/uBOL-home/discussions/575
This commit is contained in:
Raymond Hill 2025-12-28 09:48:20 -05:00
parent 41dd3bf5f2
commit 85f587162f
No known key found for this signature in database
GPG key ID: F5630CAE62A14316
1 changed files with 14 additions and 15 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

29
src/js/static-net-filtering.js
View file

@ -4732,19 +4732,20 @@ StaticNetFilteringEngine.prototype.dnrFromCompiled = function(op, context, ...ar
}
case 'removeparam': {
rule.action.type = 'redirect';
if ( rule.__modifierValue === '|' ) {
rule.__modifierValue = '';
let paramName = rule.__modifierValue;
if ( paramName === '|' ) {
paramName = '';
}
if ( rule.__modifierValue !== '' ) {
if ( paramName !== '' ) {
rule.action.redirect = {
transform: {
queryTransform: {
removeParams: [ rule.__modifierValue ]
removeParams: [ paramName ]
}
}
};
if ( /^~?\/.+\/$/.test(rule.__modifierValue) ) {
dnrAddRuleError(rule, `Unsupported regex-based removeParam: ${rule.__modifierValue}`);
if ( /^~?\/.+\/$/.test(paramName) ) {
dnrAddRuleError(rule, `Unsupported regex-based removeParam: ${paramName}`);
}
} else {
rule.action.redirect = {
@ -4766,15 +4767,13 @@ StaticNetFilteringEngine.prototype.dnrFromCompiled = function(op, context, ...ar
];
}
}
// https://github.com/uBlockOrigin/uBOL-home/issues/140
// Mitigate until DNR API flaw is addressed by browser vendors
let priority = rule.priority || 1;
if ( rule.condition.urlFilter !== undefined ) { priority += 1; }
if ( rule.condition.regexFilter !== undefined ) { priority += 1; }
if ( rule.condition.initiatorDomains !== undefined ) { priority += 1; }
if ( rule.condition.requestDomains !== undefined ) { priority += 1; }
if ( priority !== 1 ) {
rule.priority = priority;
// https://github.com/uBlockOrigin/uBOL-home/discussions/575
if ( rule.condition.urlFilter === undefined ) {
if ( rule.condition.regexFilter === undefined ) {
if ( paramName !== '' ) {
rule.condition.urlFilter = `^${paramName}=`;
}
}
}
if ( rule.__modifierAction === ALLOW_REALM ) {
dnrAddRuleError(rule, `Unsupported removeparam exception: ${rule.__modifierValue}`);