chore: update Code to 1.67

Was able to remove our changes to common/webview.ts since they are
upstream now.

Other than that no serious changes, just context diffs.

Author: code-asher

lib/vscode

@@ -159,19 +159,26 @@ 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
-@@ -253,7 +253,10 @@ export class WebClientServer {
+@@ -250,14 +250,10 @@ export class WebClientServer {
  			return res.end();
  		}
 
--		const remoteAuthority = req.headers.host;
+-		let originalHost = req.headers['x-original-host'];
+-		if (Array.isArray(originalHost)) {
+-			originalHost = originalHost[0];
+-		}
+-		const remoteAuthority = originalHost || req.headers.host;
+-		if (!remoteAuthority) {
+-			return serveError(req, res, 400, `Bad request.`);
+-		}
 +		// It is not possible to reliably detect the remote authority on the server
 +		// in all cases.  Set this to something invalid to make sure we catch code
 +		// that is using this when it should not.
 +		const remoteAuthority = 'remote';
 
  		function escapeAttribute(value: string): string {
  			return value.replace(/"/g, '"');
-@@ -275,6 +278,8 @@ export class WebClientServer {
+@@ -279,6 +275,8 @@ export class WebClientServer {
  			accessToken: this._environmentService.args['github-auth'],
  			scopes: [['user:email'], ['repo']]
  		} : undefined;
@@ -180,15 +187,15 @@ Index: code-server/lib/vscode/src/vs/server/node/webClientServer.ts
  		const data = (await util.promisify(fs.readFile)(filePath)).toString()
  			.replace('{{WORKBENCH_WEB_CONFIGURATION}}', escapeAttribute(JSON.stringify({
  				remoteAuthority,
-@@ -285,6 +290,7 @@ export class WebClientServer {
+@@ -289,6 +287,7 @@ export class WebClientServer {
  				folderUri: resolveWorkspaceURI(this._environmentService.args['default-folder']),
  				workspaceUri: resolveWorkspaceURI(this._environmentService.args['default-workspace']),
  				productConfiguration: <Partial<IProductConfiguration>>{
 +					rootEndpoint: base,
  					codeServerVersion: this._productService.codeServerVersion,
  					embedderIdentifier: 'server-distro',
  					extensionsGallery: this._webExtensionResourceUrlTemplate ? {
-@@ -297,7 +303,9 @@ export class WebClientServer {
+@@ -301,7 +300,9 @@ export class WebClientServer {
  					} : undefined
  				}
  			})))
@@ -199,7 +206,7 @@ Index: code-server/lib/vscode/src/vs/server/node/webClientServer.ts
 
  		const cspDirectives = [
  			'default-src \'self\';',
-@@ -376,3 +384,70 @@ export class WebClientServer {
+@@ -380,3 +381,70 @@ export class WebClientServer {
  		return res.end(data);
  	}
  }
@@ -286,15 +293,15 @@ Index: code-server/lib/vscode/src/vs/code/browser/workbench/workbench.ts
 ===================================================================
 --- code-server.orig/lib/vscode/src/vs/code/browser/workbench/workbench.ts
 +++ code-server/lib/vscode/src/vs/code/browser/workbench/workbench.ts
-@@ -482,6 +482,7 @@ function doCreateUri(path: string, query
+@@ -481,6 +481,7 @@ function doCreateUri(path: string, query
  		});
  	}
 
 +	path = (window.location.pathname + "/" + path).replace(/\/\/+/g, "/")
  	return URI.parse(window.location.href).with({ path, query });
  }
 
-@@ -493,7 +494,7 @@ function doCreateUri(path: string, query
+@@ -492,7 +493,7 @@ function doCreateUri(path: string, query
  	if (!configElement || !configElementAttribute) {
  		throw new Error('Missing web configuration element');
  	}

patches/base-path.diff

@@ -7,24 +7,25 @@ Index: code-server/lib/vscode/src/vs/workbench/contrib/extensions/browser/extens
 ===================================================================
 --- code-server.orig/lib/vscode/src/vs/workbench/contrib/extensions/browser/extensionsWorkbenchService.ts
 +++ code-server/lib/vscode/src/vs/workbench/contrib/extensions/browser/extensionsWorkbenchService.ts
-@@ -206,6 +206,9 @@ export class Extension implements IExten
- 		if (!this.gallery || !this.local) {
- 			return false;
- 		}
-+		if (this.type !== ExtensionType.User) {
-+			return false;
-+		}
- 		if (!this.local.preRelease && this.gallery.properties.isPreReleaseVersion) {
- 			return false;
- 		}
-@@ -1057,6 +1060,10 @@ export class ExtensionsWorkbenchService
+@@ -211,6 +211,10 @@ export class Extension implements IExten
+ 			if (this.type === ExtensionType.System && this.productService.quality === 'stable') {
+ 				return false;
+ 			}
++			// Do not update builtin extensions.
++			if (this.type !== ExtensionType.User) {
++				return false;
++			}
+ 			if (!this.local.preRelease && this.gallery.properties.isPreReleaseVersion) {
+ 				return false;
+ 			}
+@@ -1065,6 +1069,10 @@ export class ExtensionsWorkbenchService
  				// Skip if check updates only for builtin extensions and current extension is not builtin.
  				continue;
  			}
 +			if (installed.type !== ExtensionType.User) {
 +				// Never update builtin extensions.
 +				continue;
 +			}
- 			if (installed.isBuiltin && !installed.local?.identifier.uuid) {
- 				// Skip if the builtin extension does not have Marketplace id
+ 			if (installed.isBuiltin && (!installed.local?.identifier.uuid || this.productService.quality !== 'stable')) {
+ 				// Skip if the builtin extension does not have Marketplace identifier or the current quality is not stable.
  				continue;

patches/disable-builtin-ext-update.diff

@@ -12,7 +12,7 @@ Index: code-server/lib/vscode/src/vs/workbench/browser/web.api.ts
 ===================================================================
 --- code-server.orig/lib/vscode/src/vs/workbench/browser/web.api.ts
 +++ code-server/lib/vscode/src/vs/workbench/browser/web.api.ts
-@@ -215,6 +215,11 @@ export interface IWorkbenchConstructionO
+@@ -238,6 +238,11 @@ export interface IWorkbenchConstructionO
  	 */
  	readonly userDataPath?: string
 
@@ -28,7 +28,7 @@ Index: code-server/lib/vscode/src/vs/workbench/services/environment/browser/envi
 ===================================================================
 --- code-server.orig/lib/vscode/src/vs/workbench/services/environment/browser/environmentService.ts
 +++ code-server/lib/vscode/src/vs/workbench/services/environment/browser/environmentService.ts
-@@ -30,6 +30,11 @@ export interface IBrowserWorkbenchEnviro
+@@ -31,6 +31,11 @@ export interface IBrowserWorkbenchEnviro
  	 * Options used to configure the workbench.
  	 */
  	readonly options?: IWorkbenchConstructionOptions;
@@ -40,7 +40,7 @@ Index: code-server/lib/vscode/src/vs/workbench/services/environment/browser/envi
  }
 
  export class BrowserWorkbenchEnvironmentService implements IBrowserWorkbenchEnvironmentService {
-@@ -61,6 +66,13 @@ export class BrowserWorkbenchEnvironment
+@@ -62,6 +67,13 @@ export class BrowserWorkbenchEnvironment
  		return this.options.userDataPath;
  	}
 
@@ -78,7 +78,7 @@ 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
-@@ -293,6 +293,7 @@ export class WebClientServer {
+@@ -290,6 +290,7 @@ export class WebClientServer {
  					logLevel: this._logService.getLevel(),
  				},
  				userDataPath: this._environmentService.userDataPath,
@@ -144,7 +144,7 @@ Index: code-server/lib/vscode/src/vs/workbench/contrib/files/browser/fileActions
  import { IsWebContext } from 'vs/platform/contextkey/common/contextkeys';
  import { ServicesAccessor } from 'vs/platform/instantiation/common/instantiation';
  import { ThemeIcon } from 'vs/platform/theme/common/themeService';
-@@ -476,13 +476,16 @@ MenuRegistry.appendMenuItem(MenuId.Explo
+@@ -477,13 +477,16 @@ MenuRegistry.appendMenuItem(MenuId.Explo
  		id: DOWNLOAD_COMMAND_ID,
  		title: DOWNLOAD_LABEL
  	},

patches/disable-downloads.diff

@@ -6,7 +6,7 @@ Index: code-server/lib/vscode/src/vs/server/node/serverServices.ts
 ===================================================================
 --- code-server.orig/lib/vscode/src/vs/server/node/serverServices.ts
 +++ code-server/lib/vscode/src/vs/server/node/serverServices.ts
-@@ -192,6 +192,9 @@ export async function setupServerService
+@@ -196,6 +196,9 @@ export async function setupServerService
  		const channel = new ExtensionManagementChannel(extensionManagementService, (ctx: RemoteAgentConnectionContext) => getUriTransformer(ctx.remoteAuthority));
  		socketServer.registerChannel('extensions', channel);
 
@@ -20,7 +20,7 @@ Index: code-server/lib/vscode/src/vs/base/common/platform.ts
 ===================================================================
 --- code-server.orig/lib/vscode/src/vs/base/common/platform.ts
 +++ code-server/lib/vscode/src/vs/base/common/platform.ts
-@@ -84,6 +84,17 @@ if (typeof navigator === 'object' && !is
+@@ -82,6 +82,17 @@ if (typeof navigator === 'object' && !is
  	_isWeb = true;
  	_locale = navigator.language;
  	_language = _locale;
@@ -176,7 +176,7 @@ Index: code-server/lib/vscode/src/vs/server/node/webClientServer.ts
 
  const textMimeType = {
  	'.html': 'text/html',
-@@ -280,6 +281,8 @@ export class WebClientServer {
+@@ -277,6 +278,8 @@ export class WebClientServer {
  		} : undefined;
  		const base = relativeRoot(getOriginalUrl(req))
  		const vscodeBase = relativePath(getOriginalUrl(req))
@@ -185,7 +185,7 @@ Index: code-server/lib/vscode/src/vs/server/node/webClientServer.ts
  		const data = (await util.promisify(fs.readFile)(filePath)).toString()
  			.replace('{{WORKBENCH_WEB_CONFIGURATION}}', escapeAttribute(JSON.stringify({
  				remoteAuthority,
-@@ -309,7 +312,8 @@ export class WebClientServer {
+@@ -306,7 +309,8 @@ export class WebClientServer {
  			})))
  			.replace('{{WORKBENCH_AUTH_SESSION}}', () => authSessionInfo ? escapeAttribute(JSON.stringify(authSessionInfo)) : '')
  			.replace(/{{BASE}}/g, base)
@@ -252,7 +252,7 @@ Index: code-server/lib/vscode/src/vs/workbench/workbench.web.main.ts
 ===================================================================
 --- code-server.orig/lib/vscode/src/vs/workbench/workbench.web.main.ts
 +++ code-server/lib/vscode/src/vs/workbench/workbench.web.main.ts
-@@ -112,6 +112,10 @@ registerSingleton(IDiagnosticsService, N
+@@ -109,6 +109,10 @@ registerSingleton(IDiagnosticsService, N
 
  //#region --- workbench contributions
 

patches/display-language.diff

@@ -7,7 +7,7 @@ Index: code-server/lib/vscode/src/vs/platform/credentials/node/credentialsMainSe
 ===================================================================
 --- code-server.orig/lib/vscode/src/vs/platform/credentials/node/credentialsMainService.ts
 +++ code-server/lib/vscode/src/vs/platform/credentials/node/credentialsMainService.ts
-@@ -5,18 +5,32 @@
+@@ -5,9 +5,18 @@
 
  import { InMemoryCredentialsProvider } from 'vs/platform/credentials/common/credentials';
  import { ILogService } from 'vs/platform/log/common/log';
@@ -26,6 +26,8 @@ Index: code-server/lib/vscode/src/vs/platform/credentials/node/credentialsMainSe
 +}
 
  export class CredentialsWebMainService extends BaseCredentialsMainService {
+ 	// Since we fallback to the in-memory credentials provider, we do not need to surface any Keytar load errors
+@@ -16,10 +25,15 @@ export class CredentialsWebMainService e
 
  	constructor(
  		@ILogService logService: ILogService,
@@ -42,7 +44,7 @@ Index: code-server/lib/vscode/src/vs/platform/credentials/node/credentialsMainSe
  	}
 
  	// If the credentials service is running on the server, we add a suffix -server to differentiate from the location that the
-@@ -45,4 +59,59 @@ export class CredentialsWebMainService e
+@@ -48,4 +62,59 @@ export class CredentialsWebMainService e
  		}
  		return this._keytarCache;
  	}

patches/github-auth.diff

@@ -185,10 +185,10 @@ Index: code-server/lib/vscode/src/vs/workbench/browser/web.main.ts
  import { IWorkspace } from 'vs/workbench/services/host/browser/browserHostService';
  import { WebFileSystemAccess } from 'vs/platform/files/browser/webFileSystemAccess';
 +import { CodeServerClient } from 'vs/workbench/browser/client';
+ import { ITelemetryService } from 'vs/platform/telemetry/common/telemetry';
+ import { IProgressService } from 'vs/platform/progress/common/progress';
 
- export class BrowserMain extends Disposable {
- 
-@@ -103,6 +104,9 @@ export class BrowserMain extends Disposa
+@@ -105,6 +106,9 @@ export class BrowserMain extends Disposa
  		// Startup
  		const instantiationService = workbench.startup();
 
@@ -263,7 +263,7 @@ 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
-@@ -285,6 +285,7 @@ export class WebClientServer {
+@@ -289,6 +289,7 @@ export class WebClientServer {
  				folderUri: resolveWorkspaceURI(this._environmentService.args['default-folder']),
  				workspaceUri: resolveWorkspaceURI(this._environmentService.args['default-workspace']),
  				productConfiguration: <Partial<IProductConfiguration>>{

patches/integration.diff

@@ -20,8 +20,8 @@ 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
-@@ -292,6 +292,7 @@ export class WebClientServer {
- 					enableSmokeTestDriver: this._environmentService.driverHandle === 'web' ? true : undefined,
+@@ -289,6 +289,7 @@ export class WebClientServer {
+ 					enableSmokeTestDriver: this._environmentService.args['enable-smoke-test-driver'] ? true : undefined,
  					logLevel: this._logService.getLevel(),
  				},
 +				userDataPath: this._environmentService.userDataPath,
@@ -32,7 +32,7 @@ Index: code-server/lib/vscode/src/vs/workbench/browser/web.api.ts
 ===================================================================
 --- code-server.orig/lib/vscode/src/vs/workbench/browser/web.api.ts
 +++ code-server/lib/vscode/src/vs/workbench/browser/web.api.ts
-@@ -210,6 +210,11 @@ export interface IWorkbenchConstructionO
+@@ -233,6 +233,11 @@ export interface IWorkbenchConstructionO
  	 */
  	readonly configurationDefaults?: Record<string, any>;
 
@@ -48,7 +48,7 @@ Index: code-server/lib/vscode/src/vs/workbench/services/environment/browser/envi
 ===================================================================
 --- code-server.orig/lib/vscode/src/vs/workbench/services/environment/browser/environmentService.ts
 +++ code-server/lib/vscode/src/vs/workbench/services/environment/browser/environmentService.ts
-@@ -52,7 +52,14 @@ export class BrowserWorkbenchEnvironment
+@@ -53,7 +53,14 @@ export class BrowserWorkbenchEnvironment
  	get logFile(): URI { return joinPath(this.logsHome, 'window.log'); }
 
  	@memoize

patches/local-storage.diff

@@ -7,13 +7,13 @@ 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
-@@ -288,7 +288,10 @@ export class WebClientServer {
+@@ -285,7 +285,10 @@ export class WebClientServer {
  				remoteAuthority,
  				webviewEndpoint: vscodeBase + '/static/out/vs/workbench/contrib/webview/browser/pre',
  				_wrapWebWorkerExtHostInIframe,
--				developmentOptions: { enableSmokeTestDriver: this._environmentService.driverHandle === 'web' ? true : undefined },
+-				developmentOptions: { enableSmokeTestDriver: this._environmentService.args['enable-smoke-test-driver'] ? true : undefined },
 +				developmentOptions: {
-+					enableSmokeTestDriver: this._environmentService.driverHandle === 'web' ? true : undefined,
++					enableSmokeTestDriver: this._environmentService.args['enable-smoke-test-driver'] ? true : undefined,
 +					logLevel: this._logService.getLevel(),
 +				},
  				settingsSyncOptions: !this._environmentService.isBuilt && this._environmentService.args['enable-sync'] ? { enabled: true } : undefined,

patches/log-level.diff

@@ -40,7 +40,7 @@ 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
-@@ -293,6 +293,7 @@ export class WebClientServer {
+@@ -290,6 +290,7 @@ export class WebClientServer {
  				productConfiguration: <Partial<IProductConfiguration>>{
  					rootEndpoint: base,
  					updateEndpoint: !this._environmentService.args['disable-update-check'] ? base + '/update/check' : undefined,

patches/logout.diff

@@ -32,7 +32,7 @@ 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
-@@ -293,14 +293,14 @@ export class WebClientServer {
+@@ -290,14 +290,14 @@ export class WebClientServer {
  					rootEndpoint: base,
  					codeServerVersion: this._productService.codeServerVersion,
  					embedderIdentifier: 'server-distro',

patches/marketplace.diff

@@ -9,7 +9,7 @@ Index: code-server/lib/vscode/src/vs/workbench/services/extensions/common/abstra
 ===================================================================
 --- code-server.orig/lib/vscode/src/vs/workbench/services/extensions/common/abstractExtensionService.ts
 +++ code-server/lib/vscode/src/vs/workbench/services/extensions/common/abstractExtensionService.ts
-@@ -1471,7 +1471,7 @@ class ProposedApiController {
+@@ -1447,7 +1447,7 @@ class ProposedApiController {
 
  		this._envEnabledExtensions = new Set((_environmentService.extensionEnabledProposedApi ?? []).map(id => ExtensionIdentifier.toKey(id)));
 
@@ -22,7 +22,7 @@ Index: code-server/lib/vscode/src/vs/workbench/services/extensions/common/extens
 ===================================================================
 --- code-server.orig/lib/vscode/src/vs/workbench/services/extensions/common/extensions.ts
 +++ code-server/lib/vscode/src/vs/workbench/services/extensions/common/extensions.ts
-@@ -163,10 +163,7 @@ export interface IExtensionHost {
+@@ -359,10 +359,7 @@ function extensionDescriptionArrayToMap(
  }
 
  export function isProposedApiEnabled(extension: IExtensionDescription, proposal: ApiProposalName): boolean {

patches/proposed-api.diff

@@ -68,7 +68,7 @@ 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
-@@ -294,6 +294,7 @@ export class WebClientServer {
+@@ -291,6 +291,7 @@ export class WebClientServer {
  					rootEndpoint: base,
  					updateEndpoint: !this._environmentService.args['disable-update-check'] ? base + '/update/check' : undefined,
  					logoutEndpoint: this._environmentService.args['auth'] ? base + '/logout' : undefined,
@@ -80,7 +80,7 @@ Index: code-server/lib/vscode/src/vs/workbench/browser/web.main.ts
 ===================================================================
 --- code-server.orig/lib/vscode/src/vs/workbench/browser/web.main.ts
 +++ code-server/lib/vscode/src/vs/workbench/browser/web.main.ts
-@@ -179,7 +179,7 @@ export class BrowserMain extends Disposa
+@@ -189,7 +189,7 @@ export class BrowserMain extends Disposa
 
  		// Remote
  		const connectionToken = environmentService.options.connectionToken || getCookieValue(connectionTokenCookieName);
@@ -93,7 +93,7 @@ Index: code-server/lib/vscode/src/vs/workbench/contrib/terminal/common/terminalE
 ===================================================================
 --- code-server.orig/lib/vscode/src/vs/workbench/contrib/terminal/common/terminalEnvironment.ts
 +++ code-server/lib/vscode/src/vs/workbench/contrib/terminal/common/terminalEnvironment.ts
-@@ -388,7 +388,7 @@ export function createTerminalEnvironmen
+@@ -388,7 +388,7 @@ export async function createTerminalEnvi
 
  		// Sanitize the environment, removing any undesirable VS Code and Electron environment
  		// variables