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

Feat: reject hosts accept third-party

Browse Source
This commit is contained in:
SukkaW
2024-09-23 09:56:07 +08:00
parent b91747e07f
commit ce95a2414a
2 changed files with 27 additions and 20 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -148,7 +148,8 @@ export async function processFilterRules(
parentSpan: Span,
filterRulesUrl: string,
fallbackUrls?: readonly string[] | null,
ttl: number | null = null
ttl: number | null = null,
allowThirdParty = false
): Promise<{ white: string[], black: string[], foundDebugDomain: boolean }> {
const [white, black, warningMessages] = await parentSpan.traceChild(`process filter rules: ${filterRulesUrl}`).traceAsyncFn((span) => fsFetchCache.apply<Readonly<[
white: string[],
@@ -167,7 +168,7 @@ export async function processFilterRules(
* @param {string} line
*/
const lineCb = (line: string) => {
const result = parse(line, MUTABLE_PARSE_LINE_RESULT);
const result = parse(line, MUTABLE_PARSE_LINE_RESULT, allowThirdParty);
const flag = result[1];
if (flag === ParseType.Null) {
@@ -295,7 +296,7 @@ const kwfilter = createKeywordFilter([
'^popup'
]);
export function parse($line: string, result: [string, ParseType]): [hostname: string, flag: ParseType] {
export function parse($line: string, result: [string, ParseType], allowThirdParty: boolean): [hostname: string, flag: ParseType] {
if (
// doesn't include
!$line.includes('.') // rule with out dot can not be a domain
@@ -391,6 +392,11 @@ export function parse($line: string, result: [string, ParseType]): [hostname: st
return result;
}
if (_3p) {
if (allowThirdParty) {
result[0] = hostname;
result[1] = isIncludeAllSubDomain ? ParseType.BlackIncludeSubdomain : ParseType.BlackAbsolute;
return result;
}
result[1] = ParseType.Null;
return result;
}