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

Fix: correctly process phishing domains

Browse Source
This commit is contained in:
SukkaW 2024-01-22 00:06:07 +08:00
parent 725f26b428
commit 41b2f543f8
8 changed files with 6 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
Build/build-anti-bogus-domain.ts
View File

@ -1,8 +1,7 @@
// @ts-check // @ts-check
import path from 'path'; import path from 'path';
import { createRuleset } from './lib/create-file'; import { createRuleset } from './lib/create-file';
import { fetchRemoteTextByLine, readFileByLine, readFileIntoProcessedArray } from './lib/fetch-text-by-line'; import { fetchRemoteTextByLine, readFileIntoProcessedArray } from './lib/fetch-text-by-line';
import { processLine } from './lib/process-line';
import { task } from './trace'; import { task } from './trace';
import { SHARED_DESCRIPTION } from './lib/constants'; import { SHARED_DESCRIPTION } from './lib/constants';
import { isProbablyIpv4, isProbablyIpv6 } from './lib/is-fast-ip'; import { isProbablyIpv4, isProbablyIpv6 } from './lib/is-fast-ip';

1
Build/build-reject-domainset.ts
View File

@ -6,7 +6,6 @@ import { createTrie } from './lib/trie';
import { HOSTS, ADGUARD_FILTERS, PREDEFINED_WHITELIST, DOMAIN_LISTS } from './lib/reject-data-source'; import { HOSTS, ADGUARD_FILTERS, PREDEFINED_WHITELIST, DOMAIN_LISTS } from './lib/reject-data-source';
import { createRuleset, compareAndWriteFile } from './lib/create-file'; import { createRuleset, compareAndWriteFile } from './lib/create-file';
import { processLine } from './lib/process-line';
import { domainDeduper } from './lib/domain-deduper'; import { domainDeduper } from './lib/domain-deduper';
import createKeywordFilter from './lib/aho-corasick'; import createKeywordFilter from './lib/aho-corasick';
import { readFileByLine, readFileIntoProcessedArray } from './lib/fetch-text-by-line'; import { readFileByLine, readFileIntoProcessedArray } from './lib/fetch-text-by-line';

1
Build/download-mock-assets.ts
View File

@ -1,4 +1,3 @@
import picocolors from 'picocolors';
import { task } from './trace'; import { task } from './trace';
import path from 'path'; import path from 'path';
import { fetchWithRetry } from './lib/fetch-retry'; import { fetchWithRetry } from './lib/fetch-retry';

1
Build/lib/create-file.ts
View File

@ -1,7 +1,6 @@
// @ts-check // @ts-check
import { readFileByLine } from './fetch-text-by-line'; import { readFileByLine } from './fetch-text-by-line';
import { surgeDomainsetToClashDomainset, surgeRulesetToClashClassicalTextRuleset } from './clash'; import { surgeDomainsetToClashDomainset, surgeRulesetToClashClassicalTextRuleset } from './clash';
import { traceAsync } from './trace-runner';
import picocolors from 'picocolors'; import picocolors from 'picocolors';
import type { Span } from '../trace'; import type { Span } from '../trace';
import path from 'path'; import path from 'path';

4
Build/lib/fetch-text-by-line.ts
View File

@ -1,8 +1,8 @@
import type { BunFile } from 'bun'; import type { BunFile } from 'bun';
import { fetchWithRetry, defaultRequestInit } from './fetch-retry'; import { fetchWithRetry, defaultRequestInit } from './fetch-retry';
import { TextLineStream } from './text-line-transform-stream'; // import { TextLineStream } from './text-line-transform-stream';
import { PolyfillTextDecoderStream } from './text-decoder-stream'; // import { PolyfillTextDecoderStream } from './text-decoder-stream';
import { processLine } from './process-line'; import { processLine } from './process-line';
// function createTextLineStreamFromStreamSource(stream: ReadableStream<Uint8Array>) { // function createTextLineStreamFromStreamSource(stream: ReadableStream<Uint8Array>) {
// return stream // return stream

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

@ -1,6 +1,5 @@
import { getGorhillPublicSuffixPromise } from './get-gorhill-publicsuffix'; import { getGorhillPublicSuffixPromise } from './get-gorhill-publicsuffix';
import { processDomainLists, processHosts } from './parse-filter'; import { processDomainLists } from './parse-filter';
import { traceAsync, traceSync } from './trace-runner';
import * as tldts from 'tldts'; import * as tldts from 'tldts';
import { createTrie } from './trie'; import { createTrie } from './trie';
import { createCachedGorhillGetDomain } from './cached-tld-parse'; import { createCachedGorhillGetDomain } from './cached-tld-parse';
@ -182,8 +181,8 @@ export const getPhishingDomains = (parentSpan: Span) => parentSpan.traceChild('g
const results = span.traceChild('get final phishing results').traceSyncFn(() => { const results = span.traceChild('get final phishing results').traceSyncFn(() => {
const results: string[] = []; const results: string[] = [];
for (const domain in domainCountMap) { for (const domain in domainCountMap) {
if (domainCountMap[domain] > 5) { if (domainCountMap[domain] >= 5) {
results.push(domain); results.push(`.${domain}`);
} }
} }
return results; return results;

1
Build/lib/parse-filter.ts
View File

@ -5,7 +5,6 @@ import { processLine } from './process-line';
import { getGorhillPublicSuffixPromise } from './get-gorhill-publicsuffix'; import { getGorhillPublicSuffixPromise } from './get-gorhill-publicsuffix';
import type { PublicSuffixList } from '@gorhill/publicsuffixlist'; import type { PublicSuffixList } from '@gorhill/publicsuffixlist';
import { traceAsync } from './trace-runner';
import picocolors from 'picocolors'; import picocolors from 'picocolors';
import { normalizeDomain } from './normalize-domain'; import { normalizeDomain } from './normalize-domain';
import { fetchAssets } from './fetch-assets'; import { fetchAssets } from './fetch-assets';

1
Build/lib/trace-runner.ts
View File

@ -1,4 +1,3 @@
import path from 'path';
import picocolors from 'picocolors'; import picocolors from 'picocolors';
type Formatter = (result: string) => string; type Formatter = (result: string) => string;