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

fix(privacy): Generic cosmetic filter list rules are not applied on some sites on iOS #26729

Merged
merged 1 commit into from
Nov 25, 2024

Conversation

StephenHeaps
Copy link
Collaborator

@StephenHeaps StephenHeaps commented Nov 25, 2024

  • An invalid id value was being passed from javascript to Swift to check against the AdblockEngine to determine if it should be hidden. This invalid id was causing the message to fail and never be sent to Swift / native, so it was never checked against the AdblockEngine.
  • Fixed by fetching the id via getAttribute, and added a safety string check.

Resolves brave/brave-browser#42471

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 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:

  1. Add custom filter rules:
##.cc-bottom.cc-floating.cc-window
##div.cc-revoke
  1. Visit https://laurentferrier.ch/products/classic-auto-sandstone?variant=44866903605410
  2. Verify cookie banner is hidden
  3. Visit https://www.chefs-edge.com/collections/whetstones/products/shapton-rockstar-whetstone-1000-grit
  4. Verify cookie banner is hidden
  5. Visit https://goldammer.me/collections/all
  6. Verify cookie banner is hidden

@StephenHeaps StephenHeaps added CI/skip-android Do not run CI builds for Android CI/skip-macos-x64 Do not run CI builds for macOS x64 CI/skip-windows-x64 Do not run CI builds for Windows x64 CI/skip-macos-arm64 Do not run CI builds for macOS arm64 labels Nov 25, 2024
@StephenHeaps StephenHeaps self-assigned this Nov 25, 2024
@StephenHeaps StephenHeaps requested a review from a team as a code owner November 25, 2024 18:43
@StephenHeaps StephenHeaps force-pushed the privacy/fix-ios-generic-cosmetic-filters branch from 9e50a95 to beea26e Compare November 25, 2024 19:46
@StephenHeaps StephenHeaps enabled auto-merge (squash) November 25, 2024 19:47
@StephenHeaps StephenHeaps merged commit 9f94076 into master Nov 25, 2024
17 checks passed
@StephenHeaps StephenHeaps deleted the privacy/fix-ios-generic-cosmetic-filters branch November 25, 2024 20:44
@github-actions github-actions bot added this to the 1.75.x - Nightly milestone Nov 25, 2024
brave-builds added a commit that referenced this pull request Nov 25, 2024
brave-builds added a commit that referenced this pull request Nov 25, 2024
@brave-builds
Copy link
Collaborator

Released in v1.75.50

@kjozwiak
Copy link
Member

Verification PASSED on iPhone 11 running iOS 18.1 using the following build(s):

Brave | 1.75.50 Chromium: 131.0.6778.85 (Official Build) nightly (64-bit)
--- | ---
Revision | 51f4782c9391...
OS | iOS

Using the STR/Cases outlined via #26729 (comment), ensured that the cookie banners are not appearing on the websites mentioned above as per the following:

IMG_0667

https://laurentferrier.ch/products/classic-auto-sandstone?variant=44866903605410

ScreenRecording_11-26-2024.16-06-26_1.MP4

https://www.chefs-edge.com/collections/whetstones/products/shapton-rockstar-whetstone-1000-grit

ScreenRecording_11-26-2024.16-07-44_1.MP4

https://goldammer.me/collections/all

ScreenRecording_11-26-2024.16-08-47_1.MP4

kjozwiak pushed a commit that referenced this pull request Nov 26, 2024
…ome sites on iOS (uplift to 1.74.x) (#26735)

Uplift of #26729 (squashed) to beta
kjozwiak pushed a commit that referenced this pull request Nov 26, 2024
…ome sites on iOS (uplift to 1.73.x) (#26736)

Uplift of #26729 (squashed) to release
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
CI/skip-android Do not run CI builds for Android CI/skip-macos-arm64 Do not run CI builds for macOS arm64 CI/skip-macos-x64 Do not run CI builds for macOS x64 CI/skip-windows-x64 Do not run CI builds for Windows x64
Projects
None yet
Development

Successfully merging this pull request may close these issues.

Generic cosmetic filter list rules are not applied on some sites
5 participants