Skip to content

feat: Improve experience with local SSH keys #3835

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 7 commits into from
Sep 12, 2022
Merged

feat: Improve experience with local SSH keys #3835

Changes from 1 commit
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
edd595c
fix: Ensure gitssh cleans up temporary file on interrupt
mafredri Sep 2, 2022
b6efca5
feat: Improve experience with local SSH keys
mafredri Sep 2, 2022
a41749e
Use errBuf in ssh -G
mafredri Sep 2, 2022
cc92ef0
Remove errBuf, prints errors about pseudo terminal
mafredri Sep 2, 2022
efbd97e
Use io.Discard for stderr when running ssh -G
mafredri Sep 2, 2022
ef071c1
Apply suggestions from code review
mafredri Sep 5, 2022
0d413fb
Disable dogsled lint
mafredri Sep 5, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Next Next commit
fix: Ensure gitssh cleans up temporary file on interrupt
  • Loading branch information
@mafredri
mafredri committed Sep 5, 2022
commit edd595ceb2ebe585a8418178fc114bc6ff223894
12 changes: 10 additions & 2 deletions cli/gitssh.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,7 @@ import (
"fmt"
"os"
"os/exec"
"os/signal"
"strings"

"github.com/spf13/cobra"
Expand All @@ -18,11 +19,18 @@ func gitssh() *cobra.Command {
Hidden: true,
Short: `Wraps the "ssh" command and uses the coder gitssh key for authentication`,
RunE: func(cmd *cobra.Command, args []string) error {
ctx := cmd.Context()

// Catch interrupt signals as a best-effort attempt to clean
// up the temporary key file.
ctx, stop := signal.NotifyContext(ctx, interruptSignals...)
defer stop()

client, err := createAgentClient(cmd)
if err != nil {
return xerrors.Errorf("create agent client: %w", err)
}
key, err := client.AgentGitSSHKey(cmd.Context())
key, err := client.AgentGitSSHKey(ctx)
if err != nil {
return xerrors.Errorf("get agent git ssh token: %w", err)
}
Expand All @@ -45,7 +53,7 @@ func gitssh() *cobra.Command {
}

args = append([]string{"-i", privateKeyFile.Name()}, args...)
c := exec.CommandContext(cmd.Context(), "ssh", args...)
c := exec.CommandContext(ctx, "ssh", args...)
c.Stderr = cmd.ErrOrStderr()
c.Stdout = cmd.OutOrStdout()
c.Stdin = cmd.InOrStdin()
Expand Down