Commit081fbef

authored

fix: code-server path based forwarding, defer to code-server (#11759)

Do not attempt to construct a path based port forward url.Always defer to code server, as it has it's own proxy method.

1 parent77a4792 commit081fbefCopy full SHA for 081fbef

File tree

+13

-8

lines changed

+13

-8

lines changed

Lines changed: 5 additions & 1 deletion

Original file line number	Diff line number	Diff line change
`@@ -681,7 +681,11 @@ func (s *Server) CreateCommand(ctx context.Context, script string, env []string)`
`681`	`681`
`682`	`682`	`// This adds the ports dialog to code-server that enables`
`683`	`683`	`// proxying a port dynamically.`
`684`		`-cmd.Env=append(cmd.Env,fmt.Sprintf("VSCODE_PROXY_URI=%s",manifest.VSCodePortProxyURI))`
	`684`	`+// If this is empty string, do not set anything. Code-server auto defaults`
	`685`	`+// using its basepath to construct a path based port proxy.`
	`686`	`+ifmanifest.VSCodePortProxyURI!="" {`
	`687`	`+cmd.Env=append(cmd.Env,fmt.Sprintf("VSCODE_PROXY_URI=%s",manifest.VSCodePortProxyURI))`
	`688`	`+}`
`685`	`689`
`686`	`690`	`// Hide Coder message on code-server's "Getting Started" page`
`687`	`691`	`cmd.Env=append(cmd.Env,"CS_DISABLE_GETTING_STARTED_OVERRIDE=true")`

Lines changed: 6 additions & 4 deletions

Original file line number	Diff line number	Diff line change
`@@ -150,12 +150,14 @@ func (a ManifestAPI) GetManifest(ctx context.Context, _ agentproto.GetManifest`
`150`	`150`	`}`
`151`	`151`
`152`	`152`	`funcvscodeProxyURI(app appurl.ApplicationURL,accessURL*url.URL,appHoststring)string {`
`153`		`-// This will handle the ports from the accessURL or appHost.`
`154`		`-appHost=appurl.SubdomainAppHost(appHost,accessURL)`
`155`		`-// If there is no appHost, then we want to use the access url as the proxy uri.`
	`153`	`+// Proxying by port only works for subdomains. If subdomain support is not`
	`154`	`+// available, return an empty string.`
`156`	`155`	`ifappHost=="" {`
`157`		`-appHost=accessURL.Host`
	`156`	`+return""`
`158`	`157`	`}`
	`158`	`+`
	`159`	`+// This will handle the ports from the accessURL or appHost.`
	`160`	`+appHost=appurl.SubdomainAppHost(appHost,accessURL)`
`159`	`161`	`// Return the url with a scheme and any wildcards replaced with the app slug.`
`160`	`162`	`returnaccessURL.Scheme+"://"+strings.ReplaceAll(appHost,"*",app.String())`
`161`	`163`	`}`

Lines changed: 2 additions & 3 deletions

Original file line number	Diff line number	Diff line change
`@@ -35,19 +35,18 @@ func Test_vscodeProxyURI(t *testing.T) {`
`35`	`35`	`Expectedstring`
`36`	`36`	`}{`
`37`	`37`	`{`
`38`		`-// No hostname proxies through the access url.`
`39`	`38`	`Name:"NoHostname",`
`40`	`39`	`AccessURL:coderAccessURL,`
`41`	`40`	`AppHostname:"",`
`42`	`41`	`App:basicApp,`
`43`		`-Expected:coderAccessURL.String(),`
	`42`	`+Expected:"",`
`44`	`43`	`},`
`45`	`44`	`{`
`46`	`45`	`Name:"NoHostnameAccessURLPort",`
`47`	`46`	`AccessURL:accessURLWithPort,`
`48`	`47`	`AppHostname:"",`
`49`	`48`	`App:basicApp,`
`50`		`-Expected:accessURLWithPort.String(),`
	`49`	`+Expected:"",`
`51`	`50`	`},`
`52`	`51`	`{`
`53`	`52`	`Name:"Hostname",`

Comments

(0)