Strip double slash from websocket URL, fix #6452 (#6454)

Co-authored-by: autofix-ci[bot] <114827586+autofix-ci[bot]@users.noreply.github.com>
mitmproxy · Nov 4, 2023 · e6f8f08 · e6f8f08
1 parent 4f361e4
commit e6f8f08
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 1 deletion.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -2,6 +2,10 @@
 
 ## Unreleased: mitmproxy next
 
+* Fix a bug introduced in mitmproxy 10.1.2 where mitmweb would fail to establish
+  a WebSocket connection. Affected users may need to clear their browser cache
+  or hard-reload mitmweb (Ctrl+Shift+R).
+  ([#6454](https://github.com/mitmproxy/mitmproxy/pull/6454), @mhils)
 
 
 ## 03 November 2023: mitmproxy 10.1.2

diff --git a/web/src/js/backends/websocket.tsx b/web/src/js/backends/websocket.tsx
@@ -28,7 +28,7 @@ export default class WebsocketBackend {
     connect() {
         this.socket = new WebSocket(
             location.origin.replace("http", "ws") +
-                location.pathname +
+                location.pathname.replace(/\/$/, "") +
                 "/updates"
         );
         this.socket.addEventListener("open", () => this.onOpen());