mirror of
https://github.com/coder/code-server.git
synced 2026-09-09 03:17:23 +02:00
00672a5522
* Update Code to 1.136.1 * Do not click on tab during test file opens It will already be the selected tab, and if any other tab is already open (like the welcome tab), it will click that instead. We disable the welcome page so this is not supposed to actually matter, but that Setting appears not to be working. Also add the quick input widget selector in the disabled downloads test, since if the widget never shows up it would mistakenly pass.
50 lines
2.1 KiB
Diff
50 lines
2.1 KiB
Diff
Allow configuring trusted domains via product.json or flag.
|
|
|
|
Index: code-server/lib/vscode/src/vs/server/node/serverEnvironmentService.ts
|
|
===================================================================
|
|
--- code-server.orig/lib/vscode/src/vs/server/node/serverEnvironmentService.ts
|
|
+++ code-server/lib/vscode/src/vs/server/node/serverEnvironmentService.ts
|
|
@@ -39,6 +39,7 @@ export const serverOptions: OptionDescri
|
|
'disable-file-uploads': { type: 'boolean' },
|
|
'disable-getting-started-override': { type: 'boolean' },
|
|
'locale': { type: 'string' },
|
|
+ 'link-protection-trusted-domains': { type: 'string[]' },
|
|
|
|
/* ----- server setup ----- */
|
|
|
|
@@ -138,6 +139,7 @@ export interface ServerParsedArgs {
|
|
'disable-file-uploads'?: boolean;
|
|
'disable-getting-started-override'?: boolean,
|
|
'locale'?: string
|
|
+ 'link-protection-trusted-domains'?: string[],
|
|
|
|
/* ----- server setup ----- */
|
|
|
|
Index: code-server/lib/vscode/src/vs/server/node/webClientServer.ts
|
|
===================================================================
|
|
--- code-server.orig/lib/vscode/src/vs/server/node/webClientServer.ts
|
|
+++ code-server/lib/vscode/src/vs/server/node/webClientServer.ts
|
|
@@ -399,6 +399,14 @@ export class WebClientServer {
|
|
scopes: [['user:email'], ['repo']]
|
|
} : undefined;
|
|
|
|
+ const linkProtectionTrustedDomains: string[] = [];
|
|
+ if (this._environmentService.args['link-protection-trusted-domains']) {
|
|
+ linkProtectionTrustedDomains.push(...this._environmentService.args['link-protection-trusted-domains']);
|
|
+ }
|
|
+ if (this._productService.linkProtectionTrustedDomains) {
|
|
+ linkProtectionTrustedDomains.push(...this._productService.linkProtectionTrustedDomains);
|
|
+ }
|
|
+
|
|
const productConfiguration: Partial<Mutable<IProductConfiguration>> = {
|
|
codeServerVersion: this._productService.codeServerVersion,
|
|
rootEndpoint: rootBase,
|
|
@@ -414,6 +422,7 @@ export class WebClientServer {
|
|
embedderIdentifier: 'server-distro',
|
|
voiceWsUrl: this._productService.voiceWsUrl,
|
|
extensionsGallery: this._productService.extensionsGallery,
|
|
+ linkProtectionTrustedDomains,
|
|
};
|
|
|
|
if (!this._environmentService.isBuilt) {
|