Pass in connectionToken

alexdima · alexdima · commit bc943bc3feb4 · 2019-07-29T21:44:14.000+02:00
diff --git a/src/vs/code/browser/workbench/workbench.html b/src/vs/code/browser/workbench/workbench.html
@@ -19,9 +19,6 @@
 
 		<!-- Workaround to pass product configuration-->
 		<meta id="vscode-remote-product-configuration" data-settings="{{PRODUCT_CONFIGURATION}}">
-
-		<!-- Workaround to pass remote connection token-->
-		<meta id="vscode-remote-connection-token" data-settings="{{CONNECTION_AUTH_TOKEN}}">
 	</head>
 
 	<body aria-label="">
@@ -35,4 +32,4 @@
 
 	<!-- Startup via workbench.js -->
 	<script src="./out/vs/code/browser/workbench/workbench.js"></script>
-</html>
+</html>
diff --git a/src/vs/platform/sign/browser/signService.ts b/src/vs/platform/sign/browser/signService.ts
@@ -10,7 +10,28 @@ export class SignService implements ISignService {
 
 	_serviceBrand: ServiceIdentifier<ISignService>;
 
+	private readonly _tkn: string | null;
+
+	constructor(token: string | undefined) {
+		if (typeof token !== 'undefined') {
+			this._tkn = token;
+		} else {
+			this._tkn = SignService._readTokenFromURL();
+		}
+	}
+
+	private static _readTokenFromURL(): string | null {
+		if (!document.location.hash) {
+			return null;
+		}
+		const m = document.location.hash.match(/[#&]tkn=([^&]+)/);
+		if (!m) {
+			return null;
+		}
+		return m[1];
+	}
+
 	async sign(value: string): Promise<string> {
-		return Promise.resolve(document.getElementById('vscode-remote-connection-token')!.getAttribute('data-settings')!);
+		return Promise.resolve(this._tkn || '');
 	}
-}
+}
diff --git a/src/vs/workbench/browser/web.main.ts b/src/vs/workbench/browser/web.main.ts
@@ -131,7 +131,7 @@ class CodeRendererMain extends Disposable {
 		serviceCollection.set(IRemoteAuthorityResolverService, remoteAuthorityResolverService);
 
 		// Signing
-		const signService = new SignService();
+		const signService = new SignService(this.configuration.connectionToken);
 		serviceCollection.set(ISignService, signService);
 
 		// Remote Agent
diff --git a/src/vs/workbench/services/configuration/test/electron-browser/configurationService.test.ts b/src/vs/workbench/services/configuration/test/electron-browser/configurationService.test.ts
@@ -107,7 +107,7 @@ suite('WorkspaceContextService - Folder', () => {
 				const environmentService = new TestEnvironmentService(URI.file(parentDir));
 				const fileService = new FileService(new NullLogService());
 				fileService.registerProvider(Schemas.userData, new FileUserDataProvider(environmentService.appSettingsHome, environmentService.backupHome, new DiskFileSystemProvider(new NullLogService()), environmentService));
-				workspaceContextService = new WorkspaceService({ configurationCache: new ConfigurationCache(environmentService) }, environmentService, fileService, new RemoteAgentService(<IWindowConfiguration>{}, environmentService, new RemoteAuthorityResolverService(), new SignService()));
+				workspaceContextService = new WorkspaceService({ configurationCache: new ConfigurationCache(environmentService) }, environmentService, fileService, new RemoteAgentService(<IWindowConfiguration>{}, environmentService, new RemoteAuthorityResolverService(), new SignService(undefined)));
 				return (<WorkspaceService>workspaceContextService).initialize(convertToWorkspacePayload(URI.file(folderDir)));
 			});
 	});
@@ -1630,4 +1630,4 @@ export function getWorkspaceIdentifier(configPath: URI): IWorkspaceIdentifier {
 		configPath,
 		id: getWorkspaceId(configPath)
 	};
-}
+}
diff --git a/src/vs/workbench/workbench.web.api.ts b/src/vs/workbench/workbench.web.api.ts
@@ -18,6 +18,11 @@ export interface IWorkbenchConstructionOptions {
 	 */
 	remoteAuthority: string;
 
+	/**
+	 * The connection token to send to the server.
+	 */
+	connectionToken?: string;
+
 	/**
 	 * Experimental: An endpoint to serve iframe content ("webview") from. This is required
 	 * to provide full security isolation from the workbench host.
@@ -64,4 +69,4 @@ function create(domElement: HTMLElement, options: IWorkbenchConstructionOptions)
 
 export {
 	create
-};
+};
