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 HTTPSE redirects having stronger precedence over adblock redirects #15754

Merged
merged 3 commits into from
Nov 2, 2022

Conversation

antonok-edm
Copy link
Collaborator

Resolves brave/brave-browser#26415

Submitter Checklist:

  • I confirm that no security/privacy review is needed, or that I have requested one
  • 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, npm run lint, 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:

Note the STR from the associated issue:

  1. Add this as a custom filter:
    ||google-analytics.com/analytics.js$script,redirect=google-analytics.com/analytics.js [...]

  2. go to http://markkystreams.com/ [...]

  3. Open shields and it will say google-analytics.com/analytics.js was upgraded and blocked.

  4. Open DevTools and you will see analytics is in the source list, so Shields information is not accurate since the script wasn't blocked, because if it was, it wouldn't be in the list and it wasn't redirected since the script is the same analytics script used by the page, not the uBlock one.

In step 3, verify that http://www.google-analytics.com/analytics.js appears in the counter menu next to the Block trackers and ads setting rather than the Upgrade connections to HTTPS setting.

In step 4, verify that the analytics.js entry in the network panel has contents (Response tab) starting with the uBlock Origin copyright header.

@kjozwiak
Copy link
Member

kjozwiak commented Nov 3, 2022

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

Brave | 1.47.41 Chromium: 107.0.5304.91 (Official Build) nightly (64-bit)
-- | --
Revision | 3d5948960d62418160796d5831a4d2d7d6c90fa8-refs/branch-heads/5304@{#1097}
OS | Windows 11 Version 22H2 (Build 22621.755)

Reproduced the original issue using the STR/Case outlined via #15754 (comment) using 1.47.39 Chromium: 107.0.5304.91 as per the following:

Example Example Example
reproduced1 reproduced2 reproduced3

Using the same STR/Cases, verified that google-analytics.com/analytics.js wasn't appearing under Upgrade connections to HTTPS and ensured that analytics.js via the Response tab displayed the uBlock Origin header as per the following:

Example Example Example
Fixed1 Fixed2 Fixed3

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
CI/run-network-audit Run network-audit
Projects
None yet
Development

Successfully merging this pull request may close these issues.

Issue with $redirect when the script is upgraded to HTTPS.
3 participants