GithubFollow/Surge_by_SukkaW
1
0
Fork 0
mirror of https://github.com/SukkaW/Surge.git synced 2026-01-29 01:51:52 +08:00
Code Issues Actions 2 Packages Projects Releases Wiki Activity

Housekeeping & Update Reject Hosts

Browse Source
This commit is contained in:
SukkaW
2024-10-16 00:12:40 +08:00
parent c5ee4bad53
commit 3651999afb
7 changed files with 105 additions and 125 deletions
Download Patch File Download Diff File Expand all files Collapse all files

66
Build/constants/reject-data-source.ts
View File

@@ -34,7 +34,12 @@ export const DOMAIN_LISTS: HostsSource[] = [
export const DOMAIN_LISTS_EXTRA: HostsSource[] = [
// BarbBlock
// The barbblock list has never been updated since 2019-05, so we set a 14 days cache ttl
['https://paulgb.github.io/BarbBlock/blacklists/domain-list.txt', [], true, TTL.TWO_WEEKS()],
[
'https://paulgb.github.io/BarbBlock/blacklists/domain-list.txt',
['https://raw.githubusercontent.com/paulgb/BarbBlock/refs/heads/main/blacklists/domain-list.txt'],
true,
TTL.TWO_WEEKS()
],
// DigitalSide Threat-Intel - OSINT Hub
// Update once per day
['https://osint.digitalside.it/Threat-Intel/lists/latestdomains.txt', [], true, TTL.ONE_DAY()],
@@ -44,28 +49,28 @@ export const DOMAIN_LISTS_EXTRA: HostsSource[] = [
['https://raw.githubusercontent.com/AdguardTeam/cname-trackers/master/data/combined_disguised_trackers_justdomains.txt', [], true, TTL.THREE_DAYS()],
['https://raw.githubusercontent.com/AdguardTeam/cname-trackers/master/data/combined_disguised_clickthroughs_justdomains.txt', [], true, TTL.THREE_DAYS()],
['https://raw.githubusercontent.com/AdguardTeam/cname-trackers/master/data/combined_disguised_microsites_justdomains.txt', [], true, TTL.THREE_DAYS()],
['https://raw.githubusercontent.com/AdguardTeam/cname-trackers/master/data/combined_disguised_mail_trackers_justdomains.txt', [], true, TTL.THREE_DAYS()],
// ['https://raw.githubusercontent.com/AdguardTeam/cname-trackers/master/data/combined_disguised_mail_trackers_justdomains.txt', [], true, TTL.THREE_DAYS()],
// Curben's PUP Domains Blocklist
// The PUP filter has paused the update since 2023-05, so we set a 14 days cache ttl, and move it to extra
[
'https://pup-filter.pages.dev/pup-filter-domains.txt',
[
// 'https://malware-filter.pages.dev/pup-filter-domains.txt',
// 'https://malware-filter.gitlab.io/malware-filter/pup-filter-domains.txt',
'https://malware-filter.gitlab.io/pup-filter/pup-filter-domains.txt'
// 'https://curbengh.github.io/pup-filter/pup-filter-domains.txt',
// 'https://malware-filter.pages.dev/pup-filter-domains.txt'
],
true, TTL.TWO_WEEKS()
],
// [
// 'https://pup-filter.pages.dev/pup-filter-domains.txt',
// [
// // 'https://malware-filter.pages.dev/pup-filter-domains.txt',
// // 'https://malware-filter.gitlab.io/malware-filter/pup-filter-domains.txt',
// 'https://malware-filter.gitlab.io/pup-filter/pup-filter-domains.txt'
// // 'https://curbengh.github.io/pup-filter/pup-filter-domains.txt',
// // 'https://malware-filter.pages.dev/pup-filter-domains.txt'
// ],
// true, TTL.TWO_WEEKS()
// ],
// Curben's UrlHaus Malicious URL Blocklist
[
'https://urlhaus-filter.pages.dev/urlhaus-filter-domains.txt',
[
'https://malware-filter.pages.dev/urlhaus-filter-domains.txt',
'https://malware-filter.gitlab.io/urlhaus-filter/urlhaus-filter-domains.txt',
'https://malware-filter.gitlab.io/malware-filter/urlhaus-filter-domains.txt'
// 'https://curbengh.github.io/urlhaus-filter/urlhaus-filter-domains.txt',
'https://malware-filter.gitlab.io/malware-filter/urlhaus-filter-domains.txt',
'https://curbengh.github.io/urlhaus-filter/urlhaus-filter-domains.txt'
],
true, TTL.THREE_HOURS()
],
@@ -80,8 +85,8 @@ export const PHISHING_DOMAIN_LISTS_EXTRA: HostsSource[] = [
[
'https://malware-filter.pages.dev/phishing-filter-domains.txt',
'https://malware-filter.gitlab.io/phishing-filter/phishing-filter-domains.txt',
'https://malware-filter.gitlab.io/malware-filter/phishing-filter-domains.txt'
// 'https://curbengh.github.io/phishing-filter/phishing-filter-domains.txt'
'https://malware-filter.gitlab.io/malware-filter/phishing-filter-domains.txt',
'https://curbengh.github.io/phishing-filter/phishing-filter-domains.txt'
],
true, TTL.THREE_HOURS()
],
@@ -232,24 +237,18 @@ export const ADGUARD_FILTERS_EXTRA: AdGuardFilterSource[] = [
// uBlock Origin Resource Abuse: merged in uBlock Origin Privacy List
// [
// 'https://ublockorigin.github.io/uAssetsCDN/filters/resource-abuse.txt',
// [
// 'https://ublockorigin.pages.dev/filters/resource-abuse.txt'
// ]
// ['https://ublockorigin.pages.dev/filters/resource-abuse.txt']
// ],
// uBlock Origin Annoyances
[
'https://ublockorigin.github.io/uAssetsCDN/filters/annoyances.min.txt',
[
'https://ublockorigin.pages.dev/filters/annoyances.min.txt'
],
['https://ublockorigin.pages.dev/filters/annoyances.min.txt'],
TTL.THREE_HOURS()
],
// EasyList Annoyances
[
'https://ublockorigin.github.io/uAssetsCDN/thirdparties/easylist-annoyances.txt',
[
'https://ublockorigin.pages.dev/thirdparties/easylist-annoyances.txt'
],
['https://ublockorigin.pages.dev/thirdparties/easylist-annoyances.txt'],
TTL.THREE_HOURS()
],
// Dandelion Sprout's Annoyances
@@ -257,17 +256,13 @@ export const ADGUARD_FILTERS_EXTRA: AdGuardFilterSource[] = [
// EasyList - Newsletters
[
'https://ublockorigin.github.io/uAssetsCDN/thirdparties/easylist-newsletters.txt',
[
'https://ublockorigin.pages.dev/thirdparties/easylist-newsletters.txt'
],
['https://ublockorigin.pages.dev/thirdparties/easylist-newsletters.txt'],
TTL.THREE_HOURS()
],
// EasyList - Notifications
[
'https://ublockorigin.github.io/uAssets/thirdparties/easylist-notifications.txt',
[
'https://ublockorigin.pages.dev/thirdparties/easylist-notifications.txt'
],
['https://ublockorigin.pages.dev/thirdparties/easylist-notifications.txt'],
TTL.THREE_HOURS()
],
// Fanboy Cookie Monster (EasyList Cookie List)
@@ -279,12 +274,6 @@ export const ADGUARD_FILTERS_EXTRA: AdGuardFilterSource[] = [
],
TTL.TWLVE_HOURS()
]
// Bypass Paywall Cleaner
// [
// 'https://gitflic.ru/project/magnolia1234/bypass-paywalls-clean-filters/blob/raw?file=bpc-paywall-filter.txt',
// [],
// TTL.ONE_DAY()
// ]
];
// In a hostile network like when an ad blocker is present, apps might be crashing, and these errors need to be
@@ -326,7 +315,6 @@ export const CRASHLYTICS_WHITELIST = [
'.applicationinsights.azure.com',
'.api.loganalytics.io',
'.bugly.qcloud.com',
// '.signalfx.com',
'.cdn.signalfx.com',
'.crash-reports.browser.yandex.net',
'.crashlytics2.l.google.com',

5
Build/index.ts
View File

@@ -1,6 +1,5 @@
import process from 'node:process';
import os from 'node:os';
import wtf from 'wtfnode';
import { downloadPreviousBuild } from './download-previous-build';
import { buildCommon } from './build-common';
@@ -26,7 +25,7 @@ import { downloadMockAssets } from './download-mock-assets';
import { buildCloudMounterRules } from './build-cloudmounter-rules';
import { createSpan, printTraceResult } from './trace';
import { createSpan, printTraceResult, whyIsNodeRunning } from './trace';
import { buildDeprecateFiles } from './build-deprecate-files';
process.on('uncaughtException', (error) => {
@@ -122,7 +121,7 @@ process.on('unhandledRejection', (reason) => {
printTraceResult(rootSpan.traceResult);
// Finish the build to avoid leaking timer/fetch ref
wtf.dump();
await whyIsNodeRunning();
process.exit(0);
} catch (e) {
console.error('Something went wrong!');

13
Build/lib/get-phishing-domains.ts
View File

@@ -13,8 +13,8 @@ import { fastStringArrayJoin } from './misc';
import { stringHash } from './string-hash';
const BLACK_TLD = new Set([
'accountant', 'autos',
'bar', 'beauty', 'bid', 'biz', 'bond', 'business', 'buzz',
'accountant', 'art', 'autos',
'bar', 'beauty', 'bid', 'bio', 'biz', 'bond', 'business', 'buzz',
'cc', 'cf', 'cfd', 'click', 'cloud', 'club', 'cn', 'codes',
'co.uk', 'co.in', 'com.br', 'com.cn', 'com.pl', 'com.vn',
'cool', 'cricket', 'cyou',
@@ -72,7 +72,8 @@ const sensitiveKeywords = createKeywordFilter([
'login-microsoft',
'microsoftonline',
'google.com-',
'minecraft'
'minecraft',
'staemco'
]);
const lowKeywords = createKeywordFilter([
'transactions-',
@@ -181,16 +182,12 @@ async function processPhihsingDomains(domainArr: string[], cacheHash = '') {
domainScoreMap[apexDomain] >= 16
|| (domainScoreMap[apexDomain] >= 13 && domainCountMap[apexDomain] >= 7)
|| (domainScoreMap[apexDomain] >= 5 && domainCountMap[apexDomain] >= 10)
|| (domainScoreMap[apexDomain] >= 3 && domainCountMap[apexDomain] >= 16)
) {
domainArr.push('.' + apexDomain);
}
}
// console.log({
// count: domainCountMap['google.com'],
// score: domainScoreMap['google.com']
// });
return Promise.resolve(domainArr);
},
{

11
Build/trace/index.ts
View File

@@ -1,6 +1,5 @@
import { basename, extname } from 'node:path';
import picocolors from 'picocolors';
import wtf from 'wtfnode';
const SPAN_STATUS_START = 0;
const SPAN_STATUS_END = 1;
@@ -103,11 +102,10 @@ export function task(importMetaMain: boolean, importMetaPath: string) {
const dummySpan = createSpan(taskName);
if (importMetaMain) {
fn(dummySpan).finally(() => {
dummySpan.traceChildAsync('dummy', fn).finally(() => {
dummySpan.stop();
printTraceResult(dummySpan.traceResult);
console.log(wtf.dump());
whyIsNodeRunning();
});
}
@@ -120,6 +118,11 @@ export function task(importMetaMain: boolean, importMetaPath: string) {
};
}
export async function whyIsNodeRunning() {
const mod = await import('why-is-node-running');
return mod.default();
}
// const isSpan = (obj: any): obj is Span => {
// return typeof obj === 'object' && obj && spanTag in obj;
// };