Support with ~

Author: mustard-mh

src/common/files.ts

@@ -5,6 +5,7 @@
 
 import * as fs from 'fs';
 import * as os from 'os';
+import * as path from 'path';
 
 const homeDir = os.homedir();
 
@@ -20,3 +21,17 @@ export async function exists(path: string) {
 export function untildify(path: string){
 	return path.replace(/^~(?=$|\/|\\)/, homeDir);
 }
+
+export function resolveHomeDir(filepath: string | undefined) {
+    if (!filepath) {
+        return filepath;
+    }
+    const homedir = os.homedir();
+    if (filepath === '~') {
+        return homedir;
+    }
+    if (filepath.startsWith('~/')) {
+        return path.join(homedir, filepath.slice(2));
+    }
+    return filepath;
+}

src/remoteConnector.ts

@@ -28,7 +28,7 @@ import { HeartbeatManager } from './heartbeat';
 import { getGitpodVersion, isFeatureSupported } from './featureSupport';
 import SSHConfiguration from './ssh/sshConfig';
 import { isWindows } from './common/platform';
-import { untildify } from './common/files';
+import { resolveHomeDir, untildify } from './common/files';
 
 interface SSHConnectionParams {
 	workspaceId: string;
@@ -440,7 +440,7 @@ export default class RemoteConnector extends Disposable {
 			identityFiles.push(...DEFAULT_IDENTITY_FILES);
 		}
 
-		const identityFileContentsResult = await Promise.allSettled(identityFiles.map(async path => fs.promises.readFile(path + '.pub')));
+		const identityFileContentsResult = await Promise.allSettled(identityFiles.map(async path => fs.promises.readFile(resolveHomeDir(path) + '.pub')));
 		const fileKeys = identityFileContentsResult.map((result, i) => {
 			if (result.status === 'rejected') {
 				return undefined;
@@ -462,14 +462,20 @@ export default class RemoteConnector extends Disposable {
 			};
 		}).filter(<T>(v: T | undefined): v is T => !!v);
 
-		const sshAgentSock = isWindows ? `\\.\pipe\openssh-ssh-agent` : (hostConfig['IdentityAgent'] || process.env['SSH_AUTH_SOCK']);
+		let sshAgentSock: string | undefined;
+		if (isWindows) {
+			sshAgentSock = `\\.\pipe\openssh-ssh-agent`;
+		} else {
+			sshAgentSock = (hostConfig['IdentityAgent'] || process.env['SSH_AUTH_SOCK']);
+			sshAgentSock = resolveHomeDir(sshAgentSock);
+		}
 		let sshAgentParsedKeys: ParsedKey[] = [];
 		try {
-			if (!sshAgentSock) {
-				throw new Error(`SSH_AUTH_SOCK environment variable not defined`);
-			}
-
 			sshAgentParsedKeys = await new Promise<ParsedKey[]>((resolve, reject) => {
+				if (!sshAgentSock) {
+					reject(new Error(`SSH_AUTH_SOCK environment variable not defined`));
+					return;
+				}
 				const sshAgent = new OpenSSHAgent(sshAgentSock);
 				sshAgent.getIdentities((err, publicKeys) => {
 					if (err) {