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

fix(websocket): don't dial /dnsaddr addresses #5613

Merged
merged 9 commits into from
Nov 5, 2024
Merged

fix(websocket): don't dial /dnsaddr addresses #5613

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
9 commits
Select commit Hold shift + click to select a range
f46cebd
fix(websocket): don't dial `/dnsaddr` addresses
zetsuboii Sep 27, 2024
1b78704
bump transport version and update changelog
zetsuboii Sep 27, 2024
65d6986
revert Cargo.toml formatting
zetsuboii Sep 30, 2024
05e4828
Merge branch 'master' into fix/websocket-dnsaddr
zetsuboii Oct 5, 2024
bf23e92
fix(websocket-websys): return None if extracting a /dnsaddr
zetsuboii Oct 25, 2024
695cb5b
Merge branch 'master' into fix/websocket-dnsaddr
zetsuboii Oct 25, 2024
f25a67c
bump top-level crate websocket-websys version
zetsuboii Oct 26, 2024
0cf6f8a
Merge branch 'master' into fix/websocket-dnsaddr
zetsuboii Oct 26, 2024
d83d281
Merge branch 'master' into fix/websocket-dnsaddr
zetsuboii Nov 1, 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
4 changes: 2 additions & 2 deletions Cargo.lock
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

4 changes: 2 additions & 2 deletions Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -112,8 +112,8 @@ libp2p-upnp = { version = "0.3.1", path = "protocols/upnp" }
libp2p-webrtc = { version = "0.8.0-alpha", path = "transports/webrtc" }
libp2p-webrtc-utils = { version = "0.3.0", path = "misc/webrtc-utils" }
libp2p-webrtc-websys = { version = "0.4.0-alpha.2", path = "transports/webrtc-websys" }
libp2p-websocket = { version = "0.44.0", path = "transports/websocket" }
libp2p-websocket-websys = { version = "0.4.0", path = "transports/websocket-websys" }
libp2p-websocket = { version = "0.44.1", path = "transports/websocket" }
libp2p-websocket-websys = { version = "0.4.1", path = "transports/websocket-websys" }
libp2p-webtransport-websys = { version = "0.4.0", path = "transports/webtransport-websys" }
libp2p-yamux = { version = "0.46.0", path = "muxers/yamux" }
multiaddr = "0.18.1"
Expand Down
5 changes: 5 additions & 0 deletions transports/websocket-websys/CHANGELOG.md
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,3 +1,8 @@
## 0.4.1

- fix: Return `None` when extracting a `/dnsaddr` address
See [PR 5613](https://github.com/libp2p/rust-libp2p/pull/5613)

## 0.4.0

- Implement refactored `Transport`.
Expand Down
2 changes: 1 addition & 1 deletion transports/websocket-websys/Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ name = "libp2p-websocket-websys"
edition = "2021"
rust-version = "1.60.0"
description = "WebSocket for libp2p under WASM environment"
version = "0.4.0"
version = "0.4.1"
authors = ["Vince Vasta <vince.vasta@gmail.com>"]
license = "MIT"
repository = "https://github.com/libp2p/rust-libp2p"
Expand Down
9 changes: 7 additions & 2 deletions transports/websocket-websys/src/lib.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -130,8 +130,7 @@ fn extract_websocket_url(addr: &Multiaddr) -> Option<String> {
}
(Some(Protocol::Dns(h)), Some(Protocol::Tcp(port)))
| (Some(Protocol::Dns4(h)), Some(Protocol::Tcp(port)))
| (Some(Protocol::Dns6(h)), Some(Protocol::Tcp(port)))
| (Some(Protocol::Dnsaddr(h)), Some(Protocol::Tcp(port))) => {
| (Some(Protocol::Dns6(h)), Some(Protocol::Tcp(port))) => {
format!("{}:{}", &h, port)
}
_ => return None,
Expand Down Expand Up @@ -549,6 +548,12 @@ mod tests {
.unwrap();
assert!(extract_websocket_url(&addr).is_none());

// Check `/dnsaddr`
let addr = "/dnsaddr/example.com/tcp/2222/ws"
.parse::<Multiaddr>()
.unwrap();
assert!(extract_websocket_url(&addr).is_none());

// Check non-ws address
let addr = "/ip4/127.0.0.1/tcp/2222".parse::<Multiaddr>().unwrap();
assert!(extract_websocket_url(&addr).is_none());
Expand Down
5 changes: 5 additions & 0 deletions transports/websocket/CHANGELOG.md
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,3 +1,8 @@
## 0.44.1

- fix: Return `Error::InvalidMultiaddr` when dialed to a `/dnsaddr` address
See [PR 5613](https://github.com/libp2p/rust-libp2p/pull/5613)

## 0.44.0

- Implement refactored `Transport`.
Expand Down
2 changes: 1 addition & 1 deletion transports/websocket/Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ name = "libp2p-websocket"
edition = "2021"
rust-version = { workspace = true }
description = "WebSocket transport for libp2p"
version = "0.44.0"
version = "0.44.1"
authors = ["Parity Technologies <admin@parity.io>"]
license = "MIT"
repository = "https://github.com/libp2p/rust-libp2p"
Expand Down
9 changes: 7 additions & 2 deletions transports/websocket/src/framed.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -510,8 +510,7 @@ fn parse_ws_dial_addr<T>(addr: Multiaddr) -> Result<WsAddress, Error<T>> {
}
(Some(Protocol::Dns(h)), Some(Protocol::Tcp(port)))
| (Some(Protocol::Dns4(h)), Some(Protocol::Tcp(port)))
| (Some(Protocol::Dns6(h)), Some(Protocol::Tcp(port)))
| (Some(Protocol::Dnsaddr(h)), Some(Protocol::Tcp(port))) => {
| (Some(Protocol::Dns6(h)), Some(Protocol::Tcp(port))) => {
break (format!("{h}:{port}"), tls::dns_name_ref(&h)?)
}
(Some(_), Some(p)) => {
Expand Down Expand Up @@ -993,6 +992,12 @@ mod tests {
assert_eq!(info.server_name, "::1".try_into().unwrap());
assert_eq!(info.tcp_addr, "/ip6/::1/tcp/2222".parse().unwrap());

// Check `/dnsaddr`
let addr = "/dnsaddr/example.com/tcp/2222/ws"
.parse::<Multiaddr>()
.unwrap();
parse_ws_dial_addr::<io::Error>(addr).unwrap_err();

// Check non-ws address
let addr = "/ip4/127.0.0.1/tcp/2222".parse::<Multiaddr>().unwrap();
parse_ws_dial_addr::<io::Error>(addr).unwrap_err();
Expand Down
Loading