Merge pull request #44 from buildkite/keithduncan/add-trailing-new-line

keithduncan · web-flow · commit 922b375a124b · 2021-07-30T14:03:27.000+10:00
Append a trailing newline to secret keys before sending them to the ssh-agent
diff --git a/s3secrets-helper/sshagent/sshagent.go b/s3secrets-helper/sshagent/sshagent.go
@@ -77,6 +77,7 @@ func (a *Agent) Add(key []byte) error {
 		return errors.New("Agent must Run() before Add()")
 	}
 	cmd := exec.Command("ssh-add", "-")
+	key = append(key, '\n')
 	cmd.Stdin = bytes.NewReader(key)
 	cmd.Env = []string{
 		"SSH_AGENT_PID=" + strconv.Itoa(a.pid),

Original file line number	Diff line number	Diff line change
`@@ -77,6 +77,7 @@ func (a *Agent) Add(key []byte) error {`
`77`	`77`	`return errors.New("Agent must Run() before Add()")`
`78`	`78`	`}`
`79`	`79`	`cmd := exec.Command("ssh-add", "-")`
	`80`	`+ key = append(key, '\n')`
`80`	`81`	`cmd.Stdin = bytes.NewReader(key)`
`81`	`82`	`cmd.Env = []string{`
`82`	`83`	`"SSH_AGENT_PID=" + strconv.Itoa(a.pid),`