mirror of
https://github.com/SukkaW/Surge.git
synced 2026-01-28 17:41:54 +08:00
Update CDN & Reject Hosts
This commit is contained in:
@@ -22,12 +22,7 @@ export const HOSTS_EXTRA: HostsSource[] = [
|
||||
// Dan Pollock's hosts file, 0.0.0.0 version is 30 KiB smaller
|
||||
['https://someonewhocares.org/hosts/zero/hosts', null, true, TTL.THREE_HOURS()],
|
||||
// ad-wars is not actively maintained, so we set a 7 days cache ttl
|
||||
['https://raw.githubusercontent.com/jdlingyu/ad-wars/master/hosts', null, false, TTL.TWO_WEEKS()],
|
||||
[
|
||||
'https://raw.githubusercontent.com/durablenapkin/scamblocklist/master/hosts.txt',
|
||||
[],
|
||||
true, TTL.TWLVE_HOURS()
|
||||
]
|
||||
['https://raw.githubusercontent.com/jdlingyu/ad-wars/master/hosts', null, false, TTL.TWO_WEEKS()]
|
||||
];
|
||||
|
||||
export const DOMAIN_LISTS: HostsSource[] = [
|
||||
@@ -84,6 +79,10 @@ export const DOMAIN_LISTS_EXTRA: HostsSource[] = [
|
||||
['https://raw.githubusercontent.com/Spam404/lists/master/main-blacklist.txt', [], true, TTL.TEN_DAYS()]
|
||||
];
|
||||
|
||||
export const PHISHING_HOSTS_EXTRA: HostsSource[] = [
|
||||
['https://raw.githubusercontent.com/durablenapkin/scamblocklist/master/hosts.txt', [], true, TTL.THREE_DAYS()]
|
||||
];
|
||||
|
||||
export const PHISHING_DOMAIN_LISTS_EXTRA: HostsSource[] = [
|
||||
[
|
||||
'https://phishing-filter.pages.dev/phishing-filter-domains.txt',
|
||||
@@ -396,5 +395,9 @@ export const PREDEFINED_WHITELIST = [
|
||||
'ab.chatgpt.com', // EasyPrivacy blocks this
|
||||
'jnn-pa.googleapis.com', // ad-wars
|
||||
'imasdk.googleapis.com', // ad-wars
|
||||
'.l.qq.com' // ad-wars
|
||||
'.l.qq.com', // ad-wars
|
||||
'.clients.your-server.de', // rDNS .static.183.213.201.138.clients.your-server.de
|
||||
'.bc.googleusercontent.com', // rDNS 218.178.172.34.bc.googleusercontent.com
|
||||
'.host.secureserver.net', // rDNS .64.149.167.72.host.secureserver.net,
|
||||
'.ip.linodeusercontent.com' // rDNS 45-79-169-153.ip.linodeusercontent.com
|
||||
];
|
||||
|
||||
@@ -1,10 +1,10 @@
|
||||
import { processDomainLists } from './parse-filter';
|
||||
import { processDomainLists, processHosts } from './parse-filter';
|
||||
import * as tldts from 'tldts-experimental';
|
||||
|
||||
import { dummySpan } from '../trace';
|
||||
import type { Span } from '../trace';
|
||||
import { appendArrayInPlaceCurried } from './append-array-in-place';
|
||||
import { PHISHING_DOMAIN_LISTS_EXTRA } from '../constants/reject-data-source';
|
||||
import { PHISHING_DOMAIN_LISTS_EXTRA, PHISHING_HOSTS_EXTRA } from '../constants/reject-data-source';
|
||||
import { loosTldOptWithPrivateDomains } from '../constants/loose-tldts-opt';
|
||||
import picocolors from 'picocolors';
|
||||
import createKeywordFilter from './aho-corasick';
|
||||
@@ -22,7 +22,7 @@ const BLACK_TLD = new Set([
|
||||
'ga', 'gd', 'gives', 'gq', 'group', 'host',
|
||||
'icu', 'id', 'info', 'ink',
|
||||
'lat', 'life', 'live', 'link', 'loan', 'lol', 'ltd',
|
||||
'me', 'men', 'ml', 'mobi', 'mom',
|
||||
'me', 'men', 'ml', 'mobi', 'mom', 'monster',
|
||||
'net.pl',
|
||||
'one', 'online',
|
||||
'party', 'pro', 'pl', 'pw',
|
||||
@@ -48,6 +48,12 @@ const WHITELIST_MAIN_DOMAINS = new Set([
|
||||
'zendesk.com'
|
||||
]);
|
||||
|
||||
const leathalKeywords = createKeywordFilter([
|
||||
'vinted-',
|
||||
'inpost-pl',
|
||||
'vlnted-'
|
||||
]);
|
||||
|
||||
const sensitiveKeywords = createKeywordFilter([
|
||||
'.amazon-',
|
||||
'-amazon',
|
||||
@@ -65,14 +71,15 @@ const sensitiveKeywords = createKeywordFilter([
|
||||
'booking-com',
|
||||
'booking.com-',
|
||||
'booking-eu',
|
||||
'vinted-cz',
|
||||
'vinted-',
|
||||
'inpost-pl',
|
||||
'login.microsoft',
|
||||
'login-microsoft',
|
||||
'microsoftonline',
|
||||
'google.com-',
|
||||
'minecraft',
|
||||
'staemco'
|
||||
'staemco',
|
||||
'oferta'
|
||||
]);
|
||||
const lowKeywords = createKeywordFilter([
|
||||
'transactions-',
|
||||
@@ -96,7 +103,8 @@ const lowKeywords = createKeywordFilter([
|
||||
'microsof',
|
||||
'passwordreset',
|
||||
'.google-',
|
||||
'recover'
|
||||
'recover',
|
||||
'banking'
|
||||
]);
|
||||
|
||||
const cacheKey = createCacheKey(__filename);
|
||||
@@ -154,20 +162,15 @@ const processPhihsingDomains = cache(function processPhihsingDomains(domainArr:
|
||||
if (
|
||||
// !WHITELIST_MAIN_DOMAINS.has(apexDomain)
|
||||
(domainScoreMap[apexDomain] >= 24)
|
||||
|| (domainScoreMap[apexDomain] >= 16 && domainCountMap[apexDomain] >= 4)
|
||||
|| (domainScoreMap[apexDomain] >= 13 && domainCountMap[apexDomain] >= 7)
|
||||
|| (domainScoreMap[apexDomain] >= 5 && domainCountMap[apexDomain] >= 10)
|
||||
|| (domainScoreMap[apexDomain] >= 3 && domainCountMap[apexDomain] >= 16)
|
||||
|| (domainScoreMap[apexDomain] >= 16 && domainCountMap[apexDomain] >= 7)
|
||||
|| (domainScoreMap[apexDomain] >= 13 && domainCountMap[apexDomain] >= 11)
|
||||
|| (domainScoreMap[apexDomain] >= 5 && domainCountMap[apexDomain] >= 14)
|
||||
|| (domainScoreMap[apexDomain] >= 3 && domainCountMap[apexDomain] >= 20)
|
||||
) {
|
||||
domainArr.push('.' + apexDomain);
|
||||
}
|
||||
}
|
||||
|
||||
// console.log(
|
||||
// domainScoreMap['wordpress.com'],
|
||||
// domainCountMap['wordpress.com']
|
||||
// );
|
||||
|
||||
return Promise.resolve(domainArr);
|
||||
}, {
|
||||
serializer: serializeArray,
|
||||
@@ -179,8 +182,10 @@ export function getPhishingDomains(parentSpan: Span) {
|
||||
const domainArr = await span.traceChildAsync('download/parse/merge phishing domains', async (curSpan) => {
|
||||
const domainArr: string[] = [];
|
||||
|
||||
(await Promise.all(PHISHING_DOMAIN_LISTS_EXTRA.map(entry => processDomainLists(curSpan, ...entry, cacheKey))))
|
||||
.forEach(appendArrayInPlaceCurried(domainArr));
|
||||
await Promise.all([
|
||||
...PHISHING_DOMAIN_LISTS_EXTRA.map(entry => processDomainLists(curSpan, ...entry, cacheKey)),
|
||||
...PHISHING_HOSTS_EXTRA.map(entry => processHosts(curSpan, ...entry, cacheKey))
|
||||
]).then(domainGroups => domainGroups.forEach(appendArrayInPlaceCurried(domainArr)));
|
||||
|
||||
return domainArr;
|
||||
});
|
||||
@@ -193,6 +198,10 @@ export function getPhishingDomains(parentSpan: Span) {
|
||||
}
|
||||
|
||||
export function calcDomainAbuseScore(subdomain: string, fullDomain: string = subdomain) {
|
||||
if (leathalKeywords(fullDomain)) {
|
||||
return 100;
|
||||
}
|
||||
|
||||
let weight = 0;
|
||||
|
||||
const hitLowKeywords = lowKeywords(fullDomain);
|
||||
@@ -209,17 +218,14 @@ export function calcDomainAbuseScore(subdomain: string, fullDomain: string = sub
|
||||
|
||||
const subdomainLength = subdomain.length;
|
||||
|
||||
if (subdomainLength > 6) {
|
||||
weight += 0.25;
|
||||
if (subdomainLength > 11) {
|
||||
weight += 0.6;
|
||||
if (subdomainLength > 20) {
|
||||
weight += 1;
|
||||
if (subdomainLength > 30) {
|
||||
weight += 2;
|
||||
if (subdomainLength > 40) {
|
||||
weight += 4;
|
||||
}
|
||||
if (subdomainLength > 13) {
|
||||
weight += 0.2;
|
||||
if (subdomainLength > 20) {
|
||||
weight += 1;
|
||||
if (subdomainLength > 30) {
|
||||
weight += 5;
|
||||
if (subdomainLength > 40) {
|
||||
weight += 10;
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user