💄

Author: jeanp413

extensions/gitpod/src/remoteConnector.ts

@@ -436,7 +436,7 @@ export default class RemoteConnector extends Disposable {
 			throw new NoSSHGatewayError(gitpodHost);
 		}
 
-		const sshHostKeys: { type: string, host_key: string }[] = await sshHostKeyResponse.json();
+		const sshHostKeys: { type: string; host_key: string }[] = await sshHostKeyResponse.json();
 
 		const ownerToken = await withServerApi(session.accessToken, serviceUrl.toString(), service => service.server.getOwnerToken(workspaceId), this.logger);
 
@@ -460,8 +460,9 @@ export default class RemoteConnector extends Disposable {
 				username: sshDestInfo.user,
 				authHandler(_methodsLeft, _partialSuccess, _callback) {
 					return {
-						type: 'none',
-						username: sshDestInfo.user,
+						type: 'password',
+						username: workspaceId,
+						password: ownerToken,
 					};
 				},
 				hostVerifier(hostKey) {
@@ -492,7 +493,7 @@ export default class RemoteConnector extends Disposable {
 		return Buffer.from(JSON.stringify(sshDestInfo), 'utf8').toString('hex');
 	}
 
-	private async getWorkspaceLocalAppSSHDestination(params: SSHConnectionParams): Promise<{ localAppSSHDest: string; localAppSSHConfigPath: string; }> {
+	private async getWorkspaceLocalAppSSHDestination(params: SSHConnectionParams): Promise<{ localAppSSHDest: string; localAppSSHConfigPath: string }> {
 		return vscode.window.withProgress({
 			location: vscode.ProgressLocation.Notification,
 			cancellable: true,
@@ -629,7 +630,7 @@ export default class RemoteConnector extends Disposable {
 					if (action === seeLogs) {
 						this.logger.show();
 					} else if (action === showTroubleshooting) {
-						vscode.env.openExternal(vscode.Uri.parse('https://www.gitpod.io/docs/troubleshooting'));
+						vscode.env.openExternal(vscode.Uri.parse('https://www.gitpod.io/docs/ides-and-editors/vscode#vs-code-desktop-ssh-access'));
 					}
 					return;
 				}
@@ -661,7 +662,7 @@ export default class RemoteConnector extends Disposable {
 							vscode.window.showTextDocument(document);
 						}
 					} else if (action === showTroubleshooting) {
-						vscode.env.openExternal(vscode.Uri.parse('https://www.gitpod.io/docs/troubleshooting'));
+						vscode.env.openExternal(vscode.Uri.parse('https://www.gitpod.io/docs/ides-and-editors/vscode#vs-code-desktop-ssh-access'));
 					}
 				} else {
 					// Do nothing, user cancelled the operation

extensions/yarn.lock

@@ -423,6 +423,11 @@ bufrw@^1.3.0:
     hexer "^1.5.0"
     xtend "^4.0.0"
 
+[email protected]:
+  version "0.0.3"
+  resolved "https://registry.yarnpkg.com/buildcheck/-/buildcheck-0.0.3.tgz#70451897a95d80f7807e68fc412eb2e7e35ff4d5"
+  integrity sha512-pziaA+p/wdVImfcbsZLNF32EiWyujlQLwolMqUQE8xpKNOH7KmZQaY8sXN7DGOEzPAElo9QTaeNRfGnf3iOJbA==
+
 [email protected]:
   version "0.0.2"
   resolved "https://registry.yarnpkg.com/charenc/-/charenc-0.0.2.tgz#c0a1d2f3a7092e03774bfa83f14c0fc5790a8667"
@@ -476,6 +481,14 @@ cookie@^0.4.2:
   resolved "https://registry.yarnpkg.com/cookie/-/cookie-0.4.2.tgz#0e41f24de5ecf317947c82fc789e06a884824432"
   integrity sha512-aSWTXFzaKWkvHO1Ny/s+ePFpvKsPnjc551iI41v3ny/ow6tBG5Vd+FuqGNhh1LxOmVzOlGUriIlOaokOvhaStA==
 
+cpu-features@~0.0.4:
+  version "0.0.4"
+  resolved "https://registry.yarnpkg.com/cpu-features/-/cpu-features-0.0.4.tgz#0023475bb4f4c525869c162e4108099e35bf19d8"
+  integrity sha512-fKiZ/zp1mUwQbnzb9IghXtHtDoTMtNeb8oYGx6kX2SYfhnG0HNdBEBIzB9b5KlXu5DQPhfy3mInbBxFcgwAr3A==
+  dependencies:
+    buildcheck "0.0.3"
+    nan "^2.15.0"
+
 create-error@^0.3.1:
   version "0.3.1"
   resolved "https://registry.yarnpkg.com/create-error/-/create-error-0.3.1.tgz#69810245a629e654432bf04377360003a5351a23"
@@ -758,6 +771,11 @@ ms@^2.0.0:
   resolved "https://registry.yarnpkg.com/ms/-/ms-2.1.3.tgz#574c8138ce1d2b5861f0b44579dbadd60c6615b2"
   integrity sha512-6FlzubTLZG3J2a/NVCAleEhjzq5oxgHyaCU9yYXvcLsvoVaHJq/s5xXI6/XXP6tz7R9xAOtHnSO/tXtF3WRTlA==
 
+nan@^2.15.0:
+  version "2.15.0"
+  resolved "https://registry.yarnpkg.com/nan/-/nan-2.15.0.tgz#3f34a473ff18e15c1b5626b62903b5ad6e665fee"
+  integrity sha512-8ZtvEnA2c5aYCZYd1cvgdnU6cqwixRoYg70xPLWUws5ORTa/lnw+u4amixRS/Ac5U5mQVgp9pnlSUnbNWFaWZQ==
+
 node-addon-api@^3.2.1:
   version "3.2.1"
   resolved "https://registry.yarnpkg.com/node-addon-api/-/node-addon-api-3.2.1.tgz#81325e0a2117789c0128dab65e7e38f07ceba161"