From 2625068f7839d96783afef68025f64c122d5e805 Mon Sep 17 00:00:00 2001 From: Ayman Bagabas Date: Thu, 17 Nov 2022 14:50:24 -0500 Subject: [PATCH] fix(test): quote ssh key path --- server/git/ssh_test.go | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/server/git/ssh_test.go b/server/git/ssh_test.go index e6ec6336ab0c69922197f4d973bf5602e1d86eb4..487e94995b500633f8161b0afdf6eb393ee7c949 100644 --- a/server/git/ssh_test.go +++ b/server/git/ssh_test.go @@ -126,7 +126,7 @@ func runGitHelper(t *testing.T, pk, cwd string, args ...string) error { cmd := exec.Command("git", allArgs...) cmd.Dir = cwd - cmd.Env = []string{fmt.Sprintf(`GIT_SSH_COMMAND=ssh -o UserKnownHostsFile=/dev/null -o StrictHostKeyChecking=no -i %s -F /dev/null`, pk)} + cmd.Env = []string{fmt.Sprintf(`GIT_SSH_COMMAND=ssh -o UserKnownHostsFile=/dev/null -o StrictHostKeyChecking=no -i "%s" -F /dev/null`, pk)} out, err := cmd.CombinedOutput() t.Log("git out:", string(out)) return err @@ -163,9 +163,12 @@ func createKeyPair(t *testing.T) (ssh.PublicKey, string) { t.Helper() keyDir := t.TempDir() - _, err := keygen.NewWithWrite(filepath.Join(keyDir, "id"), nil, keygen.Ed25519) + t.Logf("Tempdir %s", keyDir) + kp, err := keygen.NewWithWrite(filepath.Join(keyDir, "id"), nil, keygen.Ed25519) + kp.KeyPairExists() requireNoError(t, err) pk := filepath.Join(keyDir, "id_ed25519") + t.Logf("pk %s", pk) pubBytes, err := os.ReadFile(filepath.Join(keyDir, "id_ed25519.pub")) requireNoError(t, err) pubkey, _, _, _, err := ssh.ParseAuthorizedKey(pubBytes)