2022-09-06 11:47:52 -06:00
|
|
|
/*******************************************************************************
|
|
|
|
|
|
|
|
uBlock Origin - a browser extension to block requests.
|
|
|
|
Copyright (C) 2022-present Raymond Hill
|
|
|
|
|
|
|
|
This program is free software: you can redistribute it and/or modify
|
|
|
|
it under the terms of the GNU General Public License as published by
|
|
|
|
the Free Software Foundation, either version 3 of the License, or
|
|
|
|
(at your option) any later version.
|
|
|
|
|
|
|
|
This program is distributed in the hope that it will be useful,
|
|
|
|
but WITHOUT ANY WARRANTY; without even the implied warranty of
|
|
|
|
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
|
|
|
GNU General Public License for more details.
|
|
|
|
|
|
|
|
You should have received a copy of the GNU General Public License
|
|
|
|
along with this program. If not, see {http://www.gnu.org/licenses/}.
|
|
|
|
|
|
|
|
Home: https://github.com/gorhill/uBlock
|
|
|
|
*/
|
|
|
|
|
|
|
|
'use strict';
|
|
|
|
|
|
|
|
/******************************************************************************/
|
|
|
|
|
|
|
|
import fs from 'fs/promises';
|
2022-09-06 13:05:01 -06:00
|
|
|
import https from 'https';
|
2022-09-15 11:14:08 -06:00
|
|
|
import path from 'path';
|
2022-09-06 11:47:52 -06:00
|
|
|
import process from 'process';
|
2022-09-15 11:14:08 -06:00
|
|
|
import { createHash } from 'crypto';
|
2022-10-16 10:05:24 -06:00
|
|
|
import redirectResourcesMap from './js/redirect-resources.js';
|
2022-09-06 11:47:52 -06:00
|
|
|
import { dnrRulesetFromRawLists } from './js/static-dnr-filtering.js';
|
2022-09-20 06:24:01 -06:00
|
|
|
import { fnameFromFileId } from './js/utils.js';
|
2023-01-23 14:53:18 -07:00
|
|
|
import * as sfp from './js/static-filtering-parser.js';
|
2022-09-06 11:47:52 -06:00
|
|
|
|
|
|
|
/******************************************************************************/
|
|
|
|
|
|
|
|
const commandLineArgs = (( ) => {
|
|
|
|
const args = new Map();
|
|
|
|
let name, value;
|
|
|
|
for ( const arg of process.argv.slice(2) ) {
|
|
|
|
const pos = arg.indexOf('=');
|
|
|
|
if ( pos === -1 ) {
|
|
|
|
name = arg;
|
|
|
|
value = '';
|
|
|
|
} else {
|
|
|
|
name = arg.slice(0, pos);
|
|
|
|
value = arg.slice(pos+1);
|
|
|
|
}
|
|
|
|
args.set(name, value);
|
|
|
|
}
|
|
|
|
return args;
|
|
|
|
})();
|
|
|
|
|
2022-09-16 13:56:35 -06:00
|
|
|
const outputDir = commandLineArgs.get('output') || '.';
|
|
|
|
const cacheDir = `${outputDir}/../mv3-data`;
|
|
|
|
const rulesetDir = `${outputDir}/rulesets`;
|
2022-10-15 11:05:20 -06:00
|
|
|
const scriptletDir = `${rulesetDir}/scripting`;
|
2022-09-30 07:18:52 -06:00
|
|
|
const env = [
|
|
|
|
'chromium',
|
2022-10-11 10:02:33 -06:00
|
|
|
'mv3',
|
2022-09-30 07:18:52 -06:00
|
|
|
'native_css_has',
|
|
|
|
'ublock',
|
|
|
|
'ubol',
|
|
|
|
'user_stylesheet',
|
|
|
|
];
|
2022-09-16 13:56:35 -06:00
|
|
|
|
2022-09-06 11:47:52 -06:00
|
|
|
/******************************************************************************/
|
|
|
|
|
2022-09-18 15:07:02 -06:00
|
|
|
const jsonSetMapReplacer = (k, v) => {
|
|
|
|
if ( v instanceof Set || v instanceof Map ) {
|
|
|
|
if ( v.size === 0 ) { return; }
|
|
|
|
return Array.from(v);
|
|
|
|
}
|
|
|
|
return v;
|
|
|
|
};
|
|
|
|
|
2022-09-19 18:19:55 -06:00
|
|
|
const uidint32 = (s) => {
|
|
|
|
const h = createHash('sha256').update(s).digest('hex').slice(0,8);
|
|
|
|
return parseInt(h,16) & 0x7FFFFFFF;
|
|
|
|
};
|
2022-09-18 15:07:02 -06:00
|
|
|
|
2022-09-29 17:51:33 -06:00
|
|
|
const hnSort = (a, b) =>
|
|
|
|
a.split('.').reverse().join('.').localeCompare(
|
|
|
|
b.split('.').reverse().join('.')
|
|
|
|
);
|
|
|
|
|
2022-09-18 15:07:02 -06:00
|
|
|
/******************************************************************************/
|
|
|
|
|
2022-09-13 15:44:24 -06:00
|
|
|
const stdOutput = [];
|
|
|
|
|
|
|
|
const log = (text, silent = false) => {
|
|
|
|
stdOutput.push(text);
|
|
|
|
if ( silent === false ) {
|
|
|
|
console.log(text);
|
|
|
|
}
|
|
|
|
};
|
|
|
|
|
|
|
|
/******************************************************************************/
|
|
|
|
|
2022-09-15 11:14:08 -06:00
|
|
|
const urlToFileName = url => {
|
|
|
|
return url
|
|
|
|
.replace(/^https?:\/\//, '')
|
|
|
|
.replace(/\//g, '_')
|
|
|
|
;
|
|
|
|
};
|
|
|
|
|
|
|
|
const fetchList = (url, cacheDir) => {
|
2022-09-13 15:44:24 -06:00
|
|
|
return new Promise((resolve, reject) => {
|
2022-09-15 11:14:08 -06:00
|
|
|
const fname = urlToFileName(url);
|
|
|
|
fs.readFile(`${cacheDir}/${fname}`, { encoding: 'utf8' }).then(content => {
|
|
|
|
log(`\tFetched local ${url}`);
|
|
|
|
resolve({ url, content });
|
|
|
|
}).catch(( ) => {
|
|
|
|
log(`\tFetching remote ${url}`);
|
|
|
|
https.get(url, response => {
|
|
|
|
const data = [];
|
|
|
|
response.on('data', chunk => {
|
|
|
|
data.push(chunk.toString());
|
|
|
|
});
|
|
|
|
response.on('end', ( ) => {
|
|
|
|
const content = data.join('');
|
|
|
|
try {
|
|
|
|
writeFile(`${cacheDir}/${fname}`, content);
|
|
|
|
} catch (ex) {
|
|
|
|
}
|
|
|
|
resolve({ url, content });
|
|
|
|
});
|
|
|
|
}).on('error', error => {
|
|
|
|
reject(error);
|
2022-09-13 15:44:24 -06:00
|
|
|
});
|
|
|
|
});
|
|
|
|
});
|
|
|
|
};
|
|
|
|
|
|
|
|
/******************************************************************************/
|
|
|
|
|
2022-09-15 11:14:08 -06:00
|
|
|
const writeFile = async (fname, data) => {
|
|
|
|
const dir = path.dirname(fname);
|
|
|
|
await fs.mkdir(dir, { recursive: true });
|
2022-09-16 13:56:35 -06:00
|
|
|
const promise = fs.writeFile(fname, data);
|
|
|
|
writeOps.push(promise);
|
|
|
|
return promise;
|
2022-09-15 11:14:08 -06:00
|
|
|
};
|
|
|
|
|
2022-10-16 10:05:24 -06:00
|
|
|
const copyFile = async (from, to) => {
|
|
|
|
const dir = path.dirname(to);
|
|
|
|
await fs.mkdir(dir, { recursive: true });
|
|
|
|
const promise = fs.copyFile(from, to);
|
|
|
|
writeOps.push(promise);
|
|
|
|
return promise;
|
|
|
|
};
|
|
|
|
|
2022-09-16 13:56:35 -06:00
|
|
|
const writeOps = [];
|
2022-09-15 11:14:08 -06:00
|
|
|
|
2022-09-16 13:56:35 -06:00
|
|
|
/******************************************************************************/
|
2022-09-06 11:47:52 -06:00
|
|
|
|
2022-09-16 13:56:35 -06:00
|
|
|
const ruleResources = [];
|
|
|
|
const rulesetDetails = [];
|
2022-10-15 11:05:20 -06:00
|
|
|
const declarativeDetails = new Map();
|
|
|
|
const proceduralDetails = new Map();
|
|
|
|
const scriptletStats = new Map();
|
|
|
|
const specificDetails = new Map();
|
|
|
|
const genericDetails = new Map();
|
2022-10-16 10:05:24 -06:00
|
|
|
const requiredRedirectResources = new Set();
|
2022-09-13 15:44:24 -06:00
|
|
|
|
2022-09-16 13:56:35 -06:00
|
|
|
/******************************************************************************/
|
2022-09-06 11:47:52 -06:00
|
|
|
|
2022-09-16 13:56:35 -06:00
|
|
|
async function fetchAsset(assetDetails) {
|
|
|
|
// Remember fetched URLs
|
|
|
|
const fetchedURLs = new Set();
|
|
|
|
|
|
|
|
// Fetch list and expand `!#include` directives
|
|
|
|
let parts = assetDetails.urls.map(url => ({ url }));
|
|
|
|
while ( parts.every(v => typeof v === 'string') === false ) {
|
|
|
|
const newParts = [];
|
|
|
|
for ( const part of parts ) {
|
|
|
|
if ( typeof part === 'string' ) {
|
|
|
|
newParts.push(part);
|
|
|
|
continue;
|
|
|
|
}
|
|
|
|
if ( fetchedURLs.has(part.url) ) {
|
|
|
|
newParts.push('');
|
|
|
|
continue;
|
|
|
|
}
|
|
|
|
fetchedURLs.add(part.url);
|
|
|
|
newParts.push(
|
|
|
|
fetchList(part.url, cacheDir).then(details => {
|
|
|
|
const { url } = details;
|
|
|
|
const content = details.content.trim();
|
|
|
|
if ( typeof content === 'string' && content !== '' ) {
|
|
|
|
if (
|
|
|
|
content.startsWith('<') === false ||
|
|
|
|
content.endsWith('>') === false
|
|
|
|
) {
|
|
|
|
return { url, content };
|
|
|
|
}
|
|
|
|
}
|
|
|
|
log(`No valid content for ${details.name}`);
|
|
|
|
return { url, content: '' };
|
|
|
|
})
|
|
|
|
);
|
|
|
|
}
|
|
|
|
parts = await Promise.all(newParts);
|
2023-01-23 14:53:18 -07:00
|
|
|
parts = sfp.utils.preparser.expandIncludes(parts, env);
|
2022-09-16 13:56:35 -06:00
|
|
|
}
|
|
|
|
const text = parts.join('\n');
|
2022-09-10 12:20:07 -06:00
|
|
|
|
2022-09-16 13:56:35 -06:00
|
|
|
if ( text === '' ) {
|
|
|
|
log('No filterset found');
|
2022-09-10 12:20:07 -06:00
|
|
|
}
|
2022-09-16 13:56:35 -06:00
|
|
|
return text;
|
|
|
|
}
|
2022-09-10 12:20:07 -06:00
|
|
|
|
2022-09-16 13:56:35 -06:00
|
|
|
/******************************************************************************/
|
2022-09-10 12:20:07 -06:00
|
|
|
|
2022-09-27 05:46:24 -06:00
|
|
|
const isUnsupported = rule =>
|
|
|
|
rule._error !== undefined;
|
|
|
|
|
|
|
|
const isRegex = rule =>
|
|
|
|
rule.condition !== undefined &&
|
|
|
|
rule.condition.regexFilter !== undefined;
|
|
|
|
|
|
|
|
const isRedirect = rule =>
|
|
|
|
rule.action !== undefined &&
|
|
|
|
rule.action.type === 'redirect' &&
|
|
|
|
rule.action.redirect.extensionPath !== undefined;
|
|
|
|
|
|
|
|
const isCsp = rule =>
|
|
|
|
rule.action !== undefined &&
|
|
|
|
rule.action.type === 'modifyHeaders';
|
|
|
|
|
|
|
|
const isRemoveparam = rule =>
|
|
|
|
rule.action !== undefined &&
|
|
|
|
rule.action.type === 'redirect' &&
|
|
|
|
rule.action.redirect.transform !== undefined;
|
|
|
|
|
|
|
|
const isGood = rule =>
|
|
|
|
isUnsupported(rule) === false &&
|
|
|
|
isRedirect(rule) === false &&
|
|
|
|
isCsp(rule) === false &&
|
|
|
|
isRemoveparam(rule) === false;
|
|
|
|
|
|
|
|
/******************************************************************************/
|
|
|
|
|
2022-09-16 13:56:35 -06:00
|
|
|
async function processNetworkFilters(assetDetails, network) {
|
2022-09-06 11:47:52 -06:00
|
|
|
const replacer = (k, v) => {
|
2022-09-27 08:57:43 -06:00
|
|
|
if ( k.startsWith('_') ) { return; }
|
2022-09-06 11:47:52 -06:00
|
|
|
if ( Array.isArray(v) ) {
|
|
|
|
return v.sort();
|
|
|
|
}
|
|
|
|
if ( v instanceof Object ) {
|
|
|
|
const sorted = {};
|
|
|
|
for ( const kk of Object.keys(v).sort() ) {
|
|
|
|
sorted[kk] = v[kk];
|
|
|
|
}
|
|
|
|
return sorted;
|
|
|
|
}
|
|
|
|
return v;
|
|
|
|
};
|
|
|
|
|
2022-09-16 13:56:35 -06:00
|
|
|
const { ruleset: rules } = network;
|
|
|
|
log(`Input filter count: ${network.filterCount}`);
|
|
|
|
log(`\tAccepted filter count: ${network.acceptedFilterCount}`);
|
|
|
|
log(`\tRejected filter count: ${network.rejectedFilterCount}`);
|
|
|
|
log(`Output rule count: ${rules.length}`);
|
2022-09-06 11:47:52 -06:00
|
|
|
|
2022-09-29 17:51:33 -06:00
|
|
|
const plainGood = rules.filter(rule => isGood(rule) && isRegex(rule) === false);
|
|
|
|
log(`\tPlain good: ${plainGood.length}`);
|
2022-09-13 15:44:24 -06:00
|
|
|
|
2022-09-16 13:56:35 -06:00
|
|
|
const regexes = rules.filter(rule => isGood(rule) && isRegex(rule));
|
|
|
|
log(`\tMaybe good (regexes): ${regexes.length}`);
|
2022-09-13 15:44:24 -06:00
|
|
|
|
2022-09-16 13:56:35 -06:00
|
|
|
const redirects = rules.filter(rule =>
|
|
|
|
isUnsupported(rule) === false &&
|
|
|
|
isRedirect(rule)
|
|
|
|
);
|
2022-10-16 10:05:24 -06:00
|
|
|
redirects.forEach(rule => {
|
|
|
|
requiredRedirectResources.add(
|
|
|
|
rule.action.redirect.extensionPath.replace(/^\/+/, '')
|
|
|
|
);
|
|
|
|
});
|
|
|
|
log(`\tredirect=: ${redirects.length}`);
|
2022-09-06 11:47:52 -06:00
|
|
|
|
2022-09-29 17:51:33 -06:00
|
|
|
const removeparamsGood = rules.filter(rule =>
|
|
|
|
isUnsupported(rule) === false && isRemoveparam(rule)
|
2022-09-16 13:56:35 -06:00
|
|
|
);
|
2022-09-29 17:51:33 -06:00
|
|
|
const removeparamsBad = rules.filter(rule =>
|
|
|
|
isUnsupported(rule) && isRemoveparam(rule)
|
|
|
|
);
|
|
|
|
log(`\tremoveparams= (accepted/discarded): ${removeparamsGood.length}/${removeparamsBad.length}`);
|
2022-09-06 11:47:52 -06:00
|
|
|
|
2022-11-05 09:09:06 -06:00
|
|
|
const csps = rules.filter(rule =>
|
|
|
|
isUnsupported(rule) === false &&
|
|
|
|
isCsp(rule)
|
|
|
|
);
|
|
|
|
log(`\tcsp=: ${csps.length}`);
|
|
|
|
|
2022-09-16 13:56:35 -06:00
|
|
|
const bad = rules.filter(rule =>
|
|
|
|
isUnsupported(rule)
|
|
|
|
);
|
|
|
|
log(`\tUnsupported: ${bad.length}`);
|
2022-09-29 17:51:33 -06:00
|
|
|
log(bad.map(rule => rule._error.map(v => `\t\t${v}`)).join('\n'), true);
|
2022-09-06 11:47:52 -06:00
|
|
|
|
2022-09-16 13:56:35 -06:00
|
|
|
writeFile(
|
2022-10-15 11:05:20 -06:00
|
|
|
`${rulesetDir}/main/${assetDetails.id}.json`,
|
2022-10-18 14:06:27 -06:00
|
|
|
`${JSON.stringify(plainGood, replacer, 1)}\n`
|
2022-09-16 13:56:35 -06:00
|
|
|
);
|
2022-09-06 11:47:52 -06:00
|
|
|
|
2022-09-16 13:56:35 -06:00
|
|
|
if ( regexes.length !== 0 ) {
|
|
|
|
writeFile(
|
2022-10-16 10:05:24 -06:00
|
|
|
`${rulesetDir}/regex/${assetDetails.id}.json`,
|
2022-10-18 14:06:27 -06:00
|
|
|
`${JSON.stringify(regexes, replacer, 1)}\n`
|
2022-09-06 11:47:52 -06:00
|
|
|
);
|
2022-09-16 13:56:35 -06:00
|
|
|
}
|
2022-09-06 11:47:52 -06:00
|
|
|
|
2022-09-29 17:51:33 -06:00
|
|
|
if ( removeparamsGood.length !== 0 ) {
|
|
|
|
writeFile(
|
2022-10-16 10:05:24 -06:00
|
|
|
`${rulesetDir}/removeparam/${assetDetails.id}.json`,
|
2022-10-18 14:06:27 -06:00
|
|
|
`${JSON.stringify(removeparamsGood, replacer, 1)}\n`
|
2022-09-29 17:51:33 -06:00
|
|
|
);
|
|
|
|
}
|
|
|
|
|
2022-10-16 10:05:24 -06:00
|
|
|
if ( redirects.length !== 0 ) {
|
|
|
|
writeFile(
|
|
|
|
`${rulesetDir}/redirect/${assetDetails.id}.json`,
|
2022-10-18 14:06:27 -06:00
|
|
|
`${JSON.stringify(redirects, replacer, 1)}\n`
|
2022-10-16 10:05:24 -06:00
|
|
|
);
|
|
|
|
}
|
|
|
|
|
2022-11-05 09:09:06 -06:00
|
|
|
if ( csps.length !== 0 ) {
|
|
|
|
writeFile(
|
|
|
|
`${rulesetDir}/csp/${assetDetails.id}.json`,
|
|
|
|
`${JSON.stringify(csps, replacer, 1)}\n`
|
|
|
|
);
|
|
|
|
}
|
|
|
|
|
2022-09-16 13:56:35 -06:00
|
|
|
return {
|
|
|
|
total: rules.length,
|
2022-09-29 17:51:33 -06:00
|
|
|
plain: plainGood.length,
|
2022-11-05 09:09:06 -06:00
|
|
|
discarded: removeparamsBad.length,
|
2022-09-16 13:56:35 -06:00
|
|
|
rejected: bad.length,
|
2022-10-16 10:05:24 -06:00
|
|
|
regex: regexes.length,
|
|
|
|
removeparam: removeparamsGood.length,
|
|
|
|
redirect: redirects.length,
|
2022-11-05 09:09:06 -06:00
|
|
|
csp: csps.length,
|
2022-09-16 13:56:35 -06:00
|
|
|
};
|
|
|
|
}
|
2022-09-06 11:47:52 -06:00
|
|
|
|
2022-09-16 13:56:35 -06:00
|
|
|
/******************************************************************************/
|
|
|
|
|
2022-09-19 06:55:45 -06:00
|
|
|
// TODO: unify css/scriptlet processing code since now css styles are
|
|
|
|
// injected using scriptlet injection.
|
|
|
|
|
|
|
|
// Load all available scriptlets into a key-val map, where the key is the
|
|
|
|
// scriptlet token, and val is the whole content of the file.
|
|
|
|
|
|
|
|
const scriptletDealiasingMap = new Map();
|
|
|
|
let scriptletsMapPromise;
|
|
|
|
|
|
|
|
function loadAllSourceScriptlets() {
|
|
|
|
if ( scriptletsMapPromise !== undefined ) {
|
|
|
|
return scriptletsMapPromise;
|
|
|
|
}
|
|
|
|
|
|
|
|
scriptletsMapPromise = fs.readdir('./scriptlets').then(files => {
|
|
|
|
const reScriptletNameOrAlias = /^\/\/\/\s+(?:name|alias)\s+(\S+)/gm;
|
|
|
|
const readPromises = [];
|
|
|
|
for ( const file of files ) {
|
|
|
|
readPromises.push(
|
|
|
|
fs.readFile(`./scriptlets/${file}`, { encoding: 'utf8' })
|
|
|
|
);
|
|
|
|
}
|
|
|
|
return Promise.all(readPromises).then(results => {
|
|
|
|
const originalScriptletMap = new Map();
|
|
|
|
for ( const text of results ) {
|
|
|
|
const aliasSet = new Set();
|
|
|
|
for (;;) {
|
|
|
|
const match = reScriptletNameOrAlias.exec(text);
|
|
|
|
if ( match === null ) { break; }
|
|
|
|
aliasSet.add(match[1]);
|
|
|
|
}
|
|
|
|
if ( aliasSet.size === 0 ) { continue; }
|
|
|
|
const aliases = Array.from(aliasSet);
|
|
|
|
originalScriptletMap.set(aliases[0], text);
|
|
|
|
for ( let i = 0; i < aliases.length; i++ ) {
|
|
|
|
scriptletDealiasingMap.set(aliases[i], aliases[0]);
|
|
|
|
}
|
|
|
|
}
|
|
|
|
return originalScriptletMap;
|
|
|
|
});
|
|
|
|
});
|
|
|
|
|
|
|
|
return scriptletsMapPromise;
|
|
|
|
}
|
|
|
|
|
|
|
|
/******************************************************************************/
|
|
|
|
|
|
|
|
const globalPatchedScriptletsSet = new Set();
|
|
|
|
|
2022-09-29 17:51:33 -06:00
|
|
|
function addScriptingAPIResources(id, hostnames, fid) {
|
|
|
|
if ( hostnames === undefined ) { return; }
|
|
|
|
for ( const hn of hostnames ) {
|
2022-10-15 11:05:20 -06:00
|
|
|
let hostnamesToFidMap = specificDetails.get(id);
|
2022-09-29 17:51:33 -06:00
|
|
|
if ( hostnamesToFidMap === undefined ) {
|
|
|
|
hostnamesToFidMap = new Map();
|
2022-10-15 11:05:20 -06:00
|
|
|
specificDetails.set(id, hostnamesToFidMap);
|
2022-09-20 06:24:01 -06:00
|
|
|
}
|
2022-09-29 17:51:33 -06:00
|
|
|
let fids = hostnamesToFidMap.get(hn);
|
2022-09-19 18:19:55 -06:00
|
|
|
if ( fids === undefined ) {
|
2022-09-29 17:51:33 -06:00
|
|
|
hostnamesToFidMap.set(hn, fid);
|
2022-09-20 06:24:01 -06:00
|
|
|
} else if ( fids instanceof Set ) {
|
|
|
|
fids.add(fid);
|
|
|
|
} else if ( fid !== fids ) {
|
|
|
|
fids = new Set([ fids, fid ]);
|
2022-09-29 17:51:33 -06:00
|
|
|
hostnamesToFidMap.set(hn, fids);
|
2022-09-18 07:31:44 -06:00
|
|
|
}
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
2022-10-15 11:05:20 -06:00
|
|
|
const toCSSSpecific = s => (uidint32(s) & ~0b11) | 0b00;
|
2022-09-24 09:33:04 -06:00
|
|
|
|
2022-10-15 11:05:20 -06:00
|
|
|
const pathFromFileName = fname => `${fname.slice(-1)}/${fname.slice(0,-1)}.js`;
|
2022-09-19 18:19:55 -06:00
|
|
|
|
2022-09-18 07:31:44 -06:00
|
|
|
/******************************************************************************/
|
|
|
|
|
2022-10-10 10:28:24 -06:00
|
|
|
async function processGenericCosmeticFilters(assetDetails, bucketsMap, exclusions) {
|
|
|
|
const out = {
|
|
|
|
count: 0,
|
|
|
|
exclusionCount: 0,
|
|
|
|
};
|
|
|
|
if ( bucketsMap === undefined ) { return out; }
|
|
|
|
if ( bucketsMap.size === 0 ) { return out; }
|
|
|
|
const bucketsList = Array.from(bucketsMap);
|
|
|
|
const count = bucketsList.reduce((a, v) => a += v[1].length, 0);
|
|
|
|
if ( count === 0 ) { return out; }
|
|
|
|
out.count = count;
|
|
|
|
|
|
|
|
const selectorLists = bucketsList.map(v => [ v[0], v[1].join(',') ]);
|
|
|
|
const originalScriptletMap = await loadAllSourceScriptlets();
|
|
|
|
|
|
|
|
const patchedScriptlet = originalScriptletMap.get('css-generic')
|
|
|
|
.replace(
|
|
|
|
'$rulesetId$',
|
|
|
|
assetDetails.id
|
|
|
|
).replace(
|
2022-10-15 11:05:20 -06:00
|
|
|
/\bself\.\$genericSelectorMap\$/m,
|
2022-10-10 10:28:24 -06:00
|
|
|
`${JSON.stringify(selectorLists, scriptletJsonReplacer)}`
|
|
|
|
);
|
|
|
|
|
|
|
|
writeFile(
|
[mv3] Add ability to handle entity-based CSS and scriptlet injection filters
This commit adds the ability to inject entity-based plain CSS
filters and also a set of the most commonly used entity-based
scriptlet injection filters.
Since the scripting API is not compatible with entity patterns,
the entity-related content scripts are injected in all documents
and the entity-matching is done by the content script themselves.
Given this, entity-based content scripts are enabled only when
working in the Complete filtering mode, there won't be any
entity-based filters injected in lower modes.
Also, since there is no way to reasonably have access to the
Public Suffix List in the content scripts, the entity-matching
algorithm is an approximation, though I expect false positives
to be rare (time will tell). In the event of such false
positive, simply falling back to Optimal mode will fix the
issue.
The following issues have been fixed at the same time:
Fixed the no-filtering mode related rules having lower priority
then redirect rules, i.e. redirect rules would still be applied
despite disabling all filtering on a site.
Fixed improper detection of changes to the generic-related CSS
content script, potentially causing undue delays when for example
trying to access the popup panel while working in Complete mode.
The scripting MV3 can be quite slow when registering/updating
large content scripts, so uBOL does its best to call the API only
if really needed, but there had been a regression in the recent
builds preventing uBO from properly detecting unchanged content
script parameters.
2022-10-20 13:48:06 -06:00
|
|
|
`${scriptletDir}/generic/${assetDetails.id}.js`,
|
2022-10-10 10:28:24 -06:00
|
|
|
patchedScriptlet
|
|
|
|
);
|
|
|
|
|
2022-10-15 11:05:20 -06:00
|
|
|
genericDetails.set(assetDetails.id, exclusions.sort());
|
|
|
|
|
2022-10-10 10:28:24 -06:00
|
|
|
log(`CSS-generic: ${count} plain CSS selectors`);
|
|
|
|
|
|
|
|
return out;
|
|
|
|
}
|
|
|
|
|
|
|
|
/******************************************************************************/
|
|
|
|
|
|
|
|
const MAX_COSMETIC_FILTERS_PER_FILE = 256;
|
2022-09-16 13:56:35 -06:00
|
|
|
|
2022-09-24 09:33:04 -06:00
|
|
|
// This merges selectors which are used by the same hostnames
|
|
|
|
|
2022-10-15 11:05:20 -06:00
|
|
|
function groupSelectorsByHostnames(mapin) {
|
2022-09-24 09:33:04 -06:00
|
|
|
if ( mapin === undefined ) { return []; }
|
|
|
|
const merged = new Map();
|
|
|
|
for ( const [ selector, details ] of mapin ) {
|
2022-10-15 11:05:20 -06:00
|
|
|
if ( details.rejected ) { continue; }
|
2022-09-24 09:33:04 -06:00
|
|
|
const json = JSON.stringify(details);
|
|
|
|
let entries = merged.get(json);
|
|
|
|
if ( entries === undefined ) {
|
|
|
|
entries = new Set();
|
|
|
|
merged.set(json, entries);
|
2022-09-18 15:07:02 -06:00
|
|
|
}
|
2022-09-24 09:33:04 -06:00
|
|
|
entries.add(selector);
|
|
|
|
}
|
|
|
|
const out = [];
|
|
|
|
for ( const [ json, entries ] of merged ) {
|
|
|
|
const details = JSON.parse(json);
|
|
|
|
details.selectors = Array.from(entries).sort();
|
|
|
|
out.push(details);
|
|
|
|
}
|
|
|
|
return out;
|
|
|
|
}
|
|
|
|
|
|
|
|
// This merges hostnames which have the same set of selectors.
|
|
|
|
//
|
|
|
|
// Also, we sort the hostnames to increase likelihood that selector with
|
|
|
|
// same hostnames will end up in same generated scriptlet.
|
|
|
|
|
2022-10-15 11:05:20 -06:00
|
|
|
function groupHostnamesBySelectors(arrayin) {
|
2022-09-24 09:33:04 -06:00
|
|
|
const contentMap = new Map();
|
|
|
|
for ( const entry of arrayin ) {
|
|
|
|
const id = uidint32(JSON.stringify(entry.selectors));
|
|
|
|
let details = contentMap.get(id);
|
2022-09-19 06:55:45 -06:00
|
|
|
if ( details === undefined ) {
|
2022-09-24 09:33:04 -06:00
|
|
|
details = { a: entry.selectors };
|
|
|
|
contentMap.set(id, details);
|
2022-09-17 06:26:41 -06:00
|
|
|
}
|
2022-09-18 07:31:44 -06:00
|
|
|
if ( entry.matches !== undefined ) {
|
2022-09-19 06:55:45 -06:00
|
|
|
if ( details.y === undefined ) {
|
|
|
|
details.y = new Set();
|
2022-09-18 07:31:44 -06:00
|
|
|
}
|
2022-09-17 06:26:41 -06:00
|
|
|
for ( const hn of entry.matches ) {
|
2022-09-19 06:55:45 -06:00
|
|
|
details.y.add(hn);
|
2022-09-17 06:26:41 -06:00
|
|
|
}
|
|
|
|
}
|
2022-09-18 07:31:44 -06:00
|
|
|
if ( entry.excludeMatches !== undefined ) {
|
2022-09-19 06:55:45 -06:00
|
|
|
if ( details.n === undefined ) {
|
|
|
|
details.n = new Set();
|
2022-09-18 07:31:44 -06:00
|
|
|
}
|
2022-09-17 06:26:41 -06:00
|
|
|
for ( const hn of entry.excludeMatches ) {
|
2022-09-19 06:55:45 -06:00
|
|
|
details.n.add(hn);
|
2022-09-17 06:26:41 -06:00
|
|
|
}
|
|
|
|
}
|
2022-09-16 13:56:35 -06:00
|
|
|
}
|
2022-09-24 09:33:04 -06:00
|
|
|
const out = Array.from(contentMap).map(a => [
|
|
|
|
a[0], {
|
|
|
|
a: a[1].a,
|
|
|
|
y: a[1].y ? Array.from(a[1].y).sort(hnSort) : undefined,
|
|
|
|
n: a[1].n ? Array.from(a[1].n) : undefined,
|
|
|
|
}
|
|
|
|
]).sort((a, b) => {
|
|
|
|
const ha = Array.isArray(a[1].y) ? a[1].y[0] : '*';
|
|
|
|
const hb = Array.isArray(b[1].y) ? b[1].y[0] : '*';
|
|
|
|
return hnSort(ha, hb);
|
|
|
|
});
|
|
|
|
return out;
|
|
|
|
}
|
2022-09-16 13:56:35 -06:00
|
|
|
|
2022-09-24 09:33:04 -06:00
|
|
|
const scriptletHostnameToIdMap = (hostnames, id, map) => {
|
|
|
|
for ( const hn of hostnames ) {
|
|
|
|
const existing = map.get(hn);
|
|
|
|
if ( existing === undefined ) {
|
|
|
|
map.set(hn, id);
|
|
|
|
} else if ( Array.isArray(existing) ) {
|
|
|
|
existing.push(id);
|
|
|
|
} else {
|
|
|
|
map.set(hn, [ existing, id ]);
|
|
|
|
}
|
|
|
|
}
|
|
|
|
};
|
|
|
|
|
|
|
|
const scriptletJsonReplacer = (k, v) => {
|
|
|
|
if ( k === 'n' ) {
|
|
|
|
if ( v === undefined || v.size === 0 ) { return; }
|
|
|
|
return Array.from(v);
|
|
|
|
}
|
|
|
|
if ( v instanceof Set || v instanceof Map ) {
|
|
|
|
if ( v.size === 0 ) { return; }
|
|
|
|
return Array.from(v);
|
|
|
|
}
|
|
|
|
return v;
|
|
|
|
};
|
|
|
|
|
|
|
|
/******************************************************************************/
|
|
|
|
|
2022-10-15 11:05:20 -06:00
|
|
|
function argsMap2List(argsMap, hostnamesMap) {
|
|
|
|
const argsList = [];
|
|
|
|
const indexMap = new Map();
|
|
|
|
for ( const [ id, details ] of argsMap ) {
|
|
|
|
indexMap.set(id, argsList.length);
|
|
|
|
argsList.push(details);
|
|
|
|
}
|
|
|
|
for ( const [ hn, ids ] of hostnamesMap ) {
|
|
|
|
if ( typeof ids === 'number' ) {
|
|
|
|
hostnamesMap.set(hn, indexMap.get(ids));
|
|
|
|
continue;
|
|
|
|
}
|
|
|
|
for ( let i = 0; i < ids.length; i++ ) {
|
|
|
|
ids[i] = indexMap.get(ids[i]);
|
|
|
|
}
|
|
|
|
}
|
|
|
|
return argsList;
|
|
|
|
}
|
|
|
|
|
|
|
|
/******************************************************************************/
|
|
|
|
|
[mv3] Add ability to handle entity-based CSS and scriptlet injection filters
This commit adds the ability to inject entity-based plain CSS
filters and also a set of the most commonly used entity-based
scriptlet injection filters.
Since the scripting API is not compatible with entity patterns,
the entity-related content scripts are injected in all documents
and the entity-matching is done by the content script themselves.
Given this, entity-based content scripts are enabled only when
working in the Complete filtering mode, there won't be any
entity-based filters injected in lower modes.
Also, since there is no way to reasonably have access to the
Public Suffix List in the content scripts, the entity-matching
algorithm is an approximation, though I expect false positives
to be rare (time will tell). In the event of such false
positive, simply falling back to Optimal mode will fix the
issue.
The following issues have been fixed at the same time:
Fixed the no-filtering mode related rules having lower priority
then redirect rules, i.e. redirect rules would still be applied
despite disabling all filtering on a site.
Fixed improper detection of changes to the generic-related CSS
content script, potentially causing undue delays when for example
trying to access the popup panel while working in Complete mode.
The scripting MV3 can be quite slow when registering/updating
large content scripts, so uBOL does its best to call the API only
if really needed, but there had been a regression in the recent
builds preventing uBO from properly detecting unchanged content
script parameters.
2022-10-20 13:48:06 -06:00
|
|
|
function splitDomainAndEntity(mapin) {
|
|
|
|
const domainBased = new Map();
|
|
|
|
const entityBased = new Map();
|
|
|
|
for ( const [ selector, domainDetails ] of mapin ) {
|
|
|
|
domainBased.set(selector, domainDetails);
|
|
|
|
if ( domainDetails.rejected ) { continue; }
|
|
|
|
if ( Array.isArray(domainDetails.matches) === false ) { continue; }
|
|
|
|
const domainMatches = [];
|
|
|
|
const entityMatches = [];
|
|
|
|
for ( const hn of domainDetails.matches ) {
|
|
|
|
if ( hn.endsWith('.*') ) {
|
|
|
|
entityMatches.push(hn.slice(0, -2));
|
|
|
|
} else {
|
|
|
|
domainMatches.push(hn);
|
|
|
|
}
|
|
|
|
}
|
|
|
|
if ( entityMatches.length === 0 ) { continue; }
|
|
|
|
if ( domainMatches.length !== 0 ) {
|
|
|
|
domainDetails.matches = domainMatches;
|
|
|
|
} else {
|
|
|
|
domainBased.delete(selector);
|
|
|
|
}
|
|
|
|
const entityDetails = {
|
|
|
|
matches: entityMatches,
|
|
|
|
};
|
|
|
|
if ( Array.isArray(domainDetails.excludeMatches) ) {
|
|
|
|
entityDetails.excludeMatches = domainDetails.excludeMatches.slice();
|
|
|
|
}
|
|
|
|
entityBased.set(selector, entityDetails);
|
|
|
|
}
|
|
|
|
return { domainBased, entityBased };
|
|
|
|
}
|
|
|
|
|
|
|
|
/******************************************************************************/
|
|
|
|
|
2022-09-24 09:33:04 -06:00
|
|
|
async function processCosmeticFilters(assetDetails, mapin) {
|
[mv3] Add ability to handle entity-based CSS and scriptlet injection filters
This commit adds the ability to inject entity-based plain CSS
filters and also a set of the most commonly used entity-based
scriptlet injection filters.
Since the scripting API is not compatible with entity patterns,
the entity-related content scripts are injected in all documents
and the entity-matching is done by the content script themselves.
Given this, entity-based content scripts are enabled only when
working in the Complete filtering mode, there won't be any
entity-based filters injected in lower modes.
Also, since there is no way to reasonably have access to the
Public Suffix List in the content scripts, the entity-matching
algorithm is an approximation, though I expect false positives
to be rare (time will tell). In the event of such false
positive, simply falling back to Optimal mode will fix the
issue.
The following issues have been fixed at the same time:
Fixed the no-filtering mode related rules having lower priority
then redirect rules, i.e. redirect rules would still be applied
despite disabling all filtering on a site.
Fixed improper detection of changes to the generic-related CSS
content script, potentially causing undue delays when for example
trying to access the popup panel while working in Complete mode.
The scripting MV3 can be quite slow when registering/updating
large content scripts, so uBOL does its best to call the API only
if really needed, but there had been a regression in the recent
builds preventing uBO from properly detecting unchanged content
script parameters.
2022-10-20 13:48:06 -06:00
|
|
|
if ( mapin === undefined ) { return; }
|
2022-09-24 09:33:04 -06:00
|
|
|
|
[mv3] Add ability to handle entity-based CSS and scriptlet injection filters
This commit adds the ability to inject entity-based plain CSS
filters and also a set of the most commonly used entity-based
scriptlet injection filters.
Since the scripting API is not compatible with entity patterns,
the entity-related content scripts are injected in all documents
and the entity-matching is done by the content script themselves.
Given this, entity-based content scripts are enabled only when
working in the Complete filtering mode, there won't be any
entity-based filters injected in lower modes.
Also, since there is no way to reasonably have access to the
Public Suffix List in the content scripts, the entity-matching
algorithm is an approximation, though I expect false positives
to be rare (time will tell). In the event of such false
positive, simply falling back to Optimal mode will fix the
issue.
The following issues have been fixed at the same time:
Fixed the no-filtering mode related rules having lower priority
then redirect rules, i.e. redirect rules would still be applied
despite disabling all filtering on a site.
Fixed improper detection of changes to the generic-related CSS
content script, potentially causing undue delays when for example
trying to access the popup panel while working in Complete mode.
The scripting MV3 can be quite slow when registering/updating
large content scripts, so uBOL does its best to call the API only
if really needed, but there had been a regression in the recent
builds preventing uBO from properly detecting unchanged content
script parameters.
2022-10-20 13:48:06 -06:00
|
|
|
const { domainBased, entityBased } = splitDomainAndEntity(mapin);
|
|
|
|
const entityBasedEntries = groupHostnamesBySelectors(
|
|
|
|
groupSelectorsByHostnames(entityBased)
|
|
|
|
);
|
|
|
|
const domainBasedEntries = groupHostnamesBySelectors(
|
|
|
|
groupSelectorsByHostnames(domainBased)
|
2022-09-24 09:33:04 -06:00
|
|
|
);
|
|
|
|
|
|
|
|
// We do not want more than n CSS files per subscription, so we will
|
2022-09-19 06:55:45 -06:00
|
|
|
// group multiple unrelated selectors in the same file, and distinct
|
|
|
|
// css declarations will be injected programmatically according to the
|
|
|
|
// hostname of the current document.
|
|
|
|
//
|
|
|
|
// The cosmetic filters will be injected programmatically as content
|
|
|
|
// script and the decisions to activate the cosmetic filters will be
|
|
|
|
// done at injection time according to the document's hostname.
|
|
|
|
const originalScriptletMap = await loadAllSourceScriptlets();
|
2022-09-24 09:33:04 -06:00
|
|
|
const generatedFiles = [];
|
2022-09-19 06:55:45 -06:00
|
|
|
|
[mv3] Add ability to handle entity-based CSS and scriptlet injection filters
This commit adds the ability to inject entity-based plain CSS
filters and also a set of the most commonly used entity-based
scriptlet injection filters.
Since the scripting API is not compatible with entity patterns,
the entity-related content scripts are injected in all documents
and the entity-matching is done by the content script themselves.
Given this, entity-based content scripts are enabled only when
working in the Complete filtering mode, there won't be any
entity-based filters injected in lower modes.
Also, since there is no way to reasonably have access to the
Public Suffix List in the content scripts, the entity-matching
algorithm is an approximation, though I expect false positives
to be rare (time will tell). In the event of such false
positive, simply falling back to Optimal mode will fix the
issue.
The following issues have been fixed at the same time:
Fixed the no-filtering mode related rules having lower priority
then redirect rules, i.e. redirect rules would still be applied
despite disabling all filtering on a site.
Fixed improper detection of changes to the generic-related CSS
content script, potentially causing undue delays when for example
trying to access the popup panel while working in Complete mode.
The scripting MV3 can be quite slow when registering/updating
large content scripts, so uBOL does its best to call the API only
if really needed, but there had been a regression in the recent
builds preventing uBO from properly detecting unchanged content
script parameters.
2022-10-20 13:48:06 -06:00
|
|
|
for ( let i = 0; i < domainBasedEntries.length; i += MAX_COSMETIC_FILTERS_PER_FILE ) {
|
|
|
|
const slice = domainBasedEntries.slice(i, i + MAX_COSMETIC_FILTERS_PER_FILE);
|
2022-09-24 09:33:04 -06:00
|
|
|
const argsMap = slice.map(entry => [
|
|
|
|
entry[0],
|
|
|
|
{
|
|
|
|
a: entry[1].a ? entry[1].a.join(',\n') : undefined,
|
|
|
|
n: entry[1].n
|
|
|
|
}
|
|
|
|
]);
|
|
|
|
const hostnamesMap = new Map();
|
|
|
|
for ( const [ id, details ] of slice ) {
|
|
|
|
if ( details.y === undefined ) { continue; }
|
|
|
|
scriptletHostnameToIdMap(details.y, id, hostnamesMap);
|
2022-09-19 06:55:45 -06:00
|
|
|
}
|
2022-10-15 11:05:20 -06:00
|
|
|
const argsList = argsMap2List(argsMap, hostnamesMap);
|
2022-09-24 09:33:04 -06:00
|
|
|
const patchedScriptlet = originalScriptletMap.get('css-specific')
|
|
|
|
.replace(
|
|
|
|
'$rulesetId$',
|
|
|
|
assetDetails.id
|
|
|
|
).replace(
|
2022-10-15 11:05:20 -06:00
|
|
|
/\bself\.\$argsList\$/m,
|
|
|
|
`${JSON.stringify(argsList, scriptletJsonReplacer)}`
|
2022-09-24 09:33:04 -06:00
|
|
|
).replace(
|
|
|
|
/\bself\.\$hostnamesMap\$/m,
|
|
|
|
`${JSON.stringify(hostnamesMap, scriptletJsonReplacer)}`
|
|
|
|
);
|
2022-10-15 11:05:20 -06:00
|
|
|
const fid = toCSSSpecific(patchedScriptlet);
|
2022-09-24 09:33:04 -06:00
|
|
|
if ( globalPatchedScriptletsSet.has(fid) === false ) {
|
|
|
|
globalPatchedScriptletsSet.add(fid);
|
|
|
|
const fname = fnameFromFileId(fid);
|
2022-10-15 11:05:20 -06:00
|
|
|
writeFile(`${scriptletDir}/specific/${pathFromFileName(fname)}`, patchedScriptlet);
|
2022-09-24 09:33:04 -06:00
|
|
|
generatedFiles.push(fname);
|
2022-09-19 06:55:45 -06:00
|
|
|
}
|
2022-09-24 09:33:04 -06:00
|
|
|
for ( const entry of slice ) {
|
2022-09-29 17:51:33 -06:00
|
|
|
addScriptingAPIResources(assetDetails.id, entry[1].y, fid);
|
2022-09-19 06:55:45 -06:00
|
|
|
}
|
2022-09-24 09:33:04 -06:00
|
|
|
}
|
2022-09-19 06:55:45 -06:00
|
|
|
|
[mv3] Add ability to handle entity-based CSS and scriptlet injection filters
This commit adds the ability to inject entity-based plain CSS
filters and also a set of the most commonly used entity-based
scriptlet injection filters.
Since the scripting API is not compatible with entity patterns,
the entity-related content scripts are injected in all documents
and the entity-matching is done by the content script themselves.
Given this, entity-based content scripts are enabled only when
working in the Complete filtering mode, there won't be any
entity-based filters injected in lower modes.
Also, since there is no way to reasonably have access to the
Public Suffix List in the content scripts, the entity-matching
algorithm is an approximation, though I expect false positives
to be rare (time will tell). In the event of such false
positive, simply falling back to Optimal mode will fix the
issue.
The following issues have been fixed at the same time:
Fixed the no-filtering mode related rules having lower priority
then redirect rules, i.e. redirect rules would still be applied
despite disabling all filtering on a site.
Fixed improper detection of changes to the generic-related CSS
content script, potentially causing undue delays when for example
trying to access the popup panel while working in Complete mode.
The scripting MV3 can be quite slow when registering/updating
large content scripts, so uBOL does its best to call the API only
if really needed, but there had been a regression in the recent
builds preventing uBO from properly detecting unchanged content
script parameters.
2022-10-20 13:48:06 -06:00
|
|
|
// For entity-based entries, we generate a single scriptlet which will be
|
|
|
|
// injected only in Complete mode.
|
|
|
|
if ( entityBasedEntries.length !== 0 ) {
|
|
|
|
const argsMap = entityBasedEntries.map(entry => [
|
|
|
|
entry[0],
|
|
|
|
{
|
|
|
|
a: entry[1].a ? entry[1].a.join(',') : undefined,
|
|
|
|
n: entry[1].n,
|
|
|
|
}
|
|
|
|
]);
|
|
|
|
const entitiesMap = new Map();
|
|
|
|
for ( const [ id, details ] of entityBasedEntries ) {
|
|
|
|
if ( details.y === undefined ) { continue; }
|
|
|
|
scriptletHostnameToIdMap(details.y, id, entitiesMap);
|
|
|
|
}
|
|
|
|
const argsList = argsMap2List(argsMap, entitiesMap);
|
|
|
|
const patchedScriptlet = originalScriptletMap.get('css-specific.entity')
|
|
|
|
.replace(
|
|
|
|
'$rulesetId$',
|
|
|
|
assetDetails.id
|
|
|
|
).replace(
|
|
|
|
/\bself\.\$argsList\$/m,
|
|
|
|
`${JSON.stringify(argsList, scriptletJsonReplacer)}`
|
|
|
|
).replace(
|
|
|
|
/\bself\.\$entitiesMap\$/m,
|
|
|
|
`${JSON.stringify(entitiesMap, scriptletJsonReplacer)}`
|
|
|
|
);
|
|
|
|
const fname = `${assetDetails.id}`;
|
|
|
|
writeFile(`${scriptletDir}/specific-entity/${fname}.js`, patchedScriptlet);
|
|
|
|
generatedFiles.push(fname);
|
|
|
|
}
|
|
|
|
|
2022-09-24 09:33:04 -06:00
|
|
|
if ( generatedFiles.length !== 0 ) {
|
[mv3] Add ability to handle entity-based CSS and scriptlet injection filters
This commit adds the ability to inject entity-based plain CSS
filters and also a set of the most commonly used entity-based
scriptlet injection filters.
Since the scripting API is not compatible with entity patterns,
the entity-related content scripts are injected in all documents
and the entity-matching is done by the content script themselves.
Given this, entity-based content scripts are enabled only when
working in the Complete filtering mode, there won't be any
entity-based filters injected in lower modes.
Also, since there is no way to reasonably have access to the
Public Suffix List in the content scripts, the entity-matching
algorithm is an approximation, though I expect false positives
to be rare (time will tell). In the event of such false
positive, simply falling back to Optimal mode will fix the
issue.
The following issues have been fixed at the same time:
Fixed the no-filtering mode related rules having lower priority
then redirect rules, i.e. redirect rules would still be applied
despite disabling all filtering on a site.
Fixed improper detection of changes to the generic-related CSS
content script, potentially causing undue delays when for example
trying to access the popup panel while working in Complete mode.
The scripting MV3 can be quite slow when registering/updating
large content scripts, so uBOL does its best to call the API only
if really needed, but there had been a regression in the recent
builds preventing uBO from properly detecting unchanged content
script parameters.
2022-10-20 13:48:06 -06:00
|
|
|
log(`CSS-specific domain-based: ${domainBased.size} distinct filters`);
|
|
|
|
log(`\tCombined into ${domainBasedEntries.length} distinct entries`);
|
|
|
|
log(`CSS-specific entity-based: ${entityBased.size} distinct filters`);
|
|
|
|
log(`\tCombined into ${entityBasedEntries.length} distinct entries`);
|
2022-10-10 10:28:24 -06:00
|
|
|
log(`CSS-specific injectable files: ${generatedFiles.length}`);
|
2022-09-24 09:33:04 -06:00
|
|
|
log(`\t${generatedFiles.join(', ')}`);
|
|
|
|
}
|
|
|
|
|
[mv3] Add ability to handle entity-based CSS and scriptlet injection filters
This commit adds the ability to inject entity-based plain CSS
filters and also a set of the most commonly used entity-based
scriptlet injection filters.
Since the scripting API is not compatible with entity patterns,
the entity-related content scripts are injected in all documents
and the entity-matching is done by the content script themselves.
Given this, entity-based content scripts are enabled only when
working in the Complete filtering mode, there won't be any
entity-based filters injected in lower modes.
Also, since there is no way to reasonably have access to the
Public Suffix List in the content scripts, the entity-matching
algorithm is an approximation, though I expect false positives
to be rare (time will tell). In the event of such false
positive, simply falling back to Optimal mode will fix the
issue.
The following issues have been fixed at the same time:
Fixed the no-filtering mode related rules having lower priority
then redirect rules, i.e. redirect rules would still be applied
despite disabling all filtering on a site.
Fixed improper detection of changes to the generic-related CSS
content script, potentially causing undue delays when for example
trying to access the popup panel while working in Complete mode.
The scripting MV3 can be quite slow when registering/updating
large content scripts, so uBOL does its best to call the API only
if really needed, but there had been a regression in the recent
builds preventing uBO from properly detecting unchanged content
script parameters.
2022-10-20 13:48:06 -06:00
|
|
|
return {
|
|
|
|
domainBased: domainBasedEntries.length,
|
|
|
|
entityBased: entityBasedEntries.length,
|
|
|
|
};
|
2022-09-24 09:33:04 -06:00
|
|
|
}
|
|
|
|
|
|
|
|
/******************************************************************************/
|
|
|
|
|
2022-10-15 11:05:20 -06:00
|
|
|
async function processDeclarativeCosmeticFilters(assetDetails, mapin) {
|
2022-09-24 09:33:04 -06:00
|
|
|
if ( mapin === undefined ) { return 0; }
|
2022-10-15 11:05:20 -06:00
|
|
|
if ( mapin.size === 0 ) { return 0; }
|
|
|
|
|
|
|
|
// Distinguish declarative-compiled-as-procedural from actual procedural.
|
|
|
|
const declaratives = new Map();
|
|
|
|
mapin.forEach((details, jsonSelector) => {
|
|
|
|
const selector = JSON.parse(jsonSelector);
|
|
|
|
if ( selector.cssable !== true ) { return; }
|
|
|
|
declaratives.set(jsonSelector, details);
|
|
|
|
});
|
|
|
|
if ( declaratives.size === 0 ) { return 0; }
|
2022-09-24 09:33:04 -06:00
|
|
|
|
2022-10-15 11:05:20 -06:00
|
|
|
const contentArray = groupHostnamesBySelectors(
|
|
|
|
groupSelectorsByHostnames(declaratives)
|
2022-09-24 09:33:04 -06:00
|
|
|
);
|
|
|
|
|
2022-10-15 11:05:20 -06:00
|
|
|
const argsMap = contentArray.map(entry => [
|
|
|
|
entry[0],
|
|
|
|
{
|
|
|
|
a: entry[1].a,
|
|
|
|
n: entry[1].n,
|
|
|
|
}
|
|
|
|
]);
|
|
|
|
const hostnamesMap = new Map();
|
|
|
|
for ( const [ id, details ] of contentArray ) {
|
|
|
|
if ( details.y === undefined ) { continue; }
|
|
|
|
scriptletHostnameToIdMap(details.y, id, hostnamesMap);
|
|
|
|
}
|
|
|
|
|
|
|
|
const argsList = argsMap2List(argsMap, hostnamesMap);
|
2022-09-24 09:33:04 -06:00
|
|
|
const originalScriptletMap = await loadAllSourceScriptlets();
|
2022-10-15 11:05:20 -06:00
|
|
|
const patchedScriptlet = originalScriptletMap.get('css-declarative')
|
|
|
|
.replace(
|
|
|
|
'$rulesetId$',
|
|
|
|
assetDetails.id
|
|
|
|
).replace(
|
|
|
|
/\bself\.\$argsList\$/m,
|
|
|
|
`${JSON.stringify(argsList, scriptletJsonReplacer)}`
|
|
|
|
).replace(
|
|
|
|
/\bself\.\$hostnamesMap\$/m,
|
|
|
|
`${JSON.stringify(hostnamesMap, scriptletJsonReplacer)}`
|
|
|
|
);
|
[mv3] Add ability to handle entity-based CSS and scriptlet injection filters
This commit adds the ability to inject entity-based plain CSS
filters and also a set of the most commonly used entity-based
scriptlet injection filters.
Since the scripting API is not compatible with entity patterns,
the entity-related content scripts are injected in all documents
and the entity-matching is done by the content script themselves.
Given this, entity-based content scripts are enabled only when
working in the Complete filtering mode, there won't be any
entity-based filters injected in lower modes.
Also, since there is no way to reasonably have access to the
Public Suffix List in the content scripts, the entity-matching
algorithm is an approximation, though I expect false positives
to be rare (time will tell). In the event of such false
positive, simply falling back to Optimal mode will fix the
issue.
The following issues have been fixed at the same time:
Fixed the no-filtering mode related rules having lower priority
then redirect rules, i.e. redirect rules would still be applied
despite disabling all filtering on a site.
Fixed improper detection of changes to the generic-related CSS
content script, potentially causing undue delays when for example
trying to access the popup panel while working in Complete mode.
The scripting MV3 can be quite slow when registering/updating
large content scripts, so uBOL does its best to call the API only
if really needed, but there had been a regression in the recent
builds preventing uBO from properly detecting unchanged content
script parameters.
2022-10-20 13:48:06 -06:00
|
|
|
writeFile(`${scriptletDir}/declarative/${assetDetails.id}.js`, patchedScriptlet);
|
2022-09-18 07:31:44 -06:00
|
|
|
|
2022-10-15 11:05:20 -06:00
|
|
|
{
|
|
|
|
const hostnames = new Set();
|
|
|
|
for ( const entry of contentArray ) {
|
|
|
|
if ( Array.isArray(entry[1].y) === false ) { continue; }
|
|
|
|
for ( const hn of entry[1].y ) {
|
|
|
|
hostnames.add(hn);
|
2022-09-24 09:33:04 -06:00
|
|
|
}
|
2022-09-19 06:55:45 -06:00
|
|
|
}
|
2022-10-15 11:05:20 -06:00
|
|
|
if ( hostnames.has('*') ) {
|
|
|
|
hostnames.clear();
|
|
|
|
hostnames.add('*');
|
2022-09-18 07:31:44 -06:00
|
|
|
}
|
2022-10-15 11:05:20 -06:00
|
|
|
declarativeDetails.set(assetDetails.id, Array.from(hostnames).sort());
|
|
|
|
}
|
|
|
|
|
|
|
|
if ( contentArray.length !== 0 ) {
|
|
|
|
log(`Declarative-related distinct filters: ${contentArray.length} distinct combined selectors`);
|
|
|
|
}
|
|
|
|
|
|
|
|
return contentArray.length;
|
|
|
|
}
|
|
|
|
|
|
|
|
/******************************************************************************/
|
|
|
|
|
|
|
|
async function processProceduralCosmeticFilters(assetDetails, mapin) {
|
|
|
|
if ( mapin === undefined ) { return 0; }
|
|
|
|
if ( mapin.size === 0 ) { return 0; }
|
|
|
|
|
|
|
|
// Distinguish declarative-compiled-as-procedural from actual procedural.
|
|
|
|
const procedurals = new Map();
|
|
|
|
mapin.forEach((details, jsonSelector) => {
|
|
|
|
const selector = JSON.parse(jsonSelector);
|
|
|
|
if ( selector.cssable ) { return; }
|
|
|
|
procedurals.set(jsonSelector, details);
|
|
|
|
});
|
|
|
|
if ( procedurals.size === 0 ) { return 0; }
|
|
|
|
|
|
|
|
const contentArray = groupHostnamesBySelectors(
|
|
|
|
groupSelectorsByHostnames(procedurals)
|
|
|
|
);
|
|
|
|
|
|
|
|
const argsMap = contentArray.map(entry => [
|
|
|
|
entry[0],
|
|
|
|
{
|
|
|
|
a: entry[1].a,
|
|
|
|
n: entry[1].n,
|
2022-09-19 06:55:45 -06:00
|
|
|
}
|
2022-10-15 11:05:20 -06:00
|
|
|
]);
|
|
|
|
const hostnamesMap = new Map();
|
|
|
|
for ( const [ id, details ] of contentArray ) {
|
|
|
|
if ( details.y === undefined ) { continue; }
|
|
|
|
scriptletHostnameToIdMap(details.y, id, hostnamesMap);
|
2022-09-16 13:56:35 -06:00
|
|
|
}
|
2022-09-18 07:31:44 -06:00
|
|
|
|
2022-10-15 11:05:20 -06:00
|
|
|
const argsList = argsMap2List(argsMap, hostnamesMap);
|
|
|
|
const originalScriptletMap = await loadAllSourceScriptlets();
|
|
|
|
const patchedScriptlet = originalScriptletMap.get('css-procedural')
|
|
|
|
.replace(
|
|
|
|
'$rulesetId$',
|
|
|
|
assetDetails.id
|
|
|
|
).replace(
|
|
|
|
/\bself\.\$argsList\$/m,
|
|
|
|
`${JSON.stringify(argsList, scriptletJsonReplacer)}`
|
|
|
|
).replace(
|
|
|
|
/\bself\.\$hostnamesMap\$/m,
|
|
|
|
`${JSON.stringify(hostnamesMap, scriptletJsonReplacer)}`
|
|
|
|
);
|
[mv3] Add ability to handle entity-based CSS and scriptlet injection filters
This commit adds the ability to inject entity-based plain CSS
filters and also a set of the most commonly used entity-based
scriptlet injection filters.
Since the scripting API is not compatible with entity patterns,
the entity-related content scripts are injected in all documents
and the entity-matching is done by the content script themselves.
Given this, entity-based content scripts are enabled only when
working in the Complete filtering mode, there won't be any
entity-based filters injected in lower modes.
Also, since there is no way to reasonably have access to the
Public Suffix List in the content scripts, the entity-matching
algorithm is an approximation, though I expect false positives
to be rare (time will tell). In the event of such false
positive, simply falling back to Optimal mode will fix the
issue.
The following issues have been fixed at the same time:
Fixed the no-filtering mode related rules having lower priority
then redirect rules, i.e. redirect rules would still be applied
despite disabling all filtering on a site.
Fixed improper detection of changes to the generic-related CSS
content script, potentially causing undue delays when for example
trying to access the popup panel while working in Complete mode.
The scripting MV3 can be quite slow when registering/updating
large content scripts, so uBOL does its best to call the API only
if really needed, but there had been a regression in the recent
builds preventing uBO from properly detecting unchanged content
script parameters.
2022-10-20 13:48:06 -06:00
|
|
|
writeFile(`${scriptletDir}/procedural/${assetDetails.id}.js`, patchedScriptlet);
|
2022-10-15 11:05:20 -06:00
|
|
|
|
|
|
|
{
|
|
|
|
const hostnames = new Set();
|
|
|
|
for ( const entry of contentArray ) {
|
|
|
|
if ( Array.isArray(entry[1].y) === false ) { continue; }
|
|
|
|
for ( const hn of entry[1].y ) {
|
|
|
|
hostnames.add(hn);
|
|
|
|
}
|
|
|
|
}
|
|
|
|
if ( hostnames.has('*') ) {
|
|
|
|
hostnames.clear();
|
|
|
|
hostnames.add('*');
|
|
|
|
}
|
|
|
|
proceduralDetails.set(assetDetails.id, Array.from(hostnames).sort());
|
|
|
|
}
|
|
|
|
|
|
|
|
if ( contentArray.length !== 0 ) {
|
2022-09-24 12:10:29 -06:00
|
|
|
log(`Procedural-related distinct filters: ${contentArray.length} distinct combined selectors`);
|
2022-09-19 09:08:34 -06:00
|
|
|
}
|
|
|
|
|
2022-09-24 09:33:04 -06:00
|
|
|
return contentArray.length;
|
2022-09-16 13:56:35 -06:00
|
|
|
}
|
|
|
|
|
|
|
|
/******************************************************************************/
|
2022-09-06 11:47:52 -06:00
|
|
|
|
2022-09-16 13:56:35 -06:00
|
|
|
async function processScriptletFilters(assetDetails, mapin) {
|
[mv3] Add ability to handle entity-based CSS and scriptlet injection filters
This commit adds the ability to inject entity-based plain CSS
filters and also a set of the most commonly used entity-based
scriptlet injection filters.
Since the scripting API is not compatible with entity patterns,
the entity-related content scripts are injected in all documents
and the entity-matching is done by the content script themselves.
Given this, entity-based content scripts are enabled only when
working in the Complete filtering mode, there won't be any
entity-based filters injected in lower modes.
Also, since there is no way to reasonably have access to the
Public Suffix List in the content scripts, the entity-matching
algorithm is an approximation, though I expect false positives
to be rare (time will tell). In the event of such false
positive, simply falling back to Optimal mode will fix the
issue.
The following issues have been fixed at the same time:
Fixed the no-filtering mode related rules having lower priority
then redirect rules, i.e. redirect rules would still be applied
despite disabling all filtering on a site.
Fixed improper detection of changes to the generic-related CSS
content script, potentially causing undue delays when for example
trying to access the popup panel while working in Complete mode.
The scripting MV3 can be quite slow when registering/updating
large content scripts, so uBOL does its best to call the API only
if really needed, but there had been a regression in the recent
builds preventing uBO from properly detecting unchanged content
script parameters.
2022-10-20 13:48:06 -06:00
|
|
|
if ( mapin === undefined ) { return; }
|
|
|
|
|
|
|
|
const { domainBased, entityBased } = splitDomainAndEntity(mapin);
|
2022-09-16 13:56:35 -06:00
|
|
|
|
2022-09-17 06:26:41 -06:00
|
|
|
// Load all available scriptlets into a key-val map, where the key is the
|
|
|
|
// scriptlet token, and val is the whole content of the file.
|
2022-09-18 15:07:02 -06:00
|
|
|
const originalScriptletMap = await loadAllSourceScriptlets();
|
2022-09-16 13:56:35 -06:00
|
|
|
|
[mv3] Add ability to handle entity-based CSS and scriptlet injection filters
This commit adds the ability to inject entity-based plain CSS
filters and also a set of the most commonly used entity-based
scriptlet injection filters.
Since the scripting API is not compatible with entity patterns,
the entity-related content scripts are injected in all documents
and the entity-matching is done by the content script themselves.
Given this, entity-based content scripts are enabled only when
working in the Complete filtering mode, there won't be any
entity-based filters injected in lower modes.
Also, since there is no way to reasonably have access to the
Public Suffix List in the content scripts, the entity-matching
algorithm is an approximation, though I expect false positives
to be rare (time will tell). In the event of such false
positive, simply falling back to Optimal mode will fix the
issue.
The following issues have been fixed at the same time:
Fixed the no-filtering mode related rules having lower priority
then redirect rules, i.e. redirect rules would still be applied
despite disabling all filtering on a site.
Fixed improper detection of changes to the generic-related CSS
content script, potentially causing undue delays when for example
trying to access the popup panel while working in Complete mode.
The scripting MV3 can be quite slow when registering/updating
large content scripts, so uBOL does its best to call the API only
if really needed, but there had been a regression in the recent
builds preventing uBO from properly detecting unchanged content
script parameters.
2022-10-20 13:48:06 -06:00
|
|
|
let domainBasedTokens;
|
|
|
|
if ( domainBased.size !== 0 ) {
|
|
|
|
domainBasedTokens = await processDomainScriptletFilters(assetDetails, domainBased, originalScriptletMap);
|
|
|
|
}
|
|
|
|
let entityBasedTokens;
|
|
|
|
if ( entityBased.size !== 0 ) {
|
|
|
|
entityBasedTokens = await processEntityScriptletFilters(assetDetails, entityBased, originalScriptletMap);
|
|
|
|
}
|
2022-09-16 13:56:35 -06:00
|
|
|
|
[mv3] Add ability to handle entity-based CSS and scriptlet injection filters
This commit adds the ability to inject entity-based plain CSS
filters and also a set of the most commonly used entity-based
scriptlet injection filters.
Since the scripting API is not compatible with entity patterns,
the entity-related content scripts are injected in all documents
and the entity-matching is done by the content script themselves.
Given this, entity-based content scripts are enabled only when
working in the Complete filtering mode, there won't be any
entity-based filters injected in lower modes.
Also, since there is no way to reasonably have access to the
Public Suffix List in the content scripts, the entity-matching
algorithm is an approximation, though I expect false positives
to be rare (time will tell). In the event of such false
positive, simply falling back to Optimal mode will fix the
issue.
The following issues have been fixed at the same time:
Fixed the no-filtering mode related rules having lower priority
then redirect rules, i.e. redirect rules would still be applied
despite disabling all filtering on a site.
Fixed improper detection of changes to the generic-related CSS
content script, potentially causing undue delays when for example
trying to access the popup panel while working in Complete mode.
The scripting MV3 can be quite slow when registering/updating
large content scripts, so uBOL does its best to call the API only
if really needed, but there had been a regression in the recent
builds preventing uBO from properly detecting unchanged content
script parameters.
2022-10-20 13:48:06 -06:00
|
|
|
return { domainBasedTokens, entityBasedTokens };
|
|
|
|
}
|
|
|
|
|
|
|
|
/******************************************************************************/
|
|
|
|
|
|
|
|
const parseScriptletArguments = raw => {
|
|
|
|
const out = [];
|
|
|
|
let s = raw;
|
|
|
|
let len = s.length;
|
|
|
|
let beg = 0, pos = 0;
|
|
|
|
let i = 1;
|
|
|
|
while ( beg < len ) {
|
|
|
|
pos = s.indexOf(',', pos);
|
|
|
|
// Escaped comma? If so, skip.
|
|
|
|
if ( pos > 0 && s.charCodeAt(pos - 1) === 0x5C /* '\\' */ ) {
|
|
|
|
s = s.slice(0, pos - 1) + s.slice(pos);
|
|
|
|
len -= 1;
|
|
|
|
continue;
|
2022-09-16 13:56:35 -06:00
|
|
|
}
|
[mv3] Add ability to handle entity-based CSS and scriptlet injection filters
This commit adds the ability to inject entity-based plain CSS
filters and also a set of the most commonly used entity-based
scriptlet injection filters.
Since the scripting API is not compatible with entity patterns,
the entity-related content scripts are injected in all documents
and the entity-matching is done by the content script themselves.
Given this, entity-based content scripts are enabled only when
working in the Complete filtering mode, there won't be any
entity-based filters injected in lower modes.
Also, since there is no way to reasonably have access to the
Public Suffix List in the content scripts, the entity-matching
algorithm is an approximation, though I expect false positives
to be rare (time will tell). In the event of such false
positive, simply falling back to Optimal mode will fix the
issue.
The following issues have been fixed at the same time:
Fixed the no-filtering mode related rules having lower priority
then redirect rules, i.e. redirect rules would still be applied
despite disabling all filtering on a site.
Fixed improper detection of changes to the generic-related CSS
content script, potentially causing undue delays when for example
trying to access the popup panel while working in Complete mode.
The scripting MV3 can be quite slow when registering/updating
large content scripts, so uBOL does its best to call the API only
if really needed, but there had been a regression in the recent
builds preventing uBO from properly detecting unchanged content
script parameters.
2022-10-20 13:48:06 -06:00
|
|
|
if ( pos === -1 ) { pos = len; }
|
|
|
|
out.push(s.slice(beg, pos).trim());
|
|
|
|
beg = pos = pos + 1;
|
|
|
|
i++;
|
|
|
|
}
|
|
|
|
return out;
|
|
|
|
};
|
|
|
|
|
|
|
|
const parseScriptletFilter = (raw, scriptletMap, tokenSuffix = '') => {
|
|
|
|
const filter = raw.slice(4, -1);
|
|
|
|
const end = filter.length;
|
|
|
|
let pos = filter.indexOf(',');
|
|
|
|
if ( pos === -1 ) { pos = end; }
|
|
|
|
const parts = filter.trim().split(',').map(s => s.trim());
|
|
|
|
const token = scriptletDealiasingMap.get(parts[0]) || '';
|
|
|
|
if ( token === '' ) { return; }
|
|
|
|
if ( scriptletMap.has(`${token}${tokenSuffix}`) === false ) { return; }
|
|
|
|
return {
|
|
|
|
token,
|
|
|
|
args: parseScriptletArguments(parts.slice(1).join(',').trim()),
|
2022-09-16 13:56:35 -06:00
|
|
|
};
|
[mv3] Add ability to handle entity-based CSS and scriptlet injection filters
This commit adds the ability to inject entity-based plain CSS
filters and also a set of the most commonly used entity-based
scriptlet injection filters.
Since the scripting API is not compatible with entity patterns,
the entity-related content scripts are injected in all documents
and the entity-matching is done by the content script themselves.
Given this, entity-based content scripts are enabled only when
working in the Complete filtering mode, there won't be any
entity-based filters injected in lower modes.
Also, since there is no way to reasonably have access to the
Public Suffix List in the content scripts, the entity-matching
algorithm is an approximation, though I expect false positives
to be rare (time will tell). In the event of such false
positive, simply falling back to Optimal mode will fix the
issue.
The following issues have been fixed at the same time:
Fixed the no-filtering mode related rules having lower priority
then redirect rules, i.e. redirect rules would still be applied
despite disabling all filtering on a site.
Fixed improper detection of changes to the generic-related CSS
content script, potentially causing undue delays when for example
trying to access the popup panel while working in Complete mode.
The scripting MV3 can be quite slow when registering/updating
large content scripts, so uBOL does its best to call the API only
if really needed, but there had been a regression in the recent
builds preventing uBO from properly detecting unchanged content
script parameters.
2022-10-20 13:48:06 -06:00
|
|
|
};
|
2022-09-16 13:56:35 -06:00
|
|
|
|
[mv3] Add ability to handle entity-based CSS and scriptlet injection filters
This commit adds the ability to inject entity-based plain CSS
filters and also a set of the most commonly used entity-based
scriptlet injection filters.
Since the scripting API is not compatible with entity patterns,
the entity-related content scripts are injected in all documents
and the entity-matching is done by the content script themselves.
Given this, entity-based content scripts are enabled only when
working in the Complete filtering mode, there won't be any
entity-based filters injected in lower modes.
Also, since there is no way to reasonably have access to the
Public Suffix List in the content scripts, the entity-matching
algorithm is an approximation, though I expect false positives
to be rare (time will tell). In the event of such false
positive, simply falling back to Optimal mode will fix the
issue.
The following issues have been fixed at the same time:
Fixed the no-filtering mode related rules having lower priority
then redirect rules, i.e. redirect rules would still be applied
despite disabling all filtering on a site.
Fixed improper detection of changes to the generic-related CSS
content script, potentially causing undue delays when for example
trying to access the popup panel while working in Complete mode.
The scripting MV3 can be quite slow when registering/updating
large content scripts, so uBOL does its best to call the API only
if really needed, but there had been a regression in the recent
builds preventing uBO from properly detecting unchanged content
script parameters.
2022-10-20 13:48:06 -06:00
|
|
|
/******************************************************************************/
|
|
|
|
|
|
|
|
async function processDomainScriptletFilters(assetDetails, domainBased, originalScriptletMap) {
|
2022-09-18 15:07:02 -06:00
|
|
|
// For each instance of distinct scriptlet, we will collect distinct
|
|
|
|
// instances of arguments, and for each distinct set of argument, we
|
|
|
|
// will collect the set of hostnames for which the scriptlet/args is meant
|
|
|
|
// to execute. This will allow us a single content script file and the
|
|
|
|
// scriptlets execution will depend on hostname testing against the
|
|
|
|
// URL of the document at scriptlet execution time. In the end, we
|
|
|
|
// should have no more generated content script per subscription than the
|
|
|
|
// number of distinct source scriptlets.
|
|
|
|
const scriptletDetails = new Map();
|
[mv3] Add ability to handle entity-based CSS and scriptlet injection filters
This commit adds the ability to inject entity-based plain CSS
filters and also a set of the most commonly used entity-based
scriptlet injection filters.
Since the scripting API is not compatible with entity patterns,
the entity-related content scripts are injected in all documents
and the entity-matching is done by the content script themselves.
Given this, entity-based content scripts are enabled only when
working in the Complete filtering mode, there won't be any
entity-based filters injected in lower modes.
Also, since there is no way to reasonably have access to the
Public Suffix List in the content scripts, the entity-matching
algorithm is an approximation, though I expect false positives
to be rare (time will tell). In the event of such false
positive, simply falling back to Optimal mode will fix the
issue.
The following issues have been fixed at the same time:
Fixed the no-filtering mode related rules having lower priority
then redirect rules, i.e. redirect rules would still be applied
despite disabling all filtering on a site.
Fixed improper detection of changes to the generic-related CSS
content script, potentially causing undue delays when for example
trying to access the popup panel while working in Complete mode.
The scripting MV3 can be quite slow when registering/updating
large content scripts, so uBOL does its best to call the API only
if really needed, but there had been a regression in the recent
builds preventing uBO from properly detecting unchanged content
script parameters.
2022-10-20 13:48:06 -06:00
|
|
|
const rejectedFilters = [];
|
|
|
|
for ( const [ rawFilter, entry ] of domainBased ) {
|
|
|
|
if ( entry.rejected ) {
|
|
|
|
rejectedFilters.push(rawFilter);
|
|
|
|
continue;
|
|
|
|
}
|
|
|
|
const normalized = parseScriptletFilter(rawFilter, originalScriptletMap);
|
2022-11-09 09:25:18 -07:00
|
|
|
if ( normalized === undefined ) {
|
|
|
|
log(`Discarded unsupported scriptlet filter: ${rawFilter}`, true);
|
|
|
|
continue;
|
|
|
|
}
|
2022-09-18 15:07:02 -06:00
|
|
|
let argsDetails = scriptletDetails.get(normalized.token);
|
|
|
|
if ( argsDetails === undefined ) {
|
|
|
|
argsDetails = new Map();
|
|
|
|
scriptletDetails.set(normalized.token, argsDetails);
|
|
|
|
}
|
|
|
|
const argsHash = JSON.stringify(normalized.args);
|
|
|
|
let hostnamesDetails = argsDetails.get(argsHash);
|
|
|
|
if ( hostnamesDetails === undefined ) {
|
|
|
|
hostnamesDetails = {
|
|
|
|
a: normalized.args,
|
|
|
|
y: new Set(),
|
|
|
|
n: new Set(),
|
|
|
|
};
|
2022-09-19 09:08:34 -06:00
|
|
|
argsDetails.set(argsHash, hostnamesDetails);
|
2022-09-18 15:07:02 -06:00
|
|
|
}
|
|
|
|
if ( entry.matches ) {
|
|
|
|
for ( const hn of entry.matches ) {
|
|
|
|
hostnamesDetails.y.add(hn);
|
|
|
|
}
|
|
|
|
}
|
|
|
|
if ( entry.excludeMatches ) {
|
|
|
|
for ( const hn of entry.excludeMatches ) {
|
|
|
|
hostnamesDetails.n.add(hn);
|
|
|
|
}
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
[mv3] Add ability to handle entity-based CSS and scriptlet injection filters
This commit adds the ability to inject entity-based plain CSS
filters and also a set of the most commonly used entity-based
scriptlet injection filters.
Since the scripting API is not compatible with entity patterns,
the entity-related content scripts are injected in all documents
and the entity-matching is done by the content script themselves.
Given this, entity-based content scripts are enabled only when
working in the Complete filtering mode, there won't be any
entity-based filters injected in lower modes.
Also, since there is no way to reasonably have access to the
Public Suffix List in the content scripts, the entity-matching
algorithm is an approximation, though I expect false positives
to be rare (time will tell). In the event of such false
positive, simply falling back to Optimal mode will fix the
issue.
The following issues have been fixed at the same time:
Fixed the no-filtering mode related rules having lower priority
then redirect rules, i.e. redirect rules would still be applied
despite disabling all filtering on a site.
Fixed improper detection of changes to the generic-related CSS
content script, potentially causing undue delays when for example
trying to access the popup panel while working in Complete mode.
The scripting MV3 can be quite slow when registering/updating
large content scripts, so uBOL does its best to call the API only
if really needed, but there had been a regression in the recent
builds preventing uBO from properly detecting unchanged content
script parameters.
2022-10-20 13:48:06 -06:00
|
|
|
log(`Rejected scriptlet filters: ${rejectedFilters.length}`);
|
|
|
|
log(rejectedFilters.map(line => `\t${line}`).join('\n'), true);
|
|
|
|
|
2022-09-19 09:08:34 -06:00
|
|
|
const generatedFiles = [];
|
[mv3] Add ability to handle entity-based CSS and scriptlet injection filters
This commit adds the ability to inject entity-based plain CSS
filters and also a set of the most commonly used entity-based
scriptlet injection filters.
Since the scripting API is not compatible with entity patterns,
the entity-related content scripts are injected in all documents
and the entity-matching is done by the content script themselves.
Given this, entity-based content scripts are enabled only when
working in the Complete filtering mode, there won't be any
entity-based filters injected in lower modes.
Also, since there is no way to reasonably have access to the
Public Suffix List in the content scripts, the entity-matching
algorithm is an approximation, though I expect false positives
to be rare (time will tell). In the event of such false
positive, simply falling back to Optimal mode will fix the
issue.
The following issues have been fixed at the same time:
Fixed the no-filtering mode related rules having lower priority
then redirect rules, i.e. redirect rules would still be applied
despite disabling all filtering on a site.
Fixed improper detection of changes to the generic-related CSS
content script, potentially causing undue delays when for example
trying to access the popup panel while working in Complete mode.
The scripting MV3 can be quite slow when registering/updating
large content scripts, so uBOL does its best to call the API only
if really needed, but there had been a regression in the recent
builds preventing uBO from properly detecting unchanged content
script parameters.
2022-10-20 13:48:06 -06:00
|
|
|
const tokens = [];
|
2022-09-18 15:07:02 -06:00
|
|
|
|
|
|
|
for ( const [ token, argsDetails ] of scriptletDetails ) {
|
2022-09-19 06:55:45 -06:00
|
|
|
const argsMap = Array.from(argsDetails).map(entry => [
|
2022-09-19 18:19:55 -06:00
|
|
|
uidint32(entry[0]),
|
2022-09-19 06:55:45 -06:00
|
|
|
{ a: entry[1].a, n: entry[1].n }
|
|
|
|
]);
|
2022-09-18 15:07:02 -06:00
|
|
|
const hostnamesMap = new Map();
|
|
|
|
for ( const [ argsHash, details ] of argsDetails ) {
|
2022-09-24 09:33:04 -06:00
|
|
|
scriptletHostnameToIdMap(details.y, uidint32(argsHash), hostnamesMap);
|
2022-09-18 15:07:02 -06:00
|
|
|
}
|
2022-10-15 11:05:20 -06:00
|
|
|
|
|
|
|
const argsList = argsMap2List(argsMap, hostnamesMap);
|
2022-09-18 15:07:02 -06:00
|
|
|
const patchedScriptlet = originalScriptletMap.get(token)
|
|
|
|
.replace(
|
2022-09-24 09:33:04 -06:00
|
|
|
'$rulesetId$',
|
|
|
|
assetDetails.id
|
|
|
|
).replace(
|
2022-10-15 11:05:20 -06:00
|
|
|
/\bself\.\$argsList\$/m,
|
|
|
|
`${JSON.stringify(argsList, scriptletJsonReplacer)}`
|
2022-09-18 15:07:02 -06:00
|
|
|
).replace(
|
|
|
|
/\bself\.\$hostnamesMap\$/m,
|
2022-09-24 09:33:04 -06:00
|
|
|
`${JSON.stringify(hostnamesMap, scriptletJsonReplacer)}`
|
2022-09-18 15:07:02 -06:00
|
|
|
);
|
2022-10-15 11:05:20 -06:00
|
|
|
const fname = `${assetDetails.id}.${token}.js`;
|
|
|
|
const fpath = `${scriptletDir}/scriptlet/${fname}`;
|
|
|
|
writeFile(fpath, patchedScriptlet);
|
|
|
|
generatedFiles.push(fname);
|
[mv3] Add ability to handle entity-based CSS and scriptlet injection filters
This commit adds the ability to inject entity-based plain CSS
filters and also a set of the most commonly used entity-based
scriptlet injection filters.
Since the scripting API is not compatible with entity patterns,
the entity-related content scripts are injected in all documents
and the entity-matching is done by the content script themselves.
Given this, entity-based content scripts are enabled only when
working in the Complete filtering mode, there won't be any
entity-based filters injected in lower modes.
Also, since there is no way to reasonably have access to the
Public Suffix List in the content scripts, the entity-matching
algorithm is an approximation, though I expect false positives
to be rare (time will tell). In the event of such false
positive, simply falling back to Optimal mode will fix the
issue.
The following issues have been fixed at the same time:
Fixed the no-filtering mode related rules having lower priority
then redirect rules, i.e. redirect rules would still be applied
despite disabling all filtering on a site.
Fixed improper detection of changes to the generic-related CSS
content script, potentially causing undue delays when for example
trying to access the popup panel while working in Complete mode.
The scripting MV3 can be quite slow when registering/updating
large content scripts, so uBOL does its best to call the API only
if really needed, but there had been a regression in the recent
builds preventing uBO from properly detecting unchanged content
script parameters.
2022-10-20 13:48:06 -06:00
|
|
|
tokens.push(token);
|
2022-10-15 11:05:20 -06:00
|
|
|
|
|
|
|
const hostnameMatches = new Set(hostnamesMap.keys());
|
|
|
|
if ( hostnameMatches.has('*') ) {
|
|
|
|
hostnameMatches.clear();
|
|
|
|
hostnameMatches.add('*');
|
2022-09-16 13:56:35 -06:00
|
|
|
}
|
2022-10-15 11:05:20 -06:00
|
|
|
let rulesetScriptlets = scriptletStats.get(assetDetails.id);
|
|
|
|
if ( rulesetScriptlets === undefined ) {
|
|
|
|
scriptletStats.set(assetDetails.id, rulesetScriptlets = []);
|
2022-09-18 15:07:02 -06:00
|
|
|
}
|
2022-10-15 11:05:20 -06:00
|
|
|
rulesetScriptlets.push([ token, Array.from(hostnameMatches).sort() ]);
|
2022-09-16 13:56:35 -06:00
|
|
|
}
|
|
|
|
|
2022-09-19 09:08:34 -06:00
|
|
|
if ( generatedFiles.length !== 0 ) {
|
|
|
|
const scriptletFilterCount = Array.from(scriptletDetails.values())
|
|
|
|
.reduce((a, b) => a + b.size, 0);
|
|
|
|
log(`Scriptlet-related distinct filters: ${scriptletFilterCount}`);
|
|
|
|
log(`Scriptlet-related injectable files: ${generatedFiles.length}`);
|
2022-09-19 09:53:04 -06:00
|
|
|
log(`\t${generatedFiles.join(', ')}`);
|
2022-09-19 09:08:34 -06:00
|
|
|
}
|
|
|
|
|
[mv3] Add ability to handle entity-based CSS and scriptlet injection filters
This commit adds the ability to inject entity-based plain CSS
filters and also a set of the most commonly used entity-based
scriptlet injection filters.
Since the scripting API is not compatible with entity patterns,
the entity-related content scripts are injected in all documents
and the entity-matching is done by the content script themselves.
Given this, entity-based content scripts are enabled only when
working in the Complete filtering mode, there won't be any
entity-based filters injected in lower modes.
Also, since there is no way to reasonably have access to the
Public Suffix List in the content scripts, the entity-matching
algorithm is an approximation, though I expect false positives
to be rare (time will tell). In the event of such false
positive, simply falling back to Optimal mode will fix the
issue.
The following issues have been fixed at the same time:
Fixed the no-filtering mode related rules having lower priority
then redirect rules, i.e. redirect rules would still be applied
despite disabling all filtering on a site.
Fixed improper detection of changes to the generic-related CSS
content script, potentially causing undue delays when for example
trying to access the popup panel while working in Complete mode.
The scripting MV3 can be quite slow when registering/updating
large content scripts, so uBOL does its best to call the API only
if really needed, but there had been a regression in the recent
builds preventing uBO from properly detecting unchanged content
script parameters.
2022-10-20 13:48:06 -06:00
|
|
|
return tokens;
|
|
|
|
}
|
|
|
|
|
|
|
|
/******************************************************************************/
|
|
|
|
|
|
|
|
async function processEntityScriptletFilters(assetDetails, entityBased, originalScriptletMap) {
|
|
|
|
// For each instance of distinct scriptlet, we will collect distinct
|
|
|
|
// instances of arguments, and for each distinct set of argument, we
|
|
|
|
// will collect the set of hostnames for which the scriptlet/args is meant
|
|
|
|
// to execute. This will allow us a single content script file and the
|
|
|
|
// scriptlets execution will depend on hostname testing against the
|
|
|
|
// URL of the document at scriptlet execution time. In the end, we
|
|
|
|
// should have no more generated content script per subscription than the
|
|
|
|
// number of distinct source scriptlets.
|
|
|
|
const scriptletMap = new Map();
|
|
|
|
const rejectedFilters = [];
|
|
|
|
for ( const [ rawFilter, entry ] of entityBased ) {
|
|
|
|
if ( entry.rejected ) {
|
|
|
|
rejectedFilters.push(rawFilter);
|
|
|
|
continue;
|
|
|
|
}
|
|
|
|
const normalized = parseScriptletFilter(rawFilter, originalScriptletMap, '.entity');
|
2022-11-09 09:25:18 -07:00
|
|
|
if ( normalized === undefined ) {
|
|
|
|
log(`Discarded unsupported scriptlet filter: ${rawFilter}`, true);
|
|
|
|
continue;
|
|
|
|
}
|
[mv3] Add ability to handle entity-based CSS and scriptlet injection filters
This commit adds the ability to inject entity-based plain CSS
filters and also a set of the most commonly used entity-based
scriptlet injection filters.
Since the scripting API is not compatible with entity patterns,
the entity-related content scripts are injected in all documents
and the entity-matching is done by the content script themselves.
Given this, entity-based content scripts are enabled only when
working in the Complete filtering mode, there won't be any
entity-based filters injected in lower modes.
Also, since there is no way to reasonably have access to the
Public Suffix List in the content scripts, the entity-matching
algorithm is an approximation, though I expect false positives
to be rare (time will tell). In the event of such false
positive, simply falling back to Optimal mode will fix the
issue.
The following issues have been fixed at the same time:
Fixed the no-filtering mode related rules having lower priority
then redirect rules, i.e. redirect rules would still be applied
despite disabling all filtering on a site.
Fixed improper detection of changes to the generic-related CSS
content script, potentially causing undue delays when for example
trying to access the popup panel while working in Complete mode.
The scripting MV3 can be quite slow when registering/updating
large content scripts, so uBOL does its best to call the API only
if really needed, but there had been a regression in the recent
builds preventing uBO from properly detecting unchanged content
script parameters.
2022-10-20 13:48:06 -06:00
|
|
|
let argsDetails = scriptletMap.get(normalized.token);
|
|
|
|
if ( argsDetails === undefined ) {
|
|
|
|
argsDetails = new Map();
|
|
|
|
scriptletMap.set(normalized.token, argsDetails);
|
|
|
|
}
|
|
|
|
const argsHash = JSON.stringify(normalized.args);
|
|
|
|
let scriptletDetails = argsDetails.get(argsHash);
|
|
|
|
if ( scriptletDetails === undefined ) {
|
|
|
|
scriptletDetails = {
|
|
|
|
a: normalized.args,
|
|
|
|
y: new Set(),
|
|
|
|
n: new Set(),
|
|
|
|
};
|
|
|
|
argsDetails.set(argsHash, scriptletDetails);
|
|
|
|
}
|
|
|
|
if ( entry.matches ) {
|
|
|
|
for ( const entity of entry.matches ) {
|
|
|
|
scriptletDetails.y.add(entity);
|
|
|
|
}
|
|
|
|
}
|
|
|
|
if ( entry.excludeMatches ) {
|
|
|
|
for ( const hn of entry.excludeMatches ) {
|
|
|
|
scriptletDetails.n.add(hn);
|
|
|
|
}
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
log(`Rejected scriptlet filters: ${rejectedFilters.length}`);
|
|
|
|
log(rejectedFilters.map(line => `\t${line}`).join('\n'), true);
|
|
|
|
|
|
|
|
const generatedFiles = [];
|
|
|
|
const tokens = [];
|
|
|
|
|
|
|
|
for ( const [ token, argsDetails ] of scriptletMap ) {
|
|
|
|
const argsMap = Array.from(argsDetails).map(entry => [
|
|
|
|
uidint32(entry[0]),
|
|
|
|
{ a: entry[1].a, n: entry[1].n }
|
|
|
|
]);
|
|
|
|
const entitiesMap = new Map();
|
|
|
|
for ( const [ argsHash, details ] of argsDetails ) {
|
|
|
|
scriptletHostnameToIdMap(details.y, uidint32(argsHash), entitiesMap);
|
|
|
|
}
|
|
|
|
|
|
|
|
const argsList = argsMap2List(argsMap, entitiesMap);
|
|
|
|
const patchedScriptlet = originalScriptletMap.get(`${token}.entity`)
|
|
|
|
.replace(
|
|
|
|
'$rulesetId$',
|
|
|
|
assetDetails.id
|
|
|
|
).replace(
|
|
|
|
/\bself\.\$argsList\$/m,
|
|
|
|
`${JSON.stringify(argsList, scriptletJsonReplacer)}`
|
|
|
|
).replace(
|
|
|
|
/\bself\.\$entitiesMap\$/m,
|
|
|
|
`${JSON.stringify(entitiesMap, scriptletJsonReplacer)}`
|
|
|
|
);
|
|
|
|
const fname = `${assetDetails.id}.${token}.js`;
|
|
|
|
const fpath = `${scriptletDir}/scriptlet-entity/${fname}`;
|
|
|
|
writeFile(fpath, patchedScriptlet);
|
|
|
|
generatedFiles.push(fname);
|
|
|
|
tokens.push(token);
|
|
|
|
}
|
|
|
|
|
|
|
|
if ( generatedFiles.length !== 0 ) {
|
|
|
|
log(`Scriptlet-related entity-based injectable files: ${generatedFiles.length}`);
|
|
|
|
log(`\t${generatedFiles.join(', ')}`);
|
|
|
|
}
|
|
|
|
|
|
|
|
return tokens;
|
2022-09-16 13:56:35 -06:00
|
|
|
}
|
|
|
|
|
|
|
|
/******************************************************************************/
|
|
|
|
|
2022-10-15 11:05:20 -06:00
|
|
|
async function rulesetFromURLs(assetDetails) {
|
2022-09-24 09:33:04 -06:00
|
|
|
log('============================');
|
|
|
|
log(`Listset for '${assetDetails.id}':`);
|
|
|
|
|
2022-10-15 11:05:20 -06:00
|
|
|
if ( assetDetails.text === undefined ) {
|
|
|
|
const text = await fetchAsset(assetDetails);
|
|
|
|
if ( text === '' ) { return; }
|
|
|
|
assetDetails.text = text;
|
|
|
|
}
|
2022-09-24 09:33:04 -06:00
|
|
|
|
2022-10-16 10:05:24 -06:00
|
|
|
const extensionPaths = [];
|
|
|
|
for ( const [ fname, details ] of redirectResourcesMap ) {
|
|
|
|
const path = `/web_accessible_resources/${fname}`;
|
|
|
|
extensionPaths.push([ fname, path ]);
|
|
|
|
if ( details.alias === undefined ) { continue; }
|
|
|
|
if ( typeof details.alias === 'string' ) {
|
|
|
|
extensionPaths.push([ details.alias, path ]);
|
|
|
|
continue;
|
|
|
|
}
|
|
|
|
if ( Array.isArray(details.alias) === false ) { continue; }
|
|
|
|
for ( const alias of details.alias ) {
|
|
|
|
extensionPaths.push([ alias, path ]);
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
2022-09-24 09:33:04 -06:00
|
|
|
const results = await dnrRulesetFromRawLists(
|
2022-10-15 11:05:20 -06:00
|
|
|
[ { name: assetDetails.id, text: assetDetails.text } ],
|
2022-10-16 10:05:24 -06:00
|
|
|
{ env, extensionPaths }
|
2022-09-24 09:33:04 -06:00
|
|
|
);
|
|
|
|
|
|
|
|
const netStats = await processNetworkFilters(
|
|
|
|
assetDetails,
|
|
|
|
results.network
|
|
|
|
);
|
|
|
|
|
|
|
|
// Split cosmetic filters into two groups: declarative and procedural
|
|
|
|
const declarativeCosmetic = new Map();
|
|
|
|
const proceduralCosmetic = new Map();
|
|
|
|
const rejectedCosmetic = [];
|
2022-10-10 10:28:24 -06:00
|
|
|
if ( results.specificCosmetic ) {
|
|
|
|
for ( const [ selector, details ] of results.specificCosmetic ) {
|
2022-09-24 09:33:04 -06:00
|
|
|
if ( details.rejected ) {
|
|
|
|
rejectedCosmetic.push(selector);
|
|
|
|
continue;
|
|
|
|
}
|
|
|
|
if ( selector.startsWith('{') === false ) {
|
|
|
|
declarativeCosmetic.set(selector, details);
|
|
|
|
continue;
|
|
|
|
}
|
|
|
|
const parsed = JSON.parse(selector);
|
[mv3] Add ability to handle entity-based CSS and scriptlet injection filters
This commit adds the ability to inject entity-based plain CSS
filters and also a set of the most commonly used entity-based
scriptlet injection filters.
Since the scripting API is not compatible with entity patterns,
the entity-related content scripts are injected in all documents
and the entity-matching is done by the content script themselves.
Given this, entity-based content scripts are enabled only when
working in the Complete filtering mode, there won't be any
entity-based filters injected in lower modes.
Also, since there is no way to reasonably have access to the
Public Suffix List in the content scripts, the entity-matching
algorithm is an approximation, though I expect false positives
to be rare (time will tell). In the event of such false
positive, simply falling back to Optimal mode will fix the
issue.
The following issues have been fixed at the same time:
Fixed the no-filtering mode related rules having lower priority
then redirect rules, i.e. redirect rules would still be applied
despite disabling all filtering on a site.
Fixed improper detection of changes to the generic-related CSS
content script, potentially causing undue delays when for example
trying to access the popup panel while working in Complete mode.
The scripting MV3 can be quite slow when registering/updating
large content scripts, so uBOL does its best to call the API only
if really needed, but there had been a regression in the recent
builds preventing uBO from properly detecting unchanged content
script parameters.
2022-10-20 13:48:06 -06:00
|
|
|
const matches =
|
|
|
|
details.matches.filter(hn => hn.endsWith('.*') === false);
|
|
|
|
if ( matches.length === 0 ) {
|
|
|
|
rejectedCosmetic.push(`Entity-based filter not supported: ${parsed.raw}`);
|
|
|
|
continue;
|
|
|
|
}
|
|
|
|
details.matches = matches;
|
2022-09-24 09:33:04 -06:00
|
|
|
parsed.raw = undefined;
|
|
|
|
proceduralCosmetic.set(JSON.stringify(parsed), details);
|
|
|
|
}
|
|
|
|
}
|
2022-10-15 11:05:20 -06:00
|
|
|
if ( rejectedCosmetic.length !== 0 ) {
|
|
|
|
log(`Rejected cosmetic filters: ${rejectedCosmetic.length}`);
|
|
|
|
log(rejectedCosmetic.map(line => `\t${line}`).join('\n'), true);
|
|
|
|
}
|
|
|
|
|
2022-10-10 10:28:24 -06:00
|
|
|
const genericCosmeticStats = await processGenericCosmeticFilters(
|
|
|
|
assetDetails,
|
|
|
|
results.genericCosmetic,
|
|
|
|
results.network.generichideExclusions.filter(hn => hn.endsWith('.*') === false)
|
|
|
|
);
|
|
|
|
const specificCosmeticStats = await processCosmeticFilters(
|
2022-09-24 09:33:04 -06:00
|
|
|
assetDetails,
|
|
|
|
declarativeCosmetic
|
|
|
|
);
|
2022-10-15 11:05:20 -06:00
|
|
|
const declarativeStats = await processDeclarativeCosmeticFilters(
|
|
|
|
assetDetails,
|
|
|
|
proceduralCosmetic
|
|
|
|
);
|
2022-09-24 09:33:04 -06:00
|
|
|
const proceduralStats = await processProceduralCosmeticFilters(
|
|
|
|
assetDetails,
|
|
|
|
proceduralCosmetic
|
|
|
|
);
|
|
|
|
const scriptletStats = await processScriptletFilters(
|
|
|
|
assetDetails,
|
|
|
|
results.scriptlet
|
|
|
|
);
|
|
|
|
|
|
|
|
rulesetDetails.push({
|
|
|
|
id: assetDetails.id,
|
|
|
|
name: assetDetails.name,
|
|
|
|
enabled: assetDetails.enabled,
|
|
|
|
lang: assetDetails.lang,
|
|
|
|
homeURL: assetDetails.homeURL,
|
|
|
|
filters: {
|
|
|
|
total: results.network.filterCount,
|
|
|
|
accepted: results.network.acceptedFilterCount,
|
|
|
|
rejected: results.network.rejectedFilterCount,
|
|
|
|
},
|
|
|
|
rules: {
|
|
|
|
total: netStats.total,
|
2022-09-29 17:51:33 -06:00
|
|
|
plain: netStats.plain,
|
2022-10-16 10:05:24 -06:00
|
|
|
regex: netStats.regex,
|
|
|
|
removeparam: netStats.removeparam,
|
|
|
|
redirect: netStats.redirect,
|
2022-11-05 09:09:06 -06:00
|
|
|
csp: netStats.csp,
|
2022-09-24 09:33:04 -06:00
|
|
|
discarded: netStats.discarded,
|
|
|
|
rejected: netStats.rejected,
|
|
|
|
},
|
|
|
|
css: {
|
2022-10-10 10:28:24 -06:00
|
|
|
generic: genericCosmeticStats,
|
|
|
|
specific: specificCosmeticStats,
|
2022-10-15 11:05:20 -06:00
|
|
|
declarative: declarativeStats,
|
2022-09-24 09:33:04 -06:00
|
|
|
procedural: proceduralStats,
|
|
|
|
},
|
[mv3] Add ability to handle entity-based CSS and scriptlet injection filters
This commit adds the ability to inject entity-based plain CSS
filters and also a set of the most commonly used entity-based
scriptlet injection filters.
Since the scripting API is not compatible with entity patterns,
the entity-related content scripts are injected in all documents
and the entity-matching is done by the content script themselves.
Given this, entity-based content scripts are enabled only when
working in the Complete filtering mode, there won't be any
entity-based filters injected in lower modes.
Also, since there is no way to reasonably have access to the
Public Suffix List in the content scripts, the entity-matching
algorithm is an approximation, though I expect false positives
to be rare (time will tell). In the event of such false
positive, simply falling back to Optimal mode will fix the
issue.
The following issues have been fixed at the same time:
Fixed the no-filtering mode related rules having lower priority
then redirect rules, i.e. redirect rules would still be applied
despite disabling all filtering on a site.
Fixed improper detection of changes to the generic-related CSS
content script, potentially causing undue delays when for example
trying to access the popup panel while working in Complete mode.
The scripting MV3 can be quite slow when registering/updating
large content scripts, so uBOL does its best to call the API only
if really needed, but there had been a regression in the recent
builds preventing uBO from properly detecting unchanged content
script parameters.
2022-10-20 13:48:06 -06:00
|
|
|
scriptlets: scriptletStats,
|
2022-09-24 09:33:04 -06:00
|
|
|
});
|
|
|
|
|
|
|
|
ruleResources.push({
|
|
|
|
id: assetDetails.id,
|
|
|
|
enabled: assetDetails.enabled,
|
2022-10-15 11:05:20 -06:00
|
|
|
path: `/rulesets/main/${assetDetails.id}.json`
|
2022-09-24 09:33:04 -06:00
|
|
|
});
|
2022-10-15 11:05:20 -06:00
|
|
|
}
|
2022-09-24 09:33:04 -06:00
|
|
|
|
|
|
|
/******************************************************************************/
|
|
|
|
|
2022-09-16 13:56:35 -06:00
|
|
|
async function main() {
|
|
|
|
|
|
|
|
// Get manifest content
|
|
|
|
const manifest = await fs.readFile(
|
|
|
|
`${outputDir}/manifest.json`,
|
|
|
|
{ encoding: 'utf8' }
|
|
|
|
).then(text =>
|
|
|
|
JSON.parse(text)
|
|
|
|
);
|
|
|
|
|
|
|
|
// Create unique version number according to build time
|
|
|
|
let version = manifest.version;
|
|
|
|
{
|
|
|
|
const now = new Date();
|
|
|
|
const yearPart = now.getUTCFullYear() - 2000;
|
|
|
|
const monthPart = (now.getUTCMonth() + 1) * 1000;
|
|
|
|
const dayPart = now.getUTCDate() * 10;
|
|
|
|
const hourPart = Math.floor(now.getUTCHours() / 3) + 1;
|
|
|
|
version += `.${yearPart}.${monthPart + dayPart + hourPart}`;
|
|
|
|
}
|
|
|
|
log(`Version: ${version}`);
|
|
|
|
|
2022-09-13 15:44:24 -06:00
|
|
|
// Get assets.json content
|
|
|
|
const assets = await fs.readFile(
|
|
|
|
`./assets.json`,
|
|
|
|
{ encoding: 'utf8' }
|
|
|
|
).then(text =>
|
|
|
|
JSON.parse(text)
|
|
|
|
);
|
|
|
|
|
|
|
|
// Assemble all default lists as the default ruleset
|
2022-09-16 14:36:09 -06:00
|
|
|
const contentURLs = [
|
2022-10-16 11:27:43 -06:00
|
|
|
'https://ublockorigin.github.io/uAssets/filters/filters.txt',
|
|
|
|
'https://ublockorigin.github.io/uAssets/filters/badware.txt',
|
|
|
|
'https://ublockorigin.github.io/uAssets/filters/privacy.txt',
|
|
|
|
'https://ublockorigin.github.io/uAssets/filters/resource-abuse.txt',
|
|
|
|
'https://ublockorigin.github.io/uAssets/filters/unbreak.txt',
|
|
|
|
'https://ublockorigin.github.io/uAssets/filters/quick-fixes.txt',
|
|
|
|
'https://ublockorigin.github.io/uAssets/filters/ubol-filters.txt',
|
2022-10-27 12:15:57 -06:00
|
|
|
'https://ublockorigin.github.io/uAssets/thirdparties/easylist.txt',
|
|
|
|
'https://ublockorigin.github.io/uAssets/thirdparties/easyprivacy.txt',
|
2022-09-16 14:36:09 -06:00
|
|
|
'https://pgl.yoyo.org/adservers/serverlist.php?hostformat=hosts&showintro=1&mimetype=plaintext',
|
|
|
|
];
|
2022-10-15 11:05:20 -06:00
|
|
|
await rulesetFromURLs({
|
2022-09-13 15:44:24 -06:00
|
|
|
id: 'default',
|
|
|
|
name: 'Ads, trackers, miners, and more' ,
|
|
|
|
enabled: true,
|
|
|
|
urls: contentURLs,
|
2022-09-15 11:14:08 -06:00
|
|
|
homeURL: 'https://github.com/uBlockOrigin/uAssets',
|
2022-09-13 15:44:24 -06:00
|
|
|
});
|
|
|
|
|
|
|
|
// Regional rulesets
|
2022-09-24 16:36:28 -06:00
|
|
|
const excludedLists = [
|
|
|
|
'ara-0',
|
|
|
|
'EST-0',
|
|
|
|
];
|
2022-10-10 10:28:24 -06:00
|
|
|
// Merge lists which have same target languages
|
|
|
|
const langToListsMap = new Map();
|
2022-09-13 15:44:24 -06:00
|
|
|
for ( const [ id, asset ] of Object.entries(assets) ) {
|
|
|
|
if ( asset.content !== 'filters' ) { continue; }
|
|
|
|
if ( asset.off !== true ) { continue; }
|
|
|
|
if ( typeof asset.lang !== 'string' ) { continue; }
|
2022-09-24 16:36:28 -06:00
|
|
|
if ( excludedLists.includes(id) ) { continue; }
|
2022-10-10 10:28:24 -06:00
|
|
|
let ids = langToListsMap.get(asset.lang);
|
|
|
|
if ( ids === undefined ) {
|
|
|
|
langToListsMap.set(asset.lang, ids = []);
|
|
|
|
}
|
|
|
|
ids.push(id);
|
|
|
|
}
|
|
|
|
for ( const ids of langToListsMap.values() ) {
|
|
|
|
const urls = [];
|
|
|
|
for ( const id of ids ) {
|
|
|
|
const asset = assets[id];
|
|
|
|
const contentURL = Array.isArray(asset.contentURL)
|
|
|
|
? asset.contentURL[0]
|
|
|
|
: asset.contentURL;
|
|
|
|
urls.push(contentURL);
|
|
|
|
}
|
|
|
|
const id = ids[0];
|
|
|
|
const asset = assets[id];
|
2022-10-15 11:05:20 -06:00
|
|
|
await rulesetFromURLs({
|
2022-09-13 15:44:24 -06:00
|
|
|
id: id.toLowerCase(),
|
|
|
|
lang: asset.lang,
|
|
|
|
name: asset.title,
|
|
|
|
enabled: false,
|
2022-10-10 10:28:24 -06:00
|
|
|
urls,
|
2022-09-15 11:14:08 -06:00
|
|
|
homeURL: asset.supportURL,
|
2022-09-13 15:44:24 -06:00
|
|
|
});
|
|
|
|
}
|
|
|
|
|
2022-09-15 11:14:08 -06:00
|
|
|
// Handpicked rulesets from assets.json
|
2022-09-29 17:51:33 -06:00
|
|
|
const handpicked = [ 'block-lan', 'dpollock-0', 'adguard-spyware-url' ];
|
2022-09-13 15:44:24 -06:00
|
|
|
for ( const id of handpicked ) {
|
|
|
|
const asset = assets[id];
|
|
|
|
if ( asset.content !== 'filters' ) { continue; }
|
|
|
|
|
|
|
|
const contentURL = Array.isArray(asset.contentURL)
|
|
|
|
? asset.contentURL[0]
|
|
|
|
: asset.contentURL;
|
2022-10-15 11:05:20 -06:00
|
|
|
await rulesetFromURLs({
|
2022-09-13 15:44:24 -06:00
|
|
|
id: id.toLowerCase(),
|
|
|
|
name: asset.title,
|
|
|
|
enabled: false,
|
|
|
|
urls: [ contentURL ],
|
2022-09-15 11:14:08 -06:00
|
|
|
homeURL: asset.supportURL,
|
2022-09-13 15:44:24 -06:00
|
|
|
});
|
2022-09-06 11:47:52 -06:00
|
|
|
}
|
|
|
|
|
2022-09-15 11:14:08 -06:00
|
|
|
// Handpicked rulesets from abroad
|
2022-10-15 11:05:20 -06:00
|
|
|
await rulesetFromURLs({
|
2022-09-15 11:14:08 -06:00
|
|
|
id: 'stevenblack-hosts',
|
|
|
|
name: 'Steven Black\'s hosts file',
|
|
|
|
enabled: false,
|
|
|
|
urls: [ 'https://raw.githubusercontent.com/StevenBlack/hosts/master/hosts' ],
|
|
|
|
homeURL: 'https://github.com/StevenBlack/hosts#readme',
|
|
|
|
});
|
|
|
|
|
2022-09-16 13:56:35 -06:00
|
|
|
writeFile(
|
|
|
|
`${rulesetDir}/ruleset-details.json`,
|
|
|
|
`${JSON.stringify(rulesetDetails, null, 1)}\n`
|
2022-09-15 11:14:08 -06:00
|
|
|
);
|
|
|
|
|
2022-09-29 17:51:33 -06:00
|
|
|
// We sort the hostnames for convenience/performance in the extension's
|
|
|
|
// script manager -- the scripting API does a sort() internally.
|
2022-10-15 11:05:20 -06:00
|
|
|
for ( const [ rulesetId, hostnamesToFidsMap ] of specificDetails ) {
|
|
|
|
specificDetails.set(
|
2022-09-29 17:51:33 -06:00
|
|
|
rulesetId,
|
|
|
|
Array.from(hostnamesToFidsMap).sort()
|
|
|
|
);
|
|
|
|
}
|
2022-09-16 13:56:35 -06:00
|
|
|
writeFile(
|
2022-10-15 11:05:20 -06:00
|
|
|
`${rulesetDir}/specific-details.json`,
|
|
|
|
`${JSON.stringify(specificDetails, jsonSetMapReplacer)}\n`
|
|
|
|
);
|
|
|
|
|
|
|
|
writeFile(
|
|
|
|
`${rulesetDir}/declarative-details.json`,
|
|
|
|
`${JSON.stringify(declarativeDetails, jsonSetMapReplacer, 1)}\n`
|
|
|
|
);
|
|
|
|
|
|
|
|
writeFile(
|
|
|
|
`${rulesetDir}/procedural-details.json`,
|
|
|
|
`${JSON.stringify(proceduralDetails, jsonSetMapReplacer, 1)}\n`
|
|
|
|
);
|
|
|
|
|
|
|
|
writeFile(
|
|
|
|
`${rulesetDir}/scriptlet-details.json`,
|
|
|
|
`${JSON.stringify(scriptletStats, jsonSetMapReplacer, 1)}\n`
|
|
|
|
);
|
|
|
|
|
|
|
|
writeFile(
|
|
|
|
`${rulesetDir}/generic-details.json`,
|
|
|
|
`${JSON.stringify(genericDetails, jsonSetMapReplacer, 1)}\n`
|
2022-09-16 13:56:35 -06:00
|
|
|
);
|
2022-09-06 11:47:52 -06:00
|
|
|
|
2022-10-16 10:05:24 -06:00
|
|
|
// Copy required redirect resources
|
|
|
|
for ( const path of requiredRedirectResources ) {
|
|
|
|
copyFile(`./${path}`, `${outputDir}/${path}`);
|
|
|
|
}
|
|
|
|
|
2022-09-16 13:56:35 -06:00
|
|
|
await Promise.all(writeOps);
|
2022-09-06 11:47:52 -06:00
|
|
|
|
|
|
|
// Patch manifest
|
2022-10-16 10:05:24 -06:00
|
|
|
// Patch declarative_net_request key
|
2022-09-06 11:47:52 -06:00
|
|
|
manifest.declarative_net_request = { rule_resources: ruleResources };
|
2022-10-16 10:05:24 -06:00
|
|
|
// Patch web_accessible_resources key
|
2023-04-07 08:19:43 -06:00
|
|
|
const web_accessible_resources = {
|
2022-10-16 10:05:24 -06:00
|
|
|
resources: Array.from(requiredRedirectResources).map(path => `/${path}`),
|
|
|
|
matches: [ '<all_urls>' ],
|
2023-04-07 08:19:43 -06:00
|
|
|
};
|
|
|
|
if ( commandLineArgs.get('platform') === 'chromium' ) {
|
|
|
|
web_accessible_resources.use_dynamic_url = true;
|
|
|
|
}
|
|
|
|
manifest.web_accessible_resources = [ web_accessible_resources ];
|
|
|
|
|
2022-10-16 10:05:24 -06:00
|
|
|
// Patch version key
|
2022-09-06 11:47:52 -06:00
|
|
|
const now = new Date();
|
2022-09-07 08:15:36 -06:00
|
|
|
const yearPart = now.getUTCFullYear() - 2000;
|
|
|
|
const monthPart = (now.getUTCMonth() + 1) * 1000;
|
|
|
|
const dayPart = now.getUTCDate() * 10;
|
|
|
|
const hourPart = Math.floor(now.getUTCHours() / 3) + 1;
|
|
|
|
manifest.version = manifest.version + `.${yearPart}.${monthPart + dayPart + hourPart}`;
|
2022-10-16 10:05:24 -06:00
|
|
|
// Commit changes
|
2022-09-06 11:47:52 -06:00
|
|
|
await fs.writeFile(
|
|
|
|
`${outputDir}/manifest.json`,
|
|
|
|
JSON.stringify(manifest, null, 2) + '\n'
|
|
|
|
);
|
|
|
|
|
|
|
|
// Log results
|
2022-09-27 05:46:24 -06:00
|
|
|
const logContent = stdOutput.join('\n') + '\n';
|
|
|
|
await fs.writeFile(`${outputDir}/log.txt`, logContent);
|
|
|
|
await fs.writeFile(`${cacheDir}/log.txt`, logContent);
|
2022-09-06 11:47:52 -06:00
|
|
|
}
|
|
|
|
|
|
|
|
main();
|
|
|
|
|
|
|
|
/******************************************************************************/
|