From 6624dbbce9a3f2c2f4d8d294352c3c27bac34255 Mon Sep 17 00:00:00 2001
From: Alex Dima <alexdima@microsoft.com>
Date: Thu, 15 Aug 2019 23:11:40 +0200
Subject: [PATCH] introduce RemoteAuthorities

---
 src/vs/base/common/network.ts                 | 23 +++++++++++++++++++
 .../remoteAuthorityResolverService.ts         |  2 ++
 .../common/remoteAgentEnvironmentChannel.ts   |  3 +++
 3 files changed, 28 insertions(+)

diff --git a/src/vs/base/common/network.ts b/src/vs/base/common/network.ts
index 46d2933a05e..f3006bdf3e1 100644
--- a/src/vs/base/common/network.ts
+++ b/src/vs/base/common/network.ts
@@ -49,3 +49,26 @@ export namespace Schemas {
 
 	export const userData: string = 'vscode-userdata';
 }
+
+class RemoteAuthoritiesImpl {
+	private readonly _hosts: { [authority: string]: string; };
+	private readonly _ports: { [authority: string]: number; };
+	private readonly _connectionTokens: { [authority: string]: string; };
+
+	constructor() {
+		this._hosts = Object.create(null);
+		this._ports = Object.create(null);
+		this._connectionTokens = Object.create(null);
+	}
+
+	public set(authority: string, host: string, port: number): void {
+		this._hosts[authority] = host;
+		this._ports[authority] = port;
+	}
+
+	public setConnectionToken(authority: string, connectionToken: string): void {
+		this._connectionTokens[authority] = connectionToken;
+	}
+}
+
+export const RemoteAuthorities = new RemoteAuthoritiesImpl();
diff --git a/src/vs/platform/remote/electron-browser/remoteAuthorityResolverService.ts b/src/vs/platform/remote/electron-browser/remoteAuthorityResolverService.ts
index 3cd1da3e018..9ab777f67bd 100644
--- a/src/vs/platform/remote/electron-browser/remoteAuthorityResolverService.ts
+++ b/src/vs/platform/remote/electron-browser/remoteAuthorityResolverService.ts
@@ -6,6 +6,7 @@
 import { ResolvedAuthority, IRemoteAuthorityResolverService, ResolverResult, ResolvedOptions } from 'vs/platform/remote/common/remoteAuthorityResolver';
 import { ipcRenderer as ipc } from 'electron';
 import * as errors from 'vs/base/common/errors';
+import { RemoteAuthorities } from 'vs/base/common/network';
 
 class PendingResolveAuthorityRequest {
 	constructor(
@@ -50,6 +51,7 @@ export class RemoteAuthorityResolverService implements IRemoteAuthorityResolverS
 		if (this._resolveAuthorityRequests[resolvedAuthority.authority]) {
 			let request = this._resolveAuthorityRequests[resolvedAuthority.authority];
 			ipc.send('vscode:remoteAuthorityResolved', resolvedAuthority);
+			RemoteAuthorities.set(resolvedAuthority.authority, resolvedAuthority.host, resolvedAuthority.port);
 			request.resolve({ authority: resolvedAuthority, options });
 		}
 	}
diff --git a/src/vs/workbench/services/remote/common/remoteAgentEnvironmentChannel.ts b/src/vs/workbench/services/remote/common/remoteAgentEnvironmentChannel.ts
index ee89f26f394..fe15f2b644e 100644
--- a/src/vs/workbench/services/remote/common/remoteAgentEnvironmentChannel.ts
+++ b/src/vs/workbench/services/remote/common/remoteAgentEnvironmentChannel.ts
@@ -9,6 +9,7 @@ import { IChannel } from 'vs/base/parts/ipc/common/ipc';
 import { IExtensionDescription } from 'vs/platform/extensions/common/extensions';
 import { IRemoteAgentEnvironment } from 'vs/platform/remote/common/remoteAgentEnvironment';
 import { IDiagnosticInfoOptions, IDiagnosticInfo } from 'vs/platform/diagnostics/common/diagnostics';
+import { RemoteAuthorities } from 'vs/base/common/network';
 
 export interface IGetEnvironmentDataArguments {
 	language: string;
@@ -44,6 +45,8 @@ export class RemoteExtensionEnvironmentChannelClient {
 
 		const data = await this.channel.call<IRemoteAgentEnvironmentDTO>('getEnvironmentData', args);
 
+		RemoteAuthorities.setConnectionToken(remoteAuthority, data.connectionToken);
+
 		return {
 			pid: data.pid,
 			connectionToken: data.connectionToken,
-- 
GitLab