GithubFollow/Surge_by_SukkaW
1
0
Fork 0
mirror of https://github.com/SukkaW/Surge.git synced 2025-12-13 01:30:37 +08:00
Code Issues Actions 2 Packages Projects Releases Wiki Activity

Enforce blocking Firefox telemetry

Browse Source
This commit is contained in:
SukkaW 2023-02-11 21:09:01 +08:00
parent c49c7e6afc
commit c273db6832
2 changed files with 27 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

25
Build/build-reject-domainset.js
View File

@ -7,7 +7,7 @@ const cpuCount = require('os').cpus().length;
const { isCI } = require('ci-info'); const { isCI } = require('ci-info');
const threads = isCI ? cpuCount : cpuCount / 2; const threads = isCI ? cpuCount : cpuCount / 2;
const { HOSTS, ADGUARD_FILTERS, PREDEFINED_WHITELIST } = require('./lib/reject-data-source'); const { HOSTS, ADGUARD_FILTERS, PREDEFINED_WHITELIST, PREDEFINED_ENFORCED_BACKLIST } = require('./lib/reject-data-source');
const { withBannerArray } = require('./lib/with-banner'); const { withBannerArray } = require('./lib/with-banner');
const { compareAndWriteFile } = require('./lib/string-array-compare'); const { compareAndWriteFile } = require('./lib/string-array-compare');
@ -53,7 +53,12 @@ const filterRuleWhitelistDomainSets = new Set(PREDEFINED_WHITELIST);
if (foundDebugDomain) { if (foundDebugDomain) {
shouldStop = true; shouldStop = true;
} }
white.forEach(i => filterRuleWhitelistDomainSets.add(i)); white.forEach(i => {
if (PREDEFINED_ENFORCED_BACKLIST.some(j => i.endsWith(j))) {
return;
}
filterRuleWhitelistDomainSets.add(i);
});
black.forEach(i => domainSets.add(i)); black.forEach(i => domainSets.add(i));
} else { } else {
process.exit(1); process.exit(1);
@ -68,8 +73,18 @@ const filterRuleWhitelistDomainSets = new Set(PREDEFINED_WHITELIST);
input => processFilterRules(input).then((i) => { input => processFilterRules(input).then((i) => {
if (i) { if (i) {
const { white, black } = i; const { white, black } = i;
white.forEach(i => filterRuleWhitelistDomainSets.add(i)); white.forEach(i => {
black.forEach(i => filterRuleWhitelistDomainSets.add(i)); if (PREDEFINED_ENFORCED_BACKLIST.some(j => i.endsWith(j))) {
return;
}
filterRuleWhitelistDomainSets.add(i)
});
black.forEach(i => {
if (PREDEFINED_ENFORCED_BACKLIST.some(j => i.endsWith(j))) {
return;
}
filterRuleWhitelistDomainSets.add(i)
});
} else { } else {
process.exit(1); process.exit(1);
} }
@ -262,7 +277,7 @@ const filterRuleWhitelistDomainSets = new Set(PREDEFINED_WHITELIST);
} }
})(); })();
function isInWhiteList (domain) { function isInWhiteList(domain) {
for (const white of filterRuleWhitelistDomainSets) { for (const white of filterRuleWhitelistDomainSets) {
if (domain === white || domain.endsWith(white)) { if (domain === white || domain.endsWith(white)) {
return true; return true;

9
Build/lib/reject-data-source.js
View File

@ -16,7 +16,7 @@ const ADGUARD_FILTERS = [
'https://raw.githubusercontent.com/easylist/easylist/gh-pages/easylist.txt', 'https://raw.githubusercontent.com/easylist/easylist/gh-pages/easylist.txt',
'https://secure.fanboy.co.nz/easylist.txt' 'https://secure.fanboy.co.nz/easylist.txt'
], ],
true false
], ],
// Easy Privacy // Easy Privacy
[ [
@ -26,7 +26,7 @@ const ADGUARD_FILTERS = [
'https://raw.githubusercontent.com/easylist/easylist/gh-pages/easyprivacy.txt', 'https://raw.githubusercontent.com/easylist/easylist/gh-pages/easyprivacy.txt',
'https://easylist-downloads.adblockplus.org/easyprivacy.txt' 'https://easylist-downloads.adblockplus.org/easyprivacy.txt'
], ],
true false
], ],
// AdGuard DNS Filter // AdGuard DNS Filter
'https://adguardteam.github.io/AdGuardSDNSFilter/Filters/filter.txt', 'https://adguardteam.github.io/AdGuardSDNSFilter/Filters/filter.txt',
@ -212,6 +212,11 @@ const PREDEFINED_WHITELIST = [
'fastly-analytics.com' 'fastly-analytics.com'
]; ];
const PREDEFINED_ENFORCED_BACKLIST = [
'telemetry.mozilla.org'
];
module.exports.HOSTS = HOSTS; module.exports.HOSTS = HOSTS;
module.exports.ADGUARD_FILTERS = ADGUARD_FILTERS; module.exports.ADGUARD_FILTERS = ADGUARD_FILTERS;
module.exports.PREDEFINED_WHITELIST = PREDEFINED_WHITELIST; module.exports.PREDEFINED_WHITELIST = PREDEFINED_WHITELIST;
module.exports.PREDEFINED_ENFORCED_BACKLIST = PREDEFINED_ENFORCED_BACKLIST;