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.

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

Add first-party exception list to the correct adblock engine #20826

Merged
merged 1 commit into from
Nov 3, 2023

Conversation

antonok-edm
Copy link
Collaborator

Resolves brave/brave-browser#34081

This was previously fixed in a more elegant/scalable/tested way by #19946, but that was reverted.

Since multiple other issues have come up in the meantime, I haven't had a good chance to update the original changes, but we should merge and uplift this one in the meantime.

Submitter Checklist:

  • I confirm that no security/privacy review is needed and no other type of reviews are needed, or that I have requested them
  • There is a ticket for my issue
  • Used Github auto-closing keywords in the PR description above
  • Wrote a good PR/commit description
  • Squashed any review feedback or "fixup" commits before merge, so that history is a record of what happened in the repo, not your PR
  • Added appropriate labels (QA/Yes or QA/No; release-notes/include or release-notes/exclude; OS/...) to the associated issue
  • Checked the PR locally:
    • npm run test -- brave_browser_tests, npm run test -- brave_unit_tests wiki
    • npm run lint, npm run presubmit wiki, npm run gn_check, npm run tslint
  • Ran git rebase master (if needed)

Reviewer Checklist:

  • A security review is not needed, or a link to one is included in the PR description
  • New files have MPL-2.0 license header
  • Adequate test coverage exists to prevent regressions
  • Major classes, functions and non-trivial code blocks are well-commented
  • Changes in component dependencies are properly reflected in gn
  • Code follows the style guide
  • Test plan is specified in PR before merging

After-merge Checklist:

Test Plan:

Visit the sites listed in the associated issue and confirm that the problematic elements are hidden in standard Shields mode.

Copy link
Contributor

@pes10k pes10k left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

SGTM!

@antonok-edm antonok-edm merged commit d11b6ba into master Nov 3, 2023
17 checks passed
@antonok-edm antonok-edm deleted the fix-first-party-blocking branch November 3, 2023 19:11
@github-actions github-actions bot added this to the 1.62.x - Nightly milestone Nov 3, 2023
brave-builds added a commit that referenced this pull request Nov 3, 2023
brave-builds added a commit that referenced this pull request Nov 3, 2023
@kjozwiak
Copy link
Member

kjozwiak commented Nov 6, 2023

Verification PASSED on Win 11 x64 using the following build(s):

Brave | 1.62.28 Chromium: 119.0.6045.105 (Official Build) nightly (64-bit)
-- | --
Revision | af1dadeae432bc6f1bed980ac4123d5b7dda6e24
OS | Windows 11 Version 22H2 (Build 22621.2506)

dailymail.co.uk

Example Example
image image

imdb.com

Example Example
image image

politico.com

Example Example
image image

Verification PASSED on Pixel 8 Pro running Android 14 using the following build(s):

Brave | 1.62.29 Chromium: 119.0.6045.105 (Official Build) canary (64-bit)
--- | ---
Revision | 722db0323f23c1aaee8a62326083bced61909279
OS | Android 14; Build/UD1A.230803.041; 34; REL

dailymail.co.uk

Example Example
Screenshot_20231106-154953 Screenshot_20231106-154843

imdb.com

Example Example
Screenshot_20231106-154937 Screenshot_20231106-154901

politico.com

Example Example
Screenshot_20231106-155020 Screenshot_20231106-155013

kjozwiak pushed a commit that referenced this pull request Nov 6, 2023
kjozwiak pushed a commit that referenced this pull request Nov 6, 2023
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

Problematic first party elements are not blocked by Shields in Standard mode
4 participants