Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

fix: check domains validity when parsing network filters #4525

Open
wants to merge 11 commits into
base: master
Choose a base branch
from
Open

fix: check domains validity when parsing network filters #4525

Show file tree
Hide file tree
Changes from 5 commits
Commits
Show all changes
11 commits
Select commit Hold shift + click to select a range
287a69e
refactor: integrate emptiness check to `Domains.parse`
seia-soto Dec 12, 2024
ac2a11a
chore: reject when invalid domains given for `denyallow` and `domain`
seia-soto Dec 12, 2024
8691608
fix: `NetworkFilter.prototype.toString` printing invalid domains
seia-soto Dec 12, 2024
e63830c
refactor: use `replace` instead of `split` then `join`
seia-soto Dec 12, 2024
23d8452
fix: denyallow rejected by invalid condition
seia-soto Dec 12, 2024
96f51b8
test: `Domains.parse`
seia-soto Dec 13, 2024
8fbbc38
refactor: separate function only for network filters
seia-soto Dec 25, 2024
1357363
fix: `#normalizeNetworkEntities` not respecting valids
seia-soto Dec 25, 2024
7e4743a
test: NetworkFilter.prototype.toString to omit `|` as sep
seia-soto Dec 25, 2024
071550b
feat: reject invalid inputs for Domains
seia-soto Dec 31, 2024
9c86aad
refactor: accept `isNetworkEntities` in `Domains.prototype.parse`
seia-soto Jan 6, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 7 additions & 1 deletion packages/adblocker/src/engine/domains.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,13 @@ import { binLookup, hasUnicode, HASH_INTERNAL_MULT } from '../utils.js';

export class Domains {
public static parse(parts: string[], debug: boolean = false): Domains | undefined {
if (parts.length === 0) {
if (
parts.length === 0 ||
// We accept parts after splitting a string by `|`
// Empty first and last entry indicates it's invalid
parts[0].length === 0 ||
parts[parts.length - 1].length === 0
) {
return undefined;
}

Expand Down
16 changes: 7 additions & 9 deletions packages/adblocker/src/filters/network.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -733,19 +733,17 @@ export default class NetworkFilter implements IFilter {
switch (option) {
case 'denyallow': {
denyallow = Domains.parse(value.split('|'), debug);
if (denyallow === undefined) {
return null;
}
break;
}
case 'domain':
case 'from': {
// domain list starting or ending with '|' is invalid
if (
value.charCodeAt(0) === 124 /* '|' */ ||
value.charCodeAt(value.length - 1) === 124 /* '|' */
) {
domains = Domains.parse(value.split('|'), debug);
if (domains === undefined) {
return null;
}

domains = Domains.parse(value.split('|'), debug);
break;
}
case 'badfilter':
Expand Down Expand Up @@ -1517,15 +1515,15 @@ export default class NetworkFilter implements IFilter {

if (this.domains !== undefined) {
if (this.domains.parts !== undefined) {
options.push(`domain=${this.domains.parts}`);
options.push(`domain=${this.domains.parts.replace(/,/g, '|')}`);
} else {
options.push('domain=<hashed>');
}
}

if (this.denyallow !== undefined) {
if (this.denyallow.parts !== undefined) {
options.push(`denyallow=${this.denyallow.parts}`);
options.push(`denyallow=${this.denyallow.parts.replace(/,/g, '|')}`);
} else {
options.push('denyallow=<hashed>');
}
Expand Down
Loading