Skip to content

fix(wasm): websocket url validation #2096

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

Merged
shamardy merged 4 commits into from
Apr 12, 2024
Merged

fix(wasm): websocket url validation #2096

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
f0b21dc
parse and validate websocket url
borngraced Apr 12, 2024
3b11bd6
use websys::Url for validation
borngraced Apr 12, 2024
10bfe5b
code organization
borngraced Apr 12, 2024
cd352dd
use DomException::name for jsvalue err
borngraced Apr 12, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion mm2src/mm2_net/Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -49,7 +49,7 @@ wasm-bindgen-futures = "0.4.21"
web-sys = { version = "0.3.55", features = ["console", "CloseEvent", "DomException", "ErrorEvent", "IdbDatabase",
"IdbCursor", "IdbCursorWithValue", "IdbFactory", "IdbIndex", "IdbIndexParameters", "IdbObjectStore",
"IdbObjectStoreParameters", "IdbOpenDbRequest", "IdbKeyRange", "IdbTransaction", "IdbTransactionMode",
"IdbVersionChangeEvent", "MessageEvent", "MessagePort", "ReadableStreamDefaultReader", "ReadableStream", "SharedWorker", "WebSocket"] }
"IdbVersionChangeEvent", "MessageEvent", "MessagePort", "ReadableStreamDefaultReader", "ReadableStream", "SharedWorker", "Url", "WebSocket"] }


[target.'cfg(not(target_arch = "wasm32"))'.dependencies]
Expand Down
30 changes: 27 additions & 3 deletions mm2src/mm2_net/src/wasm/wasm_ws.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@ use std::sync::Arc;
use std::task::{Context, Poll};
use wasm_bindgen::prelude::*;
use wasm_bindgen::JsCast;
use web_sys::{CloseEvent, DomException, MessageEvent, WebSocket};
use web_sys::{CloseEvent, DomException, MessageEvent, Url, WebSocket};

const NORMAL_CLOSURE_CODE: u16 = 1000;

Expand Down Expand Up @@ -50,8 +50,17 @@ pub enum InitWsError {
impl InitWsError {
fn from_ws_new_err(e: JsValue, url: &str) -> InitWsError {
let reason = stringify_js_error(&e);
match e.dyn_ref::<DomException>().map(DomException::code) {
Some(DomException::SYNTAX_ERR) => InitWsError::InvalidUrl {

// Check for TypeError
if reason.contains("URL constructor") {
return InitWsError::InvalidUrl {
url: url.to_owned(),
reason,
};
};

match e.dyn_ref::<DomException>().map(DomException::name) {
Some(ref name) if name == "SyntaxError" => InitWsError::InvalidUrl {
url: url.to_owned(),
reason,
},
Expand Down Expand Up @@ -312,6 +321,7 @@ struct WebSocketImpl {

impl WebSocketImpl {
fn init(url: &str) -> InitWsResult<(WebSocketImpl, WsTransportReceiver)> {
Self::validate_websocket_url(url)?;
let ws = WebSocket::new(url).map_to_mm(|e| InitWsError::from_ws_new_err(e, url))?;

let (tx, rx) = mpsc::channel(1024);
Expand Down Expand Up @@ -355,6 +365,20 @@ impl WebSocketImpl {
},
}
}

fn validate_websocket_url(url: &str) -> Result<(), MmError<InitWsError>> {
let parsed_url = Url::new(url).map_to_mm(|e| InitWsError::from_ws_new_err(e, url))?;

let scheme = parsed_url.protocol();
if scheme != "ws:" && scheme != "wss:" {
return MmError::err(InitWsError::InvalidUrl {
url: url.to_string(),
reason: "URL must use 'ws' or 'wss' scheme".to_string(),
});
}

Ok(())
}
}

impl Drop for WebSocketImpl {
Expand Down