erabo/spiegel_podman
1
0
Fork 0
mirror of https://github.com/podman-container-tools/podman.git synced 2026-11-03 09:37:34 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 5

Merge pull request #23585 from ashley-cui/sshkeygen

Browse source 
pkg/machine: Read stderr from ssh-keygen correctly
This commit is contained in:
openshift-merge-bot[bot] 2024-08-13 10:02:14 +00:00 • committed by GitHub
commit d4ecd574f0
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
1 changed files with 8 additions and 12 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

20
pkg/machine/keys.go
View file

@ -3,9 +3,9 @@
package machine
import (
"bytes"
"errors"
"fmt"
"io"
"os"
"os/exec"
"path/filepath"
@ -71,22 +71,18 @@ func CreateSSHKeysPrefix(identityPath string, passThru bool, skipExisting bool,
func generatekeys(writeLocation string) error {
args := append(append([]string{}, sshCommand[1:]...), writeLocation)
cmd := exec.Command(sshCommand[0], args...)
stdErr, err := cmd.StderrPipe()
if err != nil {
return err
}
stdErr := &bytes.Buffer{}
cmd.Stderr = stdErr
if err := cmd.Start(); err != nil {
return err
}
waitErr := cmd.Wait()
if waitErr == nil {
return nil
if waitErr != nil {
return fmt.Errorf("failed to generate keys: %s: %w", strings.TrimSpace(stdErr.String()), waitErr)
}
errMsg, err := io.ReadAll(stdErr)
if err != nil {
return fmt.Errorf("key generation failed, unable to read from stderr: %w", waitErr)
}
return fmt.Errorf("failed to generate keys: %s: %w", string(errMsg), waitErr)
return nil
}
// generatekeys creates an ed25519 set of keys