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 request partiness identification when type is main_frame #1805

Merged
merged 1 commit into from
Mar 25, 2021
Merged

Fix request partiness identification when type is main_frame #1805

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
7 changes: 5 additions & 2 deletions packages/adblocker/src/request.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -189,8 +189,11 @@ function isThirdParty(
domain: string,
sourceHostname: string,
sourceDomain: string,
type: RequestType,
): boolean {
if (domain.length !== 0 && sourceDomain.length !== 0) {
if (type === 'main_frame' || type === 'mainFrame') {
return false;
} else if (domain.length !== 0 && sourceDomain.length !== 0) {
return domain !== sourceDomain;
} else if (domain.length !== 0 && sourceHostname.length !== 0) {
return domain !== sourceHostname;
Expand Down Expand Up @@ -331,7 +334,7 @@ export default class Request {
: getEntityHashesFromLabelsBackward(sourceHostname, sourceDomain);

// Decide on partiness
this.isThirdParty = isThirdParty(hostname, domain, sourceHostname, sourceDomain);
this.isThirdParty = isThirdParty(hostname, domain, sourceHostname, sourceDomain, type);
this.isFirstParty = !this.isThirdParty;

// Check protocol
Expand Down
9 changes: 9 additions & 0 deletions packages/adblocker/test/matching.test.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -306,12 +306,14 @@ describe('#NetworkFilter.match', () => {
expect(f`||foo$~third-party`).not.to.matchRequest({
sourceUrl: 'http://baz.bar.com',
url: 'https://foo.com/bar',
type: 'script',
});

// ~first-party
expect(f`||foo$~first-party`).to.matchRequest({
sourceUrl: 'http://baz.bar.com',
url: 'https://foo.com/bar',
type: 'script',
});
expect(f`||foo$~first-party`).not.to.matchRequest({
sourceUrl: 'http://baz.foo.com',
Expand Down Expand Up @@ -366,30 +368,37 @@ describe('#NetworkFilter.match', () => {
expect(f`*$3p,denyallow=x.com|y.com,domain=a.com|b.com`).to.matchRequest({
sourceUrl: 'https://a.com',
url: 'https://z.com/bar',
type: 'script',
});
expect(f`*$3p,denyallow=x.com|y.com,domain=a.com|b.com`).to.matchRequest({
sourceUrl: 'https://b.com',
url: 'https://z.com/bar',
type: 'script',
});
expect(f`*$3p,denyallow=x.com|y.com,domain=a.com|b.com`).to.matchRequest({
sourceUrl: 'https://sub.b.com',
url: 'https://z.com/bar',
type: 'script',
});
expect(f`*$3p,denyallow=x.com|y.com,domain=a.com|b.com`).to.not.matchRequest({
sourceUrl: 'https://a.com',
url: 'https://x.com/bar',
type: 'script',
});
expect(f`*$3p,denyallow=x.com|y.com,domain=a.com|b.com`).to.not.matchRequest({
sourceUrl: 'https://a.com',
url: 'https://sub.y.com/bar',
type: 'script',
});
expect(f`*$3p,denyallow=x.com|y.com,domain=a.com|b.com`).to.not.matchRequest({
sourceUrl: 'https://sub.b.com',
url: 'https://sub.y.com/bar',
type: 'script',
});
expect(f`*$3p,denyallow=x.com|y.com,domain=a.com|b.com`).to.not.matchRequest({
sourceUrl: 'https://c.com',
url: 'https://sub.y.com/bar',
type: 'script',
});
});
});
Expand Down
30 changes: 26 additions & 4 deletions packages/adblocker/test/request.test.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -233,9 +233,26 @@ describe('#Request', () => {
});

describe('finds partyness', () => {
it('correctly uses domains when available', () => {
it('considers as first-party if type is main_frame', () => {
expect(
Request.fromRawDetails({ url: 'https://foo.com', sourceUrl: 'https://foo.com' }),
Request.fromRawDetails({
sourceUrl: 'https://sub1.sub2.bar.com',
url: 'https://foo.com',
}),
).to.deep.include({
isFirstParty: true,
isThirdParty: false,
});

});

it('correctly uses domains when available if type not main_frame', () => {
expect(
Request.fromRawDetails({
url: 'https://foo.com',
sourceUrl: 'https://foo.com',
type: 'script',
}),
).to.deep.include({
isFirstParty: true,
isThirdParty: false,
Expand All @@ -245,6 +262,7 @@ describe('#Request', () => {
Request.fromRawDetails({
sourceUrl: 'https://sub1.sub2.foo.com',
url: 'https://foo.com',
type: 'script',
}),
).to.deep.include({
isFirstParty: true,
Expand All @@ -255,6 +273,7 @@ describe('#Request', () => {
Request.fromRawDetails({
sourceUrl: 'https://sub1.sub2.bar.com',
url: 'https://foo.com',
type: 'script',
}),
).to.deep.include({
isFirstParty: false,
Expand All @@ -265,28 +284,31 @@ describe('#Request', () => {
Request.fromRawDetails({
sourceUrl: 'https://localhost:4242/',
url: 'https://foo.com',
type: 'script',
}),
).to.deep.include({
isFirstParty: false,
isThirdParty: true,
});
});

it('falls-back to first-party if no sourceUrl', () => {
it('falls-back to first-party if no sourceUrl and type not main_frame', () => {
expect(
Request.fromRawDetails({
url: 'https://foo.com',
type: 'script',
}),
).to.deep.include({
isFirstParty: true,
isThirdParty: false,
});
});

it('falls-back to first-party if no url', () => {
it('falls-back to first-party if no url and type not main_frame', () => {
expect(
Request.fromRawDetails({
sourceUrl: 'null',
type: 'script',
}),
).to.deep.include({
isFirstParty: true,
Expand Down