From e0d767fd8e00760a64adee7a5952833d8cce6fb8 Mon Sep 17 00:00:00 2001 From: Matthias Pigulla Date: Tue, 2 Mar 2021 15:40:01 +0000 Subject: [PATCH] Make sure file creation works --- .github/workflows/demo.yml | 2 ++ dist/index.js | 10 +++++++--- index.js | 10 +++++++--- 3 files changed, 16 insertions(+), 6 deletions(-) diff --git a/.github/workflows/demo.yml b/.github/workflows/demo.yml index e6db086..9c08578 100644 --- a/.github/workflows/demo.yml +++ b/.github/workflows/demo.yml @@ -58,6 +58,8 @@ jobs: ${{ secrets.MPDUDE_TEST_1_DEPLOY_KEY }} ${{ secrets.MPDUDE_TEST_2_DEPLOY_KEY }} - run: | + dir c:\\ + dir c:\\dev ssh-add -l git clone git@github.com:mpdude/test-2.git test-2-git diff --git a/dist/index.js b/dist/index.js index 27bbdda..e6b26b1 100644 --- a/dist/index.js +++ b/dist/index.js @@ -138,8 +138,8 @@ try { child_process.execSync('sc config ssh-agent start=demand', { stdio: 'inherit' }); // Work around https://github.com/PowerShell/openssh-portable/pull/447 by creating a \dev\tty file - fs.mkdirSync('\\dev'); - fs.closeSync(fs.openSync('\\dev\\tty', 'a')); + fs.mkdirSync('c:\\dev'); + fs.closeSync(fs.openSync('c:\\dev\\tty', 'a')); home = os.homedir(); } else { @@ -215,11 +215,15 @@ try { child_process.execSync(`git config --global --add url."git@key-${keyNumber}:${ownerAndRepo}".insteadOf "git@github.com:${ownerAndRepo}"`); child_process.execSync(`git config --global --add url."git@key-${keyNumber}:${ownerAndRepo}".insteadOf "ssh://git@github.com/${ownerAndRepo}"`); + // On Linux and OS X, IdentitiesOnly=no will send all keys from agent before the explicit key, so use "yes". + // On Windows, IdentitiesOnly=yes will ignore keys from the agent, but send explicit keys first; so use "no" (https://github.com/PowerShell/Win32-OpenSSH/issues/1550) + let identitiesOnly = isWindows ? 'no' : 'yes'; + // Use IdentitiesOnly=no due to https://github.com/PowerShell/Win32-OpenSSH/issues/1550 let sshConfig = `\nHost key-${keyNumber}\n` + ` HostName github.com\n` + ` User git\n` - + ` IdentitiesOnly no\n` + + ` IdentitiesOnly ${identitiesOnly}\n` + ` IdentityFile ${keyFile}\n`; fs.appendFileSync(`${homeSsh}/config`, sshConfig); diff --git a/index.js b/index.js index 53a6b4b..adf4f05 100644 --- a/index.js +++ b/index.js @@ -21,8 +21,8 @@ try { child_process.execSync('sc config ssh-agent start=demand', { stdio: 'inherit' }); // Work around https://github.com/PowerShell/openssh-portable/pull/447 by creating a \dev\tty file - fs.mkdirSync('\\dev'); - fs.closeSync(fs.openSync('\\dev\\tty', 'a')); + fs.mkdirSync('c:\\dev'); + fs.closeSync(fs.openSync('c:\\dev\\tty', 'a')); home = os.homedir(); } else { @@ -98,11 +98,15 @@ try { child_process.execSync(`git config --global --add url."git@key-${keyNumber}:${ownerAndRepo}".insteadOf "git@github.com:${ownerAndRepo}"`); child_process.execSync(`git config --global --add url."git@key-${keyNumber}:${ownerAndRepo}".insteadOf "ssh://git@github.com/${ownerAndRepo}"`); + // On Linux and OS X, IdentitiesOnly=no will send all keys from agent before the explicit key, so use "yes". + // On Windows, IdentitiesOnly=yes will ignore keys from the agent, but send explicit keys first; so use "no" (https://github.com/PowerShell/Win32-OpenSSH/issues/1550) + let identitiesOnly = isWindows ? 'no' : 'yes'; + // Use IdentitiesOnly=no due to https://github.com/PowerShell/Win32-OpenSSH/issues/1550 let sshConfig = `\nHost key-${keyNumber}\n` + ` HostName github.com\n` + ` User git\n` - + ` IdentitiesOnly no\n` + + ` IdentitiesOnly ${identitiesOnly}\n` + ` IdentityFile ${keyFile}\n`; fs.appendFileSync(`${homeSsh}/config`, sshConfig);