[ws-proxy] not use target host when serve workspace port route

Author: iQQBot

components/ws-proxy/pkg/proxy/pass.go

@@ -27,6 +27,7 @@ type proxyPassConfig struct {
 	ResponseHandler []responseHandler
 	ErrorHandler    errorHandler
 	Transport       http.RoundTripper
+	UseTargetHost   bool
 }
 
 func (ppc *proxyPassConfig) appendResponseHandler(handler responseHandler) {
@@ -77,12 +78,14 @@ func joinURLPath(a, b *url.URL) (path, rawpath string) {
 	return a.Path + b.Path, apath + bpath
 }
 
-func NewSingleHostReverseProxy(target *url.URL) *httputil.ReverseProxy {
+func NewSingleHostReverseProxy(target *url.URL, useTargetHost bool) *httputil.ReverseProxy {
 	targetQuery := target.RawQuery
 	director := func(req *http.Request) {
 		req.URL.Scheme = target.Scheme
 		req.URL.Host = target.Host
-		req.Host = target.Host
+		if useTargetHost {
+			req.Host = target.Host
+		}
 		req.URL.Path, req.URL.RawPath = joinURLPath(target, req.URL)
 		if targetQuery == "" || req.URL.RawQuery == "" {
 			req.URL.RawQuery = targetQuery + req.URL.RawQuery
@@ -130,7 +133,7 @@ func proxyPass(config *RouteHandlerConfig, infoProvider WorkspaceInfoProvider, r
 
 		// TODO(cw): we should cache the proxy for some time for each target URL
 
-		proxy := NewSingleHostReverseProxy(targetURL)
+		proxy := NewSingleHostReverseProxy(targetURL, h.UseTargetHost)
 		proxy.Transport = h.Transport
 		proxy.ModifyResponse = func(resp *http.Response) error {
 			url := resp.Request.URL
@@ -248,6 +251,12 @@ func withXFrameOptionsFilter() proxyPassOpt {
 	}
 }
 
+func withUseTargetHost() proxyPassOpt {
+	return func(cfg *proxyPassConfig) {
+		cfg.UseTargetHost = true
+	}
+}
+
 type workspaceTransport struct {
 	transport http.RoundTripper
 }

components/ws-proxy/pkg/proxy/routes.go

@@ -221,7 +221,7 @@ func (ir *ideRoutes) HandleSupervisorFrontendRoute(route *mux.Route) {
 				return image
 			},
 		}
-	}))
+	}, withUseTargetHost()))
 }
 
 func resolveSupervisorURL(cfg *Config, info *WorkspaceInfo, req *http.Request) (*url.URL, error) {
@@ -319,7 +319,7 @@ func (ir *ideRoutes) HandleRoot(route *mux.Route) {
 				return image
 			},
 		}
-	}, withHTTPErrorHandler(workspaceIDEPass)))
+	}, withHTTPErrorHandler(workspaceIDEPass), withUseTargetHost()))
 }
 
 const imagePathSeparator = "/__files__"