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.

Sign up for GitHub

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

Jump to bottom

Don't impose WebSockets limits on Extensions #12597

Merged
merged 2 commits into from
Mar 15, 2022
Merged

Don't impose WebSockets limits on Extensions #12597

merged 2 commits into from
Mar 15, 2022

Conversation

goodov
Copy link
Member

@goodov goodov commented Mar 15, 2022 •
edited
Loading

Resolves brave/brave-browser#21661

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:

@goodov goodov requested a review from a team as a code owner March 15, 2022 07:47
goodov
goodov commented Mar 15, 2022
View reviewed changes
chromium_src/third_party/blink/renderer/modules/websockets/websocket_channel_impl.h
@@ -30,7 +30,7 @@ using WebSocketChannelImpl_BraveImpl = WebSocketChannelImpl;

namespace blink {

class MODULES_EXPORT WebSocketChannelImpl
class MODULES_EXPORT WebSocketChannelImpl final
Copy link
Member Author

Choose a reason for hiding this comment

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

here are follow up fixes from the original PR #11609

goodov
goodov commented Mar 15, 2022
View reviewed changes
chromium_src/third_party/blink/renderer/modules/websockets/websocket_channel_impl.cc
if (settings->GetBraveFarblingLevel() != BraveFarblingLevel::OFF) {
const bool is_extension = CommonSchemeRegistry::IsExtensionScheme(
execution_context_->GetSecurityOrigin()->Protocol().Ascii());
if (!is_extension &&
Copy link
Member Author

Choose a reason for hiding this comment

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

this is the main change in this PR.

goodov
goodov commented Mar 15, 2022
View reviewed changes
browser/brave_shields/websockets_pool_limit_browsertest.cc
"manifest_version": 2,
"version": "0.1",
"permissions": ["webRequest", "webRequestBlocking", "*://a.com/*"],
"content_security_policy": "script-src 'self' 'unsafe-eval'; object-src 'self'"
Copy link
Member Author

@goodov goodov Mar 15, 2022 •
edited
Loading

Choose a reason for hiding this comment

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

unsafe-eval is required for EvalJs to work.

@goodov goodov added this to the 1.38.x - Nightly milestone Mar 15, 2022
mkarolin
mkarolin approved these changes Mar 15, 2022
View reviewed changes
Copy link
Collaborator

@mkarolin mkarolin left a comment

Choose a reason for hiding this comment

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

LGTM

@goodov goodov merged commit 4294821 into master Mar 15, 2022
@goodov goodov deleted the issues/21661 branch March 15, 2022 14:06
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@mkarolin mkarolin mkarolin approved these changes

@iefremov iefremov Awaiting requested review from iefremov

Assignees

@goodov goodov

Labels
None yet
Projects
None yet
Milestone
1.38.x - Release
Development

Successfully merging this pull request may close these issues.

Don't impose WebSockets limits on Extensions
2 participants
@goodov @mkarolin