feat: SSH代理用自己的密钥连容器，不再依赖密码

- proxy.go: 代理连容器时优先用自己的 host key 认证，密码作为备选
- proxy.go: 启动时自动导出公钥到 .pub 文件
- worker.go: 注入 authorized_keys 时始终包含代理的公钥
- ssh_keys.go: 实时同步时也包含代理公钥

代理 host key 持久化在 /var/lib/cloud-cli-proxy/ssh_host_ed25519_key，
其公钥自动注入到所有容器的 authorized_keys 中，
确保代理始终能连接到容器，不受密码状态影响。

Made-with: Cursor

Author: ZaneL1u

internal/controlplane/http/ssh_keys.go

@@ -12,6 +12,7 @@ import (
 	"fmt"
 	"log/slog"
 	nethttp "net/http"
+	"os"
 	"os/exec"
 	"strings"
 	"time"
@@ -281,6 +282,9 @@ func (h *SSHKeyHandler) syncKeysToRunningHosts(userID string) {
 func syncInboundKeysToContainer(ctx context.Context, containerName, user string, keys []repository.SSHKey) {
 	sshDir := "/workspace/.ssh"
 	var lines []string
+	if proxyPub := loadProxyPublicKey(); proxyPub != "" {
+		lines = append(lines, proxyPub)
+	}
 	for _, k := range keys {
 		if k.Purpose == "inbound" && k.PublicKey != "" {
 			lines = append(lines, strings.TrimSpace(k.PublicKey))
@@ -419,6 +423,19 @@ func readContainerAuthorizedKeyFingerprints(ctx context.Context, containerName s
 	return result
 }
 
+func loadProxyPublicKey() string {
+	dataDir := os.Getenv("DATA_DIR")
+	if dataDir == "" {
+		dataDir = "/var/lib/cloud-cli-proxy"
+	}
+	pubKeyPath := dataDir + "/ssh_host_ed25519_key.pub"
+	data, err := os.ReadFile(pubKeyPath)
+	if err != nil {
+		return ""
+	}
+	return strings.TrimSpace(string(data))
+}
+
 func computeFingerprint(pubKeyStr string) string {
 	pubKey, _, _, _, err := ssh.ParseAuthorizedKey([]byte(pubKeyStr))
 	if err != nil {

internal/runtime/tasks/worker.go

@@ -423,27 +423,28 @@ func (w *Worker) injectSSHKeys(ctx context.Context, request agentapi.HostActionR
 	sshDir := "/workspace/.ssh"
 
 	var authorizedKeys []string
+	if proxyPubKey := loadProxyPublicKey(); proxyPubKey != "" {
+		authorizedKeys = append(authorizedKeys, proxyPubKey)
+	}
 	for _, key := range request.SSHKeys {
 		if key.Purpose == "inbound" && key.PublicKey != "" {
 			authorizedKeys = append(authorizedKeys, strings.TrimSpace(key.PublicKey))
 		}
 	}
-	if len(authorizedKeys) > 0 {
-		content := strings.Join(authorizedKeys, "\n") + "\n"
-		script := fmt.Sprintf(
-			"mkdir -p %s && cat > %s/authorized_keys && chmod 600 %s/authorized_keys && chown %s:%s %s/authorized_keys",
-			sshDir, sshDir, sshDir, user, user, sshDir,
-		)
-		cmd := exec.CommandContext(ctx, "docker", "exec", "-i", containerName, "bash", "-c", script)
-		cmd.Stdin = strings.NewReader(content)
-		if out, err := cmd.CombinedOutput(); err != nil {
-			w.repo.RecordEvent(ctx, repository.RecordEventParams{
-				HostID:  &request.HostID,
-				Level:   "warn",
-				Type:    "runtime.ssh_authorized_keys_failed",
-				Message: fmt.Sprintf("inject authorized_keys failed: %s", strings.TrimSpace(string(out))),
-			})
-		}
+	content := strings.Join(authorizedKeys, "\n") + "\n"
+	script := fmt.Sprintf(
+		"mkdir -p %s && cat > %s/authorized_keys && chmod 600 %s/authorized_keys && chown %s:%s %s/authorized_keys",
+		sshDir, sshDir, sshDir, user, user, sshDir,
+	)
+	cmd := exec.CommandContext(ctx, "docker", "exec", "-i", containerName, "bash", "-c", script)
+	cmd.Stdin = strings.NewReader(content)
+	if out, err := cmd.CombinedOutput(); err != nil {
+		w.repo.RecordEvent(ctx, repository.RecordEventParams{
+			HostID:  &request.HostID,
+			Level:   "warn",
+			Type:    "runtime.ssh_authorized_keys_failed",
+			Message: fmt.Sprintf("inject authorized_keys failed: %s", strings.TrimSpace(string(out))),
+		})
 	}
 
 	outboundIdx := 0
@@ -597,6 +598,19 @@ func (rv *repoValidator) GetHostWgKeys(ctx context.Context, hostID string) (stri
 	return rv.repo.GetHostWgKeys(ctx, hostID)
 }
 
+func loadProxyPublicKey() string {
+	dataDir := os.Getenv("DATA_DIR")
+	if dataDir == "" {
+		dataDir = "/var/lib/cloud-cli-proxy"
+	}
+	pubKeyPath := dataDir + "/ssh_host_ed25519_key.pub"
+	data, err := os.ReadFile(pubKeyPath)
+	if err != nil {
+		return ""
+	}
+	return strings.TrimSpace(string(data))
+}
+
 func (w *Worker) pullImage(ctx context.Context, imageName string) {
 	cmd := exec.CommandContext(ctx, "docker", "pull", imageName)
 	output, err := cmd.CombinedOutput()

internal/sshproxy/proxy.go

@@ -12,6 +12,7 @@ import (
 	"net"
 	"os"
 	"path/filepath"
+	"strings"
 	"sync"
 	"time"
 
@@ -66,6 +67,7 @@ func loadOrGenerateHostKey(path string, logger *slog.Logger) (ssh.Signer, error)
 				return nil, fmt.Errorf("parse host key %s: %w", path, err)
 			}
 			logger.Info("SSH proxy loaded persistent host key", "path", path)
+			exportPublicKey(signer, path, logger)
 			return signer, nil
 		}
 		if !os.IsNotExist(err) {
@@ -98,11 +100,22 @@ func loadOrGenerateHostKey(path string, logger *slog.Logger) (ssh.Signer, error)
 		} else {
 			logger.Info("SSH proxy generated and persisted new host key", "path", path)
 		}
+		exportPublicKey(signer, path, logger)
 	}
 
 	return signer, nil
 }
 
+func exportPublicKey(signer ssh.Signer, privKeyPath string, logger *slog.Logger) {
+	pubKeyPath := privKeyPath + ".pub"
+	pubKeyStr := strings.TrimSpace(string(ssh.MarshalAuthorizedKey(signer.PublicKey()))) + " cloud-cli-proxy-proxy\n"
+	if err := os.WriteFile(pubKeyPath, []byte(pubKeyStr), 0o644); err != nil {
+		logger.Warn("cannot export proxy public key", "path", pubKeyPath, "error", err)
+	} else {
+		logger.Info("SSH proxy public key exported", "path", pubKeyPath)
+	}
+}
+
 func (s *Server) ListenAndServe(ctx context.Context) error {
 	config := &ssh.ServerConfig{
 		MaxAuthTries:  3,
@@ -208,14 +221,19 @@ func (s *Server) handleChannel(newChan ssh.NewChannel, targetAddr, targetUser, t
 	if user == "" {
 		user = s.containerUser
 	}
+
+	authMethods := []ssh.AuthMethod{
+		ssh.PublicKeys(s.hostKey),
+	}
 	pass := targetPassword
 	if pass == "" {
 		pass = s.containerPassword
 	}
+	authMethods = append(authMethods, ssh.Password(pass))
 
 	targetConfig := &ssh.ClientConfig{
 		User:            user,
-		Auth:            []ssh.AuthMethod{ssh.Password(pass)},
+		Auth:            authMethods,
 		HostKeyCallback: ssh.InsecureIgnoreHostKey(),
 		Timeout:         10 * time.Second,
 	}