Merge pull request #391 from nzdjb/master

Add protection against missing trailing slashes when using websocket.
jenkinsci · Oct 15, 2020 · fe3c8a5 · fe3c8a5
2 parents 68c21f7 + c66e41f
commit fe3c8a5
Showing 1 changed file with 3 additions and 1 deletion.
diff --git a/src/main/java/hudson/remoting/Engine.java b/src/main/java/hudson/remoting/Engine.java
@@ -625,8 +625,10 @@ public void closeRead() throws IOException {
                         }
                     }
                 }
+                String wsUrl = candidateUrls.get(0).toString().replaceFirst("^http", "ws");
+                if(!wsUrl.endsWith("/")) wsUrl += "/";
                 ContainerProvider.getWebSocketContainer().connectToServer(new AgentEndpoint(),
-                    ClientEndpointConfig.Builder.create().configurator(headerHandler).build(), URI.create(candidateUrls.get(0).toString().replaceFirst("^http", "ws") + "wsagents/"));
+                    ClientEndpointConfig.Builder.create().configurator(headerHandler).build(), URI.create(wsUrl + "wsagents/"));
                 while (ch.get() == null) {
                     Thread.sleep(100);
                 }