OCram85/code-server
Archived
1
0
Fork 0
Code Pull Requests 2 Activity

Allow {{host}} and {{port}} in domain proxy (#6225)

Browse Source
This commit is contained in:
Simon Merschjohann
2023-05-31 23:31:30 +02:00
committed by GitHub
parent 2109d1cf6a
commit 0703ef008c
6 changed files with 68 additions and 27 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
patches/proxy-uri.diff
View File

@ -113,7 +113,7 @@ Index: code-server/lib/vscode/src/vs/code/browser/workbench/workbench.ts
interface ICredential {
service: string;
@@ -511,6 +512,38 @@ function doCreateUri(path: string, query
@@ -511,6 +512,42 @@ function doCreateUri(path: string, query
} : undefined,
workspaceProvider: WorkspaceProvider.create(config),
urlCallbackProvider: new LocalStorageURLCallbackProvider(config.callbackRoute),
@ -125,7 +125,11 @@ Index: code-server/lib/vscode/src/vs/code/browser/workbench/workbench.ts
+
+ if (localhostMatch && resolvedUri.authority !== location.host) {
+ if (config.productConfiguration && config.productConfiguration.proxyEndpointTemplate) {
+ resolvedUri = URI.parse(new URL(config.productConfiguration.proxyEndpointTemplate.replace('{{port}}', localhostMatch.port.toString()), window.location.href).toString())
+ const renderedTemplate = config.productConfiguration.proxyEndpointTemplate
+ .replace('{{port}}', localhostMatch.port.toString())
+ .replace('{{host}}', window.location.host)
+
+ resolvedUri = URI.parse(new URL(renderedTemplate, window.location.href).toString())
+ } else {
+ throw new Error(`Failed to resolve external URI: ${uri.toString()}. Could not determine base url because productConfiguration missing.`)
+ }