Fix issues surrounding authentication and login.

GirlBossRush · ZauberNerd · commit d617bc623365 · 2021-12-23T15:48:38.000Z
- Added product config to client, iframe config.
diff --git a/src/vs/base/common/auth.ts b/src/vs/base/common/auth.ts
@@ -0,0 +1,10 @@
+/* eslint-disable header/header */
+/*---------------------------------------------------------------------------------------------
+ *  Copyright (c) Coder Technologies. All rights reserved.
+ *  Licensed under the MIT License. See License.txt in the project root for license information.
+ *--------------------------------------------------------------------------------------------*/
+
+export enum AuthType {
+	Password = 'password',
+	None = 'none',
+}
diff --git a/src/vs/base/common/product.ts b/src/vs/base/common/product.ts
@@ -4,6 +4,7 @@
  *--------------------------------------------------------------------------------------------*/
 
 import { IStringDictionary } from 'vs/base/common/collections';
+import { AuthType } from 'vs/base/common/auth';
 
 export interface IBuiltInExtension {
 	readonly name: string;
@@ -31,17 +32,20 @@ export type ExtensionVirtualWorkspaceSupport = {
 };
 
 export interface IProductConfiguration {
-	// @coder BEGIN
+	//#region Code Server Additions
+	
 	readonly codeServerVersion?: string;
-	readonly authed?: boolean;
+	readonly auth?: AuthType;
+
 	readonly logoutEndpointUrl: string;
 	readonly proxyEndpointUrlTemplate?: string;
 	readonly serviceWorker?: {
 		readonly url: string;
 		readonly scope: string;
 	}
 	readonly icons: Array<{ src: string; type: string; sizes: string }>;
-	// @coder END */
+	
+	//#regionend
 
 	readonly version: string;
 	readonly date?: string;
diff --git a/src/vs/code/browser/workbench/workbench-dev.html b/src/vs/code/browser/workbench/workbench-dev.html
@@ -32,7 +32,7 @@
 		<meta name="theme-color" content="{{CLIENT_BACKGROUND_COLOR}}">
 
 		<link rel="icon" href="./favicon.ico" type="image/x-icon" />
-		<link rel="manifest" href="./manifest.json">
+		<link rel="manifest" href="./manifest.json" crossorigin="use-credentials">
 	</head>
 
 	<body style="background-color: var(--vs-theme-background-color); color: var(--vs-theme-foreground-color)" aria-label="">
diff --git a/src/vs/code/browser/workbench/workbench-error.html b/src/vs/code/browser/workbench/workbench-error.html
@@ -9,7 +9,7 @@
 
 		<!-- Workbench Icon/Manifest/CSS -->
 		<link rel="icon" href="data:;base64,iVBORw0KGgo=">
-		<link rel="manifest" href="./manifest.json">
+		<link rel="manifest" href="./manifest.json" crossorigin="use-credentials">
 
 		<meta name="theme-color" content="{{CLIENT_BACKGROUND_COLOR}}">
 
diff --git a/src/vs/server/@types/code-server-lib/index.d.ts b/src/vs/server/@types/code-server-lib/index.d.ts
@@ -7,10 +7,13 @@
 import type { NLSConfiguration, InternalNLSConfiguration } from '../../../base/node/languagePacks';
 import type * as http from 'http';
 import type * as net from 'net';
+import type { AuthType } from 'vs/base/common/auth';
 
 declare global {
 	namespace CodeServerLib {
+
 		export interface ServerParsedArgs {
+			auth: AuthType;
 			port?: string;
 			connectionToken?: string;
 			/**
diff --git a/src/vs/server/serverEnvironmentService.ts b/src/vs/server/serverEnvironmentService.ts
@@ -10,8 +10,10 @@ import { refineServiceDecorator } from 'vs/platform/instantiation/common/instant
 import { IEnvironmentService, INativeEnvironmentService } from 'vs/platform/environment/common/environment';
 import { memoize } from 'vs/base/common/decorators';
 import { FileAccess } from 'vs/base/common/network';
+import { AuthType } from 'vs/base/common/auth';
 
 export const serverOptions: OptionDescriptions<ServerParsedArgs> = {
+	'auth': { type: 'string' },
 	'port': { type: 'string' },
 	'pick-port': { type: 'string' },
 	'connection-token': { type: 'string', cat: 'o', deprecates: 'connectionToken', description: nls.localize('connection-token', "A secret that must be included by the web client with all requests.") },
@@ -63,6 +65,7 @@ export const serverOptions: OptionDescriptions<ServerParsedArgs> = {
 };
 
 export interface ServerParsedArgs {
+	auth?: AuthType;
 	port?: string;
 	'pick-port'?: string;
 	/**
@@ -145,11 +148,16 @@ export interface IServerEnvironmentService extends INativeEnvironmentService {
 	readonly serviceWorkerFileName: string;
 	readonly serviceWorkerPath: string;
 	readonly proxyUri: string;
+	readonly auth: AuthType;
 }
 
 export class ServerEnvironmentService extends NativeEnvironmentService implements IServerEnvironmentService {
 	override get args(): ServerParsedArgs { return super.args as ServerParsedArgs; }
 
+	public get auth(): AuthType {
+		return this.args['auth'] || AuthType.None;
+	}
+
 	public get serviceWorkerFileName(): string {
 		return 'service-worker.js';
 	}
diff --git a/src/vs/server/webClientServer.ts b/src/vs/server/webClientServer.ts
@@ -186,8 +186,8 @@ export class WebClientServer {
 			return undefined;
 		};
 
-		const proto = parseHeaders(["X-Forwarded-Proto"]) || "http";
-		const host = parseHeaders(["X-Forwarded-Host", "host"]) || "localhost";
+		const proto = parseHeaders(['X-Forwarded-Proto']) || 'http';
+		const host = parseHeaders(['X-Forwarded-Host', 'host']) || 'localhost';
 
 		return new URL(`${proto}://${host}`);
 	}
@@ -303,11 +303,23 @@ export class WebClientServer {
 		const data = (await util.promisify(fs.readFile)(filePath)).toString()
 			.replace('{{WORKBENCH_WEB_CONFIGURATION}}', escapeAttribute(JSON.stringify(<IWorkbenchConstructionOptions>{
 				productConfiguration: {
-					updateUrl: this.createRequestUrl(req, parsedUrl, '/update/check').toString(),
+					...this._productService,
+
+					// Session
+					auth: this._environmentService.auth,
+
+					// Service Worker
 					serviceWorker: {
 						scope: './',
 						url: `./${this._environmentService.serviceWorkerFileName}`
-					}
+					},
+
+					// Endpoints
+					logoutEndpointUrl: this.createRequestUrl(req, parsedUrl, '/logout').toString(),
+					webEndpointUrl: this.createRequestUrl(req, parsedUrl, '/static').toString(),
+					webEndpointUrlTemplate: this.createRequestUrl(req, parsedUrl, '/static').toString(),
+
+					updateUrl: this.createRequestUrl(req, parsedUrl, '/update/check').toString(),
 				},
 				folderUri: (workspacePath && isFolder) ? transformer.transformOutgoing(URI.file(workspacePath)) : undefined,
 				workspaceUri: (workspacePath && !isFolder) ? transformer.transformOutgoing(URI.file(workspacePath)) : undefined,
diff --git a/src/vs/workbench/browser/client.ts b/src/vs/workbench/browser/client.ts
@@ -4,6 +4,7 @@
  *  Licensed under the MIT License. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
 
+import { AuthType } from 'vs/base/common/auth';
 import { Disposable } from 'vs/base/common/lifecycle';
 import { localize } from 'vs/nls';
 import { MenuId, MenuRegistry } from 'vs/platform/actions/common/actions';
@@ -174,34 +175,26 @@ export class CodeServerClientAdditions extends Disposable {
 	}
 
 	private appendSessionCommands() {
-		const { authed, logoutEndpointUrl } = this.productConfiguration;
+		const { auth, logoutEndpointUrl } = this.productConfiguration;
 
 		// Use to show or hide logout commands and menu options.
-		this.contextKeyService.createKey(CodeServerClientAdditions.AUTH_KEY, !!authed);
+		this.contextKeyService.createKey(CodeServerClientAdditions.AUTH_KEY, auth === AuthType.Password);
 
 		CommandsRegistry.registerCommand(CodeServerClientAdditions.LOGOUT_COMMAND_ID, () => {
 			if (logoutEndpointUrl) {
 				window.location.href = logoutEndpointUrl;
 			}
 		});
 
-		// Add logout to command palette.
-		MenuRegistry.appendMenuItem(MenuId.CommandPalette, {
-			command: {
-				id: CodeServerClientAdditions.LOGOUT_COMMAND_ID,
-				title: localize('logout', 'Log out'),
-			},
-			when: ContextKeyExpr.has(CodeServerClientAdditions.AUTH_KEY),
-		});
-
-		// Add logout to the (web-only) home menu.
-		MenuRegistry.appendMenuItem(MenuId.MenubarHomeMenu, {
-			command: {
-				id: CodeServerClientAdditions.LOGOUT_COMMAND_ID,
-				title: localize('logout', 'Log out'),
-			},
-			when: ContextKeyExpr.has(CodeServerClientAdditions.AUTH_KEY),
-		});
+		for (const menuId of [MenuId.CommandPalette, MenuId.MenubarHomeMenu]) {
+			MenuRegistry.appendMenuItem(menuId, {
+				command: {
+					id: CodeServerClientAdditions.LOGOUT_COMMAND_ID,
+					title: localize('logout', 'Sign out of {0}', this.productConfiguration.nameShort),
+				},
+				when: ContextKeyExpr.has(CodeServerClientAdditions.AUTH_KEY),
+			});
+		}
 	}
 
 	private registerServiceWorker = async (): Promise<void> => {
