fix(exec): correctly join URL components (#402)

godaddy · Jan 28, 2019 · a557d97 · a557d97
1 parent 84ce275
commit a557d97
Show file tree

Hide file tree

Showing 3 changed files with 9 additions and 2 deletions.
diff --git a/lib/backends/request.js b/lib/backends/request.js
@@ -2,6 +2,7 @@
 
 const request = require('request')
 const qs = require('qs')
+const urljoin = require('url-join')
 const WebSocket = require('ws')
 
 /**
@@ -56,7 +57,7 @@ function isUpgradeRequired (body) {
 
 function upgradeRequest (options, cb) {
   const queryParams = qs.stringify(options.qs, { indices: false })
-  const wsUrl = `${options.baseUrl}/${options.uri}?${queryParams}`
+  const wsUrl = urljoin(options.baseUrl, options.uri, `?${queryParams}`)
   const protocol = 'base64.channel.k8s.io'
   const ws = new WebSocket(wsUrl, protocol, options)
 

diff --git a/package-lock.json b/package-lock.json
diff --git a/package.json b/package.json
@@ -32,11 +32,12 @@
   ],
   "dependencies": {
     "deepmerge": "^3.0.0",
-    "swagger-fluent": "^3.1.1",
     "js-yaml": "^3.10.0",
     "openid-client": "^2.4.4",
     "qs": "^6.5.2",
     "request": "^2.88.0",
+    "swagger-fluent": "^3.1.1",
+    "url-join": "^4.0.0",
     "ws": "^6.0.0"
   },
   "devDependencies": {