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
125 lines
2.9 KiB
Go
125 lines
2.9 KiB
Go
package main
|
|
|
|
import (
|
|
"context"
|
|
"flag"
|
|
"fmt"
|
|
"log/slog"
|
|
"net/http"
|
|
"os"
|
|
"os/signal"
|
|
"syscall"
|
|
"time"
|
|
|
|
"github.com/syncserver/internal/api"
|
|
"github.com/syncserver/internal/auth"
|
|
"github.com/syncserver/internal/config"
|
|
"github.com/syncserver/internal/db"
|
|
"github.com/syncserver/internal/scheduler"
|
|
"github.com/syncserver/internal/sshmanager"
|
|
"github.com/syncserver/internal/syncengine"
|
|
)
|
|
|
|
var version = "1.0.53"
|
|
|
|
func main() {
|
|
cfgPath := flag.String("config", "", "Path to config.yaml")
|
|
dataDir := flag.String("data-dir", "", "Data directory")
|
|
addr := flag.String("addr", "", "HTTP listen address")
|
|
showVersion := flag.Bool("version", false, "Print version")
|
|
flag.Parse()
|
|
|
|
if *showVersion {
|
|
fmt.Println(version)
|
|
return
|
|
}
|
|
|
|
cfg, err := config.Load(*cfgPath, *dataDir, *addr)
|
|
if err != nil {
|
|
fmt.Fprintf(os.Stderr, "config error: %v\n", err)
|
|
os.Exit(1)
|
|
}
|
|
cfg.Version = version
|
|
|
|
if err := cfg.EnsureDirs(); err != nil {
|
|
fmt.Fprintf(os.Stderr, "failed to create dirs: %v\n", err)
|
|
os.Exit(1)
|
|
}
|
|
|
|
slogHandler := slog.NewJSONHandler(os.Stderr, &slog.HandlerOptions{
|
|
Level: slog.LevelInfo,
|
|
})
|
|
slog.SetDefault(slog.New(slogHandler))
|
|
|
|
slog.Info("starting syncserver",
|
|
"version", version,
|
|
"data_dir", cfg.DataDir,
|
|
"addr", cfg.Addr,
|
|
)
|
|
|
|
database, err := db.Open(cfg.DBPath())
|
|
if err != nil {
|
|
slog.Error("failed to open database", "error", err)
|
|
os.Exit(1)
|
|
}
|
|
defer database.Close()
|
|
|
|
if err := database.RunMigrations(); err != nil {
|
|
slog.Error("failed to run migrations", "error", err)
|
|
os.Exit(1)
|
|
}
|
|
|
|
if err := auth.SeedAdmin(database.DB, cfg.Auth.AdminUser, cfg.Auth.AdminPass); err != nil {
|
|
slog.Warn("admin seeding skipped or failed", "error", err)
|
|
}
|
|
|
|
privKeyPath, _, pubKey, err := sshmanager.EnsureServerKey(cfg.SSHDir())
|
|
if err != nil {
|
|
slog.Error("failed to ensure server SSH key", "error", err)
|
|
os.Exit(1)
|
|
}
|
|
slog.Info("server SSH key ready", "pub_key", pubKey)
|
|
_ = privKeyPath
|
|
|
|
engine := syncengine.New(database, cfg)
|
|
sched := scheduler.New(database, engine, cfg)
|
|
|
|
srv := &http.Server{
|
|
Addr: config.NormalizeAddr(cfg.Addr),
|
|
ReadTimeout: 30 * time.Second,
|
|
WriteTimeout: 60 * time.Second,
|
|
IdleTimeout: 120 * time.Second,
|
|
}
|
|
|
|
apiServer := api.NewServer(cfg, database.DB, engine)
|
|
srv.Handler = apiServer
|
|
|
|
go sched.Start()
|
|
go engine.Start()
|
|
|
|
sigCh := make(chan os.Signal, 1)
|
|
signal.Notify(sigCh, syscall.SIGINT, syscall.SIGTERM)
|
|
|
|
go func() {
|
|
slog.Info("http server listening", "addr", srv.Addr)
|
|
if err := srv.ListenAndServe(); err != nil && err != http.ErrServerClosed {
|
|
slog.Error("http server error", "error", err)
|
|
os.Exit(1)
|
|
}
|
|
}()
|
|
|
|
<-sigCh
|
|
slog.Info("shutting down...")
|
|
|
|
ctx, cancel := context.WithTimeout(context.Background(), 10*time.Second)
|
|
defer cancel()
|
|
|
|
sched.Stop()
|
|
engine.Stop()
|
|
|
|
if err := srv.Shutdown(ctx); err != nil {
|
|
slog.Error("server shutdown error", "error", err)
|
|
}
|
|
slog.Info("bye")
|
|
}
|