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

Get scriptlets working in about:blank frames #25345

Merged
merged 3 commits into from
Aug 31, 2024
Merged

Conversation

antonok-edm
Copy link
Collaborator

Resolves brave/brave-browser#40703

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 these rules to the custom filters in brave://settings/shields/filters:
scriptlet.localframes.xyz##+js(set, sval, 1)
scriptlet.localframetesting.xyz##+js(set, sval, 42)
  1. Visit scriptlet.localframes.xyz.
  2. The first-party local frames should report a value of 1 instead of undefined, and the third-party local frames should report a value of 42 instead of undefined.

@antonok-edm antonok-edm requested review from pes10k and goodov August 27, 2024 17:39
@antonok-edm antonok-edm self-assigned this Aug 27, 2024
@antonok-edm antonok-edm requested a review from a team as a code owner August 27, 2024 17:39
@antonok-edm antonok-edm force-pushed the about-blank-scriptlets branch from b045269 to 7e54a53 Compare August 27, 2024 18:44
Copy link
Member

@goodov goodov left a comment

Choose a reason for hiding this comment

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

lgtm assuming you did check the test fails without the change in the js_handler.

browser/brave_shields/ad_block_service_browsertest.cc Outdated Show resolved Hide resolved
@antonok-edm antonok-edm force-pushed the about-blank-scriptlets branch from a64a2e2 to 3d1de61 Compare August 30, 2024 23:29
@antonok-edm antonok-edm enabled auto-merge August 30, 2024 23:29
@antonok-edm antonok-edm merged commit 7b301af into master Aug 31, 2024
22 checks passed
@antonok-edm antonok-edm deleted the about-blank-scriptlets branch August 31, 2024 01:20
@github-actions github-actions bot added this to the 1.71.x - Nightly milestone Aug 31, 2024
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.

Inject scriptlets in about:blank frames
3 participants