Skip to content

Fix cross-engine exceptions in standard blocking mode #22681

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

Merged
merged 1 commit into from
Mar 20, 2024
Merged

Fix cross-engine exceptions in standard blocking mode #22681

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
19 changes: 19 additions & 0 deletions browser/brave_shields/ad_block_service_browsertest.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -458,6 +458,25 @@ IN_PROC_BROWSER_TEST_F(AdBlockServiceTest, CustomBlockDefaultException) {
EXPECT_EQ(profile()->GetPrefs()->GetUint64(kAdsBlocked), 0ULL);
}

// Load a page with an image blocked by custom filters, with a corresponding
// exception installed in the default filters, and make sure it is not blocked.
IN_PROC_BROWSER_TEST_F(AdBlockServiceTest,
CustomBlockDefaultExceptionStandardMode) {
DisableAggressiveMode();

UpdateAdBlockInstanceWithRules("@@ad_banner.png");
UpdateCustomAdBlockInstanceWithRules("*ad_banner.png");

GURL url = embedded_test_server()->GetURL(kAdBlockTestPage);
NavigateToURL(url);
content::WebContents* contents = web_contents();

ASSERT_EQ(true, EvalJs(contents,
"setExpectations(1, 0, 0, 0);"
"addImage('ad_banner.png')"));
EXPECT_EQ(profile()->GetPrefs()->GetUint64(kAdsBlocked), 0ULL);
}

// Load a page with an image which is not an ad, and make sure it is NOT
// blocked.
IN_PROC_BROWSER_TEST_F(AdBlockServiceTest,
Expand Down
18 changes: 11 additions & 7 deletions components/brave_shields/content/browser/ad_block_service.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -139,17 +139,15 @@ adblock::BlockerResult AdBlockService::ShouldStartRequest(
bool previously_matched_important) {
DCHECK(GetTaskRunner()->RunsTasksInCurrentSequence());

adblock::BlockerResult fp_result = {};

adblock::BlockerResult fp_result = default_engine_->ShouldStartRequest(
url, resource_type, tab_host, previously_matched_rule,
previously_matched_exception, previously_matched_important);
if (aggressive_blocking ||
base::FeatureList::IsEnabled(
brave_shields::features::kBraveAdblockDefault1pBlocking) ||
!SameDomainOrHost(
url, url::Origin::CreateFromNormalizedTuple("https", tab_host, 80),
net::registry_controlled_domains::INCLUDE_PRIVATE_REGISTRIES)) {
fp_result = default_engine_->ShouldStartRequest(
url, resource_type, tab_host, previously_matched_rule,
previously_matched_exception, previously_matched_important);
// removeparam results from the default engine are ignored in default
// blocking mode
if (!aggressive_blocking) {
Expand All @@ -158,14 +156,20 @@ adblock::BlockerResult AdBlockService::ShouldStartRequest(
if (fp_result.important) {
return fp_result;
}
} else {
// if there's an exception from the default engine, it still needs to be
// considered by the additional engine
fp_result = {.has_exception = fp_result.has_exception};
}

GURL request_url = fp_result.rewritten_url.has_value
? GURL(std::string(fp_result.rewritten_url.value))
: url;
auto result = additional_filters_engine_->ShouldStartRequest(
request_url, resource_type, tab_host, previously_matched_rule,
previously_matched_exception, previously_matched_important);
request_url, resource_type, tab_host,
previously_matched_rule | fp_result.matched,
previously_matched_exception | fp_result.has_exception,
previously_matched_important | fp_result.important);

result.matched |= fp_result.matched;
result.has_exception |= fp_result.has_exception;
Expand Down