Add default filter provider manager #18876
Merged
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
ShivanKaul
force-pushed
the
feature/localhost-permission-badfilter-adblock-rules
branch
from
695c03e
to
0fc5447
Compare
25 tasks
Register ComponentFiltersProvider with this
![github-actions[bot]](https://avatars.githubusercontent.com/in/15368?s=60&v=4){kind=small}
ShivanKaul
force-pushed
the
feature/localhost-permission-badfilter-adblock-rules
branch
from
50a9ddc
to
5376206
Compare
antonok-edm
reviewed
Jun 20, 2023
|
|
||
| // PostTask so this has an async return to match other loaders | ||
| base::SingleThreadTaskRunner::GetCurrentDefault()->PostTask( | ||
| FROM_HERE, base::BindOnce(std::move(cb), false, std::move(buffer))); |
| ->LoadDATBufferForEngine( | ||
| adblock_engine_->IsDefaultEngine(), | ||
| base::BindOnce(&AdBlockService::SourceProviderObserver::OnDATLoaded, | ||
| weak_factory_.GetWeakPtr())); |
| } else { | ||
| filters_provider_->LoadDAT( | ||
| base::BindOnce(&AdBlockService::SourceProviderObserver::OnDATLoaded, | ||
| weak_factory_.GetWeakPtr())); |
| ->LoadDATBufferForEngine( | ||
| adblock_engine_->IsDefaultEngine(), | ||
| base::BindOnce(&AdBlockService::SourceProviderObserver::OnDATLoaded, | ||
| weak_factory_.GetWeakPtr())); |
| } else { | ||
| filters_provider_->LoadDAT( | ||
| base::BindOnce(&AdBlockService::SourceProviderObserver::OnDATLoaded, | ||
| weak_factory_.GetWeakPtr())); |
antonok-edm
approved these changes
Jun 21, 2023
ShivanKaul
deleted the
feature/localhost-permission-badfilter-adblock-rules
branch
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Resolves brave/brave-browser#30996
If Localhost Permission feature is ON,
$badfilterlocalhost adblock rules. This way, clients always get localhost protections, even as we slowly roll out Localhost Permission feature.Also included in this PR: adblock engine/filter providers refactoring.
Submitter Checklist:
QA/YesorQA/No;release-notes/includeorrelease-notes/exclude;OS/...) to the associated issuenpm run test -- brave_browser_tests,npm run test -- brave_unit_testswikinpm run lint,npm run presubmitwiki,npm run gn_check,npm run tslintgit rebase master(if needed)Reviewer Checklist:
gnAfter-merge Checklist:
changes has landed on
Test Plan:
With brave://flags/#brave-localhost-access-permission on, you should not see anything blocked on https://shivankaul.com/brave/localhost/subresource.html (i.e. no
1on Shields).With the flag off, you should see it. This is because with the flag off, we inject the localhost blocking adblock rules, while we don't if the flag is on.
After this change, you don't need to add any exception adblock filter rules to test the localhost permission feature. Test plan from #17321 (comment) can be followed without the need to add the
@@||localhost^$domain=shivankaul.comfilter rule.shivankaul.comstill needs to be allowlisted locally -- see #18354 (comment) for how to do that.