fix: deploy keys StdinPipe order and add structured logging

- sshmanager/deploy.go: StdinPipe() must be called BEFORE Start(),
  not after. Reordered the calls to fix "ssh: StdinPipe after
  process started" error.
- Return DeployResult instead of nil error on SSH dial failure
  so the frontend always gets a parseable response.
- Add slog.Debug for key upload, slog.Warn for ssh-keyscan and
  authorized_keys failures, slog.Info for final result summary.
This commit is contained in:
2026-07-09 20:45:32 -04:00
parent be2d2d1a8d
commit cb39df63bc
+18 -6
View File
@@ -4,6 +4,7 @@ import (
"bytes" "bytes"
"context" "context"
"fmt" "fmt"
"log/slog"
"net" "net"
"os" "os"
"path/filepath" "path/filepath"
@@ -55,7 +56,8 @@ func DeployKeysToMachine(ctx context.Context, serverKeyPath, serverPubKey string
conn, err := ssh.Dial("tcp", addr, cfg) conn, err := ssh.Dial("tcp", addr, cfg)
if err != nil { if err != nil {
return nil, fmt.Errorf("connecting to %s: %w", addr, err) slog.Warn("deploy keys: SSH dial failed", "host", addr, "error", err)
return &DeployResult{Success: false, Messages: []string{}, Errors: []string{fmt.Sprintf("connecting to %s: %v", addr, err)}}, nil
} }
defer conn.Close() defer conn.Close()
@@ -101,17 +103,22 @@ func DeployKeysToMachine(ctx context.Context, serverKeyPath, serverPubKey string
sess2.Stdout = &stdout sess2.Stdout = &stdout
sess2.Stderr = &stderr sess2.Stderr = &stderr
slog.Debug("deploy: uploading key", "local", k.LocalPath, "remote", k.RemotePath, "host", host)
cmd := fmt.Sprintf("cat > %s && chmod 0%o %s", k.RemotePath, mode, k.RemotePath) cmd := fmt.Sprintf("cat > %s && chmod 0%o %s", k.RemotePath, mode, k.RemotePath)
if err := sess2.Start(cmd); err != nil {
result.Errors = append(result.Errors, fmt.Sprintf("starting command for %s: %v", k.RemotePath, err))
result.Success = false
continue
}
stdin, err := sess2.StdinPipe() stdin, err := sess2.StdinPipe()
if err != nil { if err != nil {
result.Errors = append(result.Errors, fmt.Sprintf("stdin pipe for %s: %v", k.RemotePath, err)) result.Errors = append(result.Errors, fmt.Sprintf("stdin pipe for %s: %v", k.RemotePath, err))
result.Success = false result.Success = false
sess2.Close()
continue
}
if err := sess2.Start(cmd); err != nil {
result.Errors = append(result.Errors, fmt.Sprintf("starting command for %s: %v", k.RemotePath, err))
result.Success = false
sess2.Close()
continue continue
} }
@@ -119,6 +126,8 @@ func DeployKeysToMachine(ctx context.Context, serverKeyPath, serverPubKey string
if err != nil { if err != nil {
result.Errors = append(result.Errors, fmt.Sprintf("writing key %s: %v", k.RemotePath, err)) result.Errors = append(result.Errors, fmt.Sprintf("writing key %s: %v", k.RemotePath, err))
result.Success = false result.Success = false
stdin.Close()
sess2.Close()
continue continue
} }
stdin.Close() stdin.Close()
@@ -143,6 +152,7 @@ func DeployKeysToMachine(ctx context.Context, serverKeyPath, serverPubKey string
err := session2.Run(fmt.Sprintf("ssh-keyscan -H -p %d %s 2>/dev/null >> %s/known_hosts", port, knownHostsHost, remoteSSHDir)) err := session2.Run(fmt.Sprintf("ssh-keyscan -H -p %d %s 2>/dev/null >> %s/known_hosts", port, knownHostsHost, remoteSSHDir))
session2.Close() session2.Close()
if err != nil { if err != nil {
slog.Warn("deploy: ssh-keyscan failed", "host", knownHostsHost, "port", port, "error", err)
result.Errors = append(result.Errors, fmt.Sprintf("ssh-keyscan %s: %v (stderr: %s)", knownHostsHost, err, stderr.String())) result.Errors = append(result.Errors, fmt.Sprintf("ssh-keyscan %s: %v (stderr: %s)", knownHostsHost, err, stderr.String()))
result.Success = false result.Success = false
} else { } else {
@@ -163,6 +173,7 @@ func DeployKeysToMachine(ctx context.Context, serverKeyPath, serverPubKey string
err := session3.Run(fmt.Sprintf("mkdir -p ~/.ssh && chmod 700 ~/.ssh && echo '%s' >> ~/.ssh/authorized_keys && chmod 600 ~/.ssh/authorized_keys", pubKeyClean)) err := session3.Run(fmt.Sprintf("mkdir -p ~/.ssh && chmod 700 ~/.ssh && echo '%s' >> ~/.ssh/authorized_keys && chmod 600 ~/.ssh/authorized_keys", pubKeyClean))
session3.Close() session3.Close()
if err != nil { if err != nil {
slog.Warn("deploy: adding to authorized_keys failed", "host", host, "error", err)
result.Errors = append(result.Errors, fmt.Sprintf("adding to authorized_keys: %v (stderr: %s)", err, stderr.String())) result.Errors = append(result.Errors, fmt.Sprintf("adding to authorized_keys: %v (stderr: %s)", err, stderr.String()))
result.Success = false result.Success = false
} else { } else {
@@ -171,5 +182,6 @@ func DeployKeysToMachine(ctx context.Context, serverKeyPath, serverPubKey string
} }
} }
slog.Info("deploy keys result", "host", host, "success", result.Success, "messages", len(result.Messages), "errors", len(result.Errors))
return result, nil return result, nil
} }