Add app proxying for wildcards

kylecarbs · kylecarbs · commit b4f961563f0a · 2022-05-27T14:01:20.000Z
diff --git a/coderd/coderd.go b/coderd/coderd.go
@@ -104,7 +104,7 @@ func New(options *Options) *API {
 			httpmw.ExtractUserParam(api.Database),
 			authRolesMiddleware,
 		)
-		r.Get("/", api.workspaceAppsProxyPath)
+		r.Get("/*", api.workspaceAppsProxyPath)
 	})
 
 	r.Route("/api/v2", func(r chi.Router) {
diff --git a/coderd/workspaceapps.go b/coderd/workspaceapps.go
@@ -126,8 +126,10 @@ func (api *API) workspaceAppsProxyPath(rw http.ResponseWriter, r *http.Request)
 	if !valid {
 		panic("dev error: default transport isn't a transport")
 	}
+
 	transport := defaultTransport.Clone()
 	transport.DialContext = conn.DialContext
 	proxy.Transport = transport
+	r.URL.Path = chi.URLParam(r, "*")
 	proxy.ServeHTTP(rw, r)
 }

Original file line number	Diff line number	Diff line change
`@@ -104,7 +104,7 @@ func New(options Options) API {`
`104`	`104`	`httpmw.ExtractUserParam(api.Database),`
`105`	`105`	`authRolesMiddleware,`
`106`	`106`	`)`
`107`		`- r.Get("/", api.workspaceAppsProxyPath)`
	`107`	`+ r.Get("/*", api.workspaceAppsProxyPath)`
`108`	`108`	`})`
`109`	`109`
`110`	`110`	`r.Route("/api/v2", func(r chi.Router) {`
Original file line number	Diff line number	Diff line change
`@@ -126,8 +126,10 @@ func (api API) workspaceAppsProxyPath(rw http.ResponseWriter, r http.Request)`
`126`	`126`	`if !valid {`
`127`	`127`	`panic("dev error: default transport isn't a transport")`
`128`	`128`	`}`
	`129`	`+`
`129`	`130`	`transport := defaultTransport.Clone()`
`130`	`131`	`transport.DialContext = conn.DialContext`
`131`	`132`	`proxy.Transport = transport`
	`133`	`+ r.URL.Path = chi.URLParam(r, "*")`
`132`	`134`	`proxy.ServeHTTP(rw, r)`
`133`	`135`	`}`