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

V8: TrackerDB handles exceptions #1472

Merged
merged 2 commits into from
Feb 8, 2024
Merged

V8: TrackerDB handles exceptions #1472

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
ad6bf3f
v8: trackerdb handles exceptions
chrmod Feb 8, 2024
b5b0c72
Checking against ad-blocking exception list (not trackerdb)
chrmod Feb 8, 2024
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
51 changes: 27 additions & 24 deletions extension-manifest-v2/src/classes/EventHandlers.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -308,7 +308,8 @@ class EventHandlers {
const incognito = tabInfo.getTabInfo(tab_id, 'incognito');
const tab_host = tabInfo.getTabInfo(tab_id, 'host');
const fromRedirect = globals.REDIRECT_MAP.has(request_id);
const { block, reason } = EventHandlers._checkBlocking(app_id, cat_id, tab_id, tab_host, page_url, request_id);
// eslint-disable-next-line prefer-const
let { block, reason } = EventHandlers._checkBlocking(app_id, cat_id, tab_id, tab_host, page_url, request_id);
if (!block && [BLOCK_REASON_SS_UNBLOCKED, BLOCK_REASON_GLOBAL_UNBLOCKED].indexOf(reason) > -1) {
// The way to pass this flag to Common handlers
eventMutable.ghosteryWhitelisted = true;
Expand All @@ -328,24 +329,6 @@ class EventHandlers {
};
}

// process the tracker asynchronously
// very important to block request processing as little as necessary
setTimeout(() => {
if (tabInfo.getTabInfo(tab_id, 'url') !== eventMutable.tabUrl) {
return;
}
this._processBug({
bug_id,
app_id,
type: eventMutable.type,
url: eventMutable.url,
block: conf.enable_ad_block && block,
tab_id,
from_frame: eventMutable.parentFrameId !== -1,
request_id
});
}, 1);

if (block && isFilterMatched && conf.show_redirect_tracking_dialogs && fromRedirect) {
const url = buildRedirectC2P(globals.REDIRECT_MAP.get(request_id), app_id);
setTimeout(() => {
Expand All @@ -356,9 +339,10 @@ class EventHandlers {

// This is here to let common/adblocker handle previously TrackerDB matched requests as
// if it would do it with its own engine.
let adblockerOnBeforeRequest;
if (conf.enable_ad_block && block && isFilterMatched) {
// let the Tracker Db do the blocking according to ghostery-common/adblocker logic
const onBeforeRequest = common.modules.adblocker.background.adblocker.onBeforeRequest.bind({
adblockerOnBeforeRequest = common.modules.adblocker.background.adblocker.onBeforeRequest.bind({
shouldProcessRequest(context, _response) {
// Ignore background requests
if (context.isBackgroundRequest()) {
Expand All @@ -382,18 +366,37 @@ class EventHandlers {
manager: {
engine: {
...bugDb.engine,
match() {
return { match: true, redirect: shoudlRedirect };
match(request) {
block = !common.modules.adblocker.background.adblocker.manager.engine.exceptions.match(request);
return { match: block, redirect: shoudlRedirect && block };
},
}
}
}),
stats: common.modules.adblocker.background.adblocker.stats,
});
}

if (!onBeforeRequest(eventMutable, response)) {
return {};
// process the tracker asynchronously
// very important to block request processing as little as necessary
setTimeout(() => {
if (tabInfo.getTabInfo(tab_id, 'url') !== eventMutable.tabUrl) {
return;
}
this._processBug({
bug_id,
app_id,
type: eventMutable.type,
url: eventMutable.url,
block: conf.enable_ad_block && block,
tab_id,
from_frame: eventMutable.parentFrameId !== -1,
request_id
});
}, 1);

if (adblockerOnBeforeRequest && !adblockerOnBeforeRequest(eventMutable, response)) {
return {};
}

return { cancel: false };
Expand Down
Loading