From c0e0f562bb2690b9292e0d5da4dc798afc8ecd26 Mon Sep 17 00:00:00 2001 From: AndrewRademacher Date: Mon, 13 Feb 2023 14:56:45 -0600 Subject: [PATCH 1/2] Add TLS support to WS proxy. --- Cargo.toml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Cargo.toml b/Cargo.toml index 5ec70fd4..46172400 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -42,7 +42,7 @@ tar = "0.4" # See https://docs.rs/tokio/latest/tokio/#feature-flags - we basically use all of the features. tokio = { version = "1", default-features = false, features = ["full"] } tokio-stream = { version = "0.1", default-features = false, features = ["fs", "sync"] } -tokio-tungstenite = "0.17" +tokio-tungstenite = { version = "0.17", features = ["rustls-tls-native-roots"] } toml = "0.5" tower-http = { version = "0.3", features = ["fs", "trace"] } tracing = "0.1" From ab34b2ea3523fb54c1cef9caa9d0b72e0cb76155 Mon Sep 17 00:00:00 2001 From: AndrewRademacher Date: Mon, 13 Feb 2023 15:00:19 -0600 Subject: [PATCH 2/2] Update change log. --- CHANGELOG.md | 3 +++ 1 file changed, 3 insertions(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index 34e1d9aa..8f62323a 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -18,6 +18,9 @@ Subheadings to categorize changes are `added, changed, deprecated, removed, fixe ### fixed - Nested WS proxies - if `backend=ws://localhost:8000/ws` is set, queries for `ws://localhost:8080/ws/entityX` will be linked with `ws://localhost:8000/ws/entityX` - Updated all dependencies in both Trunk and its examples, to fix currently open security advisories for old dependencies. +- TLS support for WS proxies - if a proxy route began with `wss://...` an attempt was made +and then failed to connect to the route's target host, because `tokio-tungstenite`'s TLS +features were not enabled. ## 0.16.0 ### added