84b185be39
Phase A - Stability: - Engine.Start(): recovers orphaned jobs (running/queued/waking_up) after crash - Engine.Stop(): graceful shutdown - cancels all in-flight jobs and waits - Queue keyed by jobID (not syncPairID): cancel now targets exact job - Local rsync uses jobCtx (context.Background() replaced) - Migrations wrapped in transactions; checksums stored Phase B - Security: - admin/admin default removed: SYNCSERVER_ADMIN_PASSWORD required on first run - Path validation: rejects .., leading -, null bytes in sync pair paths - Rsync flags allowlist: dangerous flags blocked (--rsync-path, -e, --files-from) - Shell concat in RunRemote replaced with proper sh -c escaping - knownhosts: replaced custom parser with golang.org/x/crypto/ssh/knownhosts - RequireAdmin wired: machine CRUD, SSH key ops, settings require admin role - deploy-keys: uses authorized_keys only (no private key upload) - Hardcoded /var/lib/syncserver/ssh paths replaced with cfg.SSHDir() Phase C - Operational: - /readyz health check: DB query + SSH dir accessibility - /metrics endpoint: Prometheus text format (jobs, queue, machines) - Event struct JSON tags: job_id, machine_id, type (snake_case) - EventBus broadcast: fanned out to all subscribers - SQLite VACUUM INTO backup: scheduled before cleanup if BackupDir set - Filesystem job log cleanup: removes .log files for purged jobs - Backup retention: old backups auto-purged Phase D - Frontend: - Schedules page: REST API + full CRUD UI for cron schedules - Dashboard: cancel button for running/queued jobs - JobDetail: server-side log download via API - Settings: displays data_dir from server - 404 page: proper NotFound component Phase E - Tests: - auth_test.go: JWT, bcrypt, middleware, seed (18 tests) - models_test.go: Job, Machine, SyncPair, Schedule repos (18 tests) - go test -race: no data races found
168 lines
4.9 KiB
Go
168 lines
4.9 KiB
Go
package sshmanager
|
|
|
|
import (
|
|
"bytes"
|
|
"context"
|
|
"fmt"
|
|
"log/slog"
|
|
"os"
|
|
"path/filepath"
|
|
"time"
|
|
|
|
"golang.org/x/crypto/ssh"
|
|
)
|
|
|
|
type DeployKey struct {
|
|
LocalPath string
|
|
RemotePath string
|
|
Mode uint32
|
|
}
|
|
|
|
type DeployResult struct {
|
|
Success bool `json:"success"`
|
|
Messages []string `json:"messages"`
|
|
Errors []string `json:"errors"`
|
|
}
|
|
|
|
func DeployKeysToMachine(ctx context.Context, serverKeyPath string, host string, port int, user string, keys []DeployKey, knownHostsHosts []string, sshDir string) (*DeployResult, error) {
|
|
result := &DeployResult{Success: true, Messages: []string{}, Errors: []string{}}
|
|
|
|
addr := fmt.Sprintf("%s:%d", host, port)
|
|
|
|
keyData, err := os.ReadFile(serverKeyPath)
|
|
if err != nil {
|
|
return nil, fmt.Errorf("reading server key: %w", err)
|
|
}
|
|
signer, err := ssh.ParsePrivateKey(keyData)
|
|
if err != nil {
|
|
return nil, fmt.Errorf("parsing server key: %w", err)
|
|
}
|
|
|
|
knownHostsPath := filepath.Join(sshDir, "known_hosts")
|
|
hostKeyCallback, err := NewKnownHostsCallback(knownHostsPath, true)
|
|
if err != nil {
|
|
slog.Warn("deploy keys: creating host key callback failed, ignoring hosts", "error", err)
|
|
hostKeyCallback = ssh.InsecureIgnoreHostKey()
|
|
}
|
|
|
|
cfg := &ssh.ClientConfig{
|
|
User: user,
|
|
Auth: []ssh.AuthMethod{ssh.PublicKeys(signer)},
|
|
HostKeyCallback: hostKeyCallback,
|
|
Timeout: 10 * time.Second,
|
|
}
|
|
|
|
ctx, cancel := context.WithTimeout(ctx, 60*time.Second)
|
|
defer cancel()
|
|
|
|
conn, err := ssh.Dial("tcp", addr, cfg)
|
|
if err != nil {
|
|
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()
|
|
|
|
remoteSSHDir := sshDir
|
|
remoteKeysDir := filepath.Join(remoteSSHDir, "keys")
|
|
|
|
session, err := conn.NewSession()
|
|
if err != nil {
|
|
return nil, fmt.Errorf("creating session: %w", err)
|
|
}
|
|
defer session.Close()
|
|
|
|
var stdout, stderr bytes.Buffer
|
|
session.Stdout = &stdout
|
|
session.Stderr = &stderr
|
|
|
|
if err := session.Run(fmt.Sprintf("mkdir -p %s && chmod 700 %s", remoteKeysDir, remoteKeysDir)); err != nil {
|
|
return nil, fmt.Errorf("creating remote ssh dir: %s %w", stderr.String(), err)
|
|
}
|
|
result.Messages = append(result.Messages, fmt.Sprintf("Created %s on %s", remoteKeysDir, host))
|
|
|
|
for _, k := range keys {
|
|
keyContent, err := os.ReadFile(k.LocalPath)
|
|
if err != nil {
|
|
result.Errors = append(result.Errors, fmt.Sprintf("reading local key %s: %v", k.LocalPath, err))
|
|
result.Success = false
|
|
continue
|
|
}
|
|
|
|
mode := k.Mode
|
|
if mode == 0 {
|
|
mode = 0600
|
|
}
|
|
|
|
sess2, err := conn.NewSession()
|
|
if err != nil {
|
|
result.Errors = append(result.Errors, fmt.Sprintf("session for key upload: %v", err))
|
|
result.Success = false
|
|
continue
|
|
}
|
|
defer sess2.Close()
|
|
|
|
sess2.Stdout = &stdout
|
|
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)
|
|
|
|
stdin, err := sess2.StdinPipe()
|
|
if err != nil {
|
|
result.Errors = append(result.Errors, fmt.Sprintf("stdin pipe for %s: %v", k.RemotePath, err))
|
|
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
|
|
}
|
|
|
|
_, err = stdin.Write(keyContent)
|
|
if err != nil {
|
|
result.Errors = append(result.Errors, fmt.Sprintf("writing key %s: %v", k.RemotePath, err))
|
|
result.Success = false
|
|
stdin.Close()
|
|
sess2.Close()
|
|
continue
|
|
}
|
|
stdin.Close()
|
|
|
|
if err := sess2.Wait(); err != nil {
|
|
result.Errors = append(result.Errors, fmt.Sprintf("uploading %s: %v (stderr: %s)", k.RemotePath, err, stderr.String()))
|
|
result.Success = false
|
|
continue
|
|
}
|
|
|
|
result.Messages = append(result.Messages, fmt.Sprintf("Uploaded %s to %s:%s", filepath.Base(k.LocalPath), host, k.RemotePath))
|
|
}
|
|
|
|
if len(knownHostsHosts) > 0 {
|
|
for _, khHost := range knownHostsHosts {
|
|
session2, err := conn.NewSession()
|
|
if err != nil {
|
|
result.Errors = append(result.Errors, fmt.Sprintf("session for ssh-keyscan %s: %v", khHost, err))
|
|
continue
|
|
}
|
|
session2.Stdout = &stdout
|
|
session2.Stderr = &stderr
|
|
err = session2.Run(fmt.Sprintf("ssh-keyscan -H -p %s 2>/dev/null >> %s/known_hosts", khHost, remoteSSHDir))
|
|
session2.Close()
|
|
if err != nil {
|
|
slog.Warn("deploy: ssh-keyscan failed", "host", khHost, "error", err)
|
|
result.Errors = append(result.Errors, fmt.Sprintf("ssh-keyscan %s: %v (stderr: %s)", khHost, err, stderr.String()))
|
|
} else {
|
|
result.Messages = append(result.Messages, fmt.Sprintf("Populated known_hosts with %s", khHost))
|
|
}
|
|
}
|
|
}
|
|
|
|
slog.Info("deploy keys result", "host", host, "success", result.Success, "messages", len(result.Messages), "errors", len(result.Errors))
|
|
return result, nil
|
|
}
|