feat: add websocket support for c2 detection #28782
Merged
+136
−14
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
|
CLA Signature Action: All authors have signed the CLA. You may need to manually re-run the blocking PR check if it doesn't pass in a few minutes. |
Builds ready [60a3ac7]
Page Load Metrics (1763 ± 94 ms)
Bundle size diffs [🚨 Warning! Bundle size has increased!]
|
| @@ -327,7 +327,7 @@ function maybeDetectPhishing(theController) { | |||
| return {}; | |||
| }, | |||
| { | |||
| urls: ['http://*/*', 'https://*/*'], | |||
| urls: ['http://*/*', 'https://*/*', 'ws://*/*', 'wss://*/*'], | |||
There was a problem hiding this comment.
this change needs automated tests
There was a problem hiding this comment.
added a few tests!
Builds ready [d2c7f78]
Page Load Metrics (1614 ± 53 ms)
Bundle size diffs [🚨 Warning! Bundle size has increased!]
|
|
Excited for this to land in prod! |
![github-advanced-security[bot]](https://avatars.githubusercontent.com/in/57789?s=60&v=4){kind=small}
test/e2e/tests/phishing-controller/mock-malicious-websocket-connection/index.html
Fixed
Show fixed
Hide fixed
test/e2e/tests/phishing-controller/mock-safe-websocket-connection/index.html
Fixed
Show fixed
Hide fixed
…metamask-extension into feat/websocket-support
…metamask-extension into feat/websocket-support
Builds ready [395bf8c]
Page Load Metrics (1896 ± 90 ms)
Bundle size diffs [🚨 Warning! Bundle size has increased!]
|
davidmurdoch
reviewed
Dec 2, 2024
Builds ready [dabc7a8]
Page Load Metrics (1974 ± 52 ms)
Bundle size diffs [🚨 Warning! Bundle size has increased!]
|
AugmentedMode
commented
Dec 10, 2024
| @@ -72,5 +72,6 @@ | |||
| "unresponsive-rpc.test", | |||
| "unresponsive-rpc.url", | |||
| "user-storage.api.cx.metamask.io", | |||
| "www.4byte.directory" | |||
| "www.4byte.directory", | |||
| "verify.walletconnect.com" | |||
There was a problem hiding this comment.
This was added as MetaMasks Test dApp makes a websocket connnection as shown in the screenshot
Builds ready [d64c13c]
Page Load Metrics (2032 ± 127 ms)
Bundle size diffs [🚨 Warning! Bundle size has increased!]
|
Builds ready [fe74a38]
Page Load Metrics (1923 ± 72 ms)
Bundle size diffs [🚨 Warning! Bundle size has increased!]
|
cryptotavares
previously approved these changes
Dec 11, 2024
cryptotavares
approved these changes
Dec 11, 2024
Builds ready [28c26bf]
Page Load Metrics (1572 ± 29 ms)
Bundle size diffs [🚨 Warning! Bundle size has increased!]
|
Gudahtt
approved these changes
Dec 11, 2024
metamaskbot
added
the
release-12.10.1
There was a problem hiding this comment.
I've confirmed that this new code intercepts wss requests and redirects the user to the phishing page. However, the Proceed anyway link on the phishing page now redirects the user to the websocket URL.
Not sure what the "fix" is here, but it is something we should figure out how to handle better.
Sign up for free
to subscribe to this conversation on GitHub.
Already have an account?
Sign in.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Description
This pull request adds WebSocket support to the MetaMask extension's phishing detection functionality. Scammers have started using WebSocket connections for command-and-control (C2) operations to bypass traditional HTTP-based phishing detection. This PR allows the extension to intercept and block WebSocket handshake requests (
ws://andwss://) in addition to HTTP/HTTPS requests.The key changes include:
ws://*/*andwss://*/*) to theurlsfilter inbackground.js.manifest.jsonto include WebSocket permissions in thehost_permissionsfield.This ensures that malicious WebSocket connections can be detected and blocked.
Related issues
Fixes: https://github.com/MetaMask/MetaMask-planning/issues/3788
Manual testing steps
example.comwss://example.com) and verify it works as expected by going to theconsolevia right clicking and hitting inspect. Then type into the consolenew WebSocket("https://example.com/")consolevia right clicking and hitting inspect. Then type into the consolenew WebSocket("https://walietconnectapi.com/")Screenshots/Recordings
Before
No support for detecting WebSocket phishing connections.
After
WebSocket phishing connections are detected and blocked during the handshake phase.
Pre-merge author checklist
Pre-merge reviewer checklist