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][safari] Remove doc from removeParams rules

Browse source 
Related issues:
- https://github.com/uBlockOrigin/uBOL-home/issues/476
- https://github.com/uBlockOrigin/uBOL-home/issues/409
This commit is contained in:
Raymond Hill 2025-09-17 13:34:28 -04:00
parent b3b2142fb6
commit 836e04d110
No known key found for this signature in database
GPG key ID: 25E1490B761470C2
1 changed files with 44 additions and 29 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

73
platform/mv3/safari/patch-ruleset.js
View file

@ -19,38 +19,53 @@
Home: https://github.com/gorhill/uBlock
*/
function patchRule(rule, out) {
const copy = structuredClone(rule);
const condition = copy.condition;
if ( copy.action.type === 'modifyHeaders' ) { return; }
if ( Array.isArray(copy.condition.responseHeaders) ) { return; }
if ( Array.isArray(condition.requestMethods) ) { return; }
if ( Array.isArray(condition.excludedRequestMethods) ) { return; }
// https://github.com/uBlockOrigin/uBOL-home/issues/476#issuecomment-3299309478
if ( copy.action.redirect?.transform?.queryTransform?.removeParams ) {
const resourceTypes = condition.resourceTypes;
if ( resourceTypes?.includes('main_frame') ) {
condition.resourceTypes = resourceTypes.filter(a => a !== 'main_frame');
if ( condition.resourceTypes.length === 0 ) { return; }
}
}
if ( Array.isArray(condition.initiatorDomains) ) {
condition.domains = condition.initiatorDomains;
delete condition.initiatorDomains;
}
if ( Array.isArray(condition.excludedInitiatorDomains) ) {
condition.excludedDomains = condition.excludedInitiatorDomains;
delete condition.excludedInitiatorDomains;
}
// https://github.com/uBlockOrigin/uBOL-home/issues/434
let { urlFilter } = condition;
if ( urlFilter?.endsWith('^') ) {
urlFilter = urlFilter.slice(0, -1);
const match = /^(.*?\/\/|\|\|)/.exec(urlFilter);
const pattern = match
? urlFilter.slice(match[0].length)
: urlFilter;
if ( /[^\w.%*-]/.test(pattern) ) {
const extra = structuredClone(copy);
extra.condition.urlFilter = `${urlFilter}|`;
out.push(extra);
console.log(`\tAdd ${extra.condition.urlFilter}`);
}
}
out.push(copy);
return copy;
}
export function patchRuleset(ruleset) {
const out = [];
for ( const rule of ruleset ) {
const condition = rule.condition;
if ( rule.action.type === 'modifyHeaders' ) { continue; }
if ( Array.isArray(rule.condition.responseHeaders) ) { continue; }
if ( Array.isArray(condition.requestMethods) ) { continue; }
if ( Array.isArray(condition.excludedRequestMethods) ) { continue; }
if ( Array.isArray(condition.initiatorDomains) ) {
condition.domains = condition.initiatorDomains;
delete condition.initiatorDomains;
}
if ( Array.isArray(condition.excludedInitiatorDomains) ) {
condition.excludedDomains = condition.excludedInitiatorDomains;
delete condition.excludedInitiatorDomains;
}
// https://github.com/uBlockOrigin/uBOL-home/issues/434
let { urlFilter } = condition;
if ( urlFilter?.endsWith('^') ) {
urlFilter = urlFilter.slice(0, -1);
const match = /^(.*?\/\/|\|\|)/.exec(urlFilter);
const pattern = match
? urlFilter.slice(match[0].length)
: urlFilter;
if ( /[^\w.%*-]/.test(pattern) ) {
const extra = structuredClone(rule);
extra.condition.urlFilter = `${urlFilter}|`;
out.push(extra);
console.log(`Patching to ${extra.condition.urlFilter}`);
}
}
out.push(rule);
if ( patchRule(rule, out) ) { continue; }
console.log(`\tReject ${JSON.stringify(rule)}`);
}
return out;
}