-
Notifications
You must be signed in to change notification settings - Fork 888
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.
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
Implement first-party domain blocking #7952
Conversation
5d49955
to
20535ff
Compare
20535ff
to
5d2086f
Compare
5d2086f
to
098b5de
Compare
does this do anything for pages loaded in iframes, or do those just get blocked/allowed without an interstitial? |
components/brave_shields/browser/domain_blocked_navigation_throttle.cc
Outdated
Show resolved
Hide resolved
@diracdeltas those should already be handled from before this PR with the latter behavior |
d4750a8
to
416c027
Compare
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Just tested out this PR with DEPS
updated to include brave/adblock-rust@732994b, and the resource type from domain_blocked_navigation_throttle.cc
updated to kMainFrame
.
After manually loading a custom DAT built using the corresponding adblock-rust
version, entering any of the domains from Peter Lowe's list brings up an interstitial as expected. Other than the changes above, this looks good to me 😄
@pilgrim-brave the DAT in question is here, if you'd like to try it out on your end as well.
That's great news, thank you. Should I include the |
@pilgrim-brave you can go ahead and include it in this PR as soon as brave/adblock-rust-ffi#34 is merged into |
3c6e309
to
0ee841e
Compare
Ready for review. |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
This looks good to me 👍
I'll take another look soon |
0ee841e
to
4383f57
Compare
4699822
to
1d30188
Compare
@pilgrim-brave would be really helpful to see new changes as new commits when they are not trivial |
OK. The latest version includes a feature flag as requested and checks it in |
Also a new test to check that disabling the feature flag disables the interstitial properly. |
9d23fea
to
0758881
Compare
components/brave_shields/browser/domain_block_navigation_throttle.cc
Outdated
Show resolved
Hide resolved
0758881
to
ed57581
Compare
CI failures are unrelated. |
Resolves brave/brave-browser#14134
Submitter Checklist:
QA/Yes
orQA/No
;release-notes/include
orrelease-notes/exclude
;OS/...
) to the associated issuenpm run test -- brave_browser_tests
,npm run test -- brave_unit_tests
,npm run lint
,npm run gn_check
,npm run tslint
git rebase master
(if needed)Reviewer Checklist:
gn
After-merge Checklist:
changes has landed on
Test Plan: