946b6db137
Server is now the source of truth for the agent's cron set.
* Helpers in schedule_push.go:
- loadScheduleSetPayload reads the host's schedules + canonical
version into the wire shape.
- pushScheduleSetOnConn writes directly to a just-handshaken conn
(avoids racing against Hub.Register on a brand-new connection).
- pushScheduleSetAsync is the post-CRUD flavour — no-op when the
host is offline (the next reconnect's on-hello path catches it
up, so a missed push is non-fatal).
- applyScheduleAck records what version the agent has confirmed.
* onAgentHello restructured: was returning early when the host had
no repo credentials, which made the schedule push unreachable for
fresh hosts. Split into pushRepoCredsOnHello (silent no-op on
ErrNotFound) + pushScheduleSetOnConn (always runs). Empty schedule
list is a valid push: tells the agent to drop stale cron entries.
* WS dispatcher gains an OnScheduleAck hook on HandlerDeps; the
http server wires it to applyScheduleAck. MsgScheduleAck moves
out of the "TODO(P2)" group into a real case that decodes the
payload and forwards to the callback.
* Schedule CRUD handlers each fire pushScheduleSetAsync after the
audit-log write so the agent picks up changes within seconds.
Tests cover:
- On-hello push of an already-created schedule, agent acks,
applied_schedule_version flips on the host row.
- Connect-then-CRUD: empty initial push (version 0), then a
follow-on push at version 1 after the operator creates a
schedule via REST.
Agent-side `schedule.set` handler (parse, replace local cron,
emit `schedule.ack`) is the remainder of P2-02 and lands with
P2-03's local scheduler.
Co-Authored-By: Claude Opus 4.7 (1M context) <noreply@anthropic.com>
300 lines
9.5 KiB
Go
300 lines
9.5 KiB
Go
package http
|
|
|
|
import (
|
|
"encoding/json"
|
|
"errors"
|
|
stdhttp "net/http"
|
|
"strings"
|
|
|
|
"github.com/go-chi/chi/v5"
|
|
"github.com/oklog/ulid/v2"
|
|
"github.com/robfig/cron/v3"
|
|
|
|
"gitea.dcglab.co.uk/steve/restic-manager/internal/api"
|
|
"gitea.dcglab.co.uk/steve/restic-manager/internal/store"
|
|
)
|
|
|
|
// scheduleAPI is the JSON shape for /api/hosts/{id}/schedules. We
|
|
// avoid leaking host_id in the body since it's already in the URL,
|
|
// and we render booleans + retention as typed JSON rather than
|
|
// strings so the UI can edit fields directly.
|
|
type scheduleAPI struct {
|
|
ID string `json:"id,omitempty"`
|
|
Kind api.JobKind `json:"kind"`
|
|
CronExpr string `json:"cron_expr"`
|
|
Paths []string `json:"paths"`
|
|
Excludes []string `json:"excludes"`
|
|
Tags []string `json:"tags"`
|
|
RetentionPolicy store.RetentionPolicy `json:"retention_policy"`
|
|
Options store.ScheduleOptions `json:"options"`
|
|
PreHook string `json:"pre_hook,omitempty"`
|
|
PostHook string `json:"post_hook,omitempty"`
|
|
Enabled bool `json:"enabled"`
|
|
CreatedAt string `json:"created_at,omitempty"`
|
|
UpdatedAt string `json:"updated_at,omitempty"`
|
|
}
|
|
|
|
// listSchedulesResp wraps the array so the response is forward-
|
|
// compatible (we may want to add a top-level `version` later).
|
|
type listSchedulesResp struct {
|
|
Version int64 `json:"version"`
|
|
Schedules []scheduleAPI `json:"schedules"`
|
|
}
|
|
|
|
// cron parser used for input validation. Standard 5-field syntax
|
|
// with descriptors (@hourly etc.) — same parser the agent will
|
|
// run against, so a schedule that validates here will fire there.
|
|
var cronParser = cron.NewParser(
|
|
cron.Minute | cron.Hour | cron.Dom | cron.Month | cron.Dow | cron.Descriptor,
|
|
)
|
|
|
|
func (s *Server) handleListSchedules(w stdhttp.ResponseWriter, r *stdhttp.Request) {
|
|
if _, ok := s.requireUser(r); !ok {
|
|
writeJSONError(w, stdhttp.StatusUnauthorized, "unauthorized", "")
|
|
return
|
|
}
|
|
hostID := chi.URLParam(r, "id")
|
|
if hostID == "" {
|
|
writeJSONError(w, stdhttp.StatusBadRequest, "missing_host_id", "")
|
|
return
|
|
}
|
|
if _, err := s.deps.Store.GetHost(r.Context(), hostID); err != nil {
|
|
if errors.Is(err, store.ErrNotFound) {
|
|
writeJSONError(w, stdhttp.StatusNotFound, "host_not_found", "")
|
|
return
|
|
}
|
|
writeJSONError(w, stdhttp.StatusInternalServerError, "internal", "")
|
|
return
|
|
}
|
|
rows, err := s.deps.Store.ListSchedulesByHost(r.Context(), hostID)
|
|
if err != nil {
|
|
writeJSONError(w, stdhttp.StatusInternalServerError, "internal", "")
|
|
return
|
|
}
|
|
version, err := s.deps.Store.GetHostScheduleVersion(r.Context(), hostID)
|
|
if err != nil {
|
|
writeJSONError(w, stdhttp.StatusInternalServerError, "internal", "")
|
|
return
|
|
}
|
|
out := listSchedulesResp{Version: version, Schedules: make([]scheduleAPI, len(rows))}
|
|
for i, row := range rows {
|
|
out.Schedules[i] = toScheduleAPI(row)
|
|
}
|
|
writeJSON(w, stdhttp.StatusOK, out)
|
|
}
|
|
|
|
func (s *Server) handleCreateSchedule(w stdhttp.ResponseWriter, r *stdhttp.Request) {
|
|
user, ok := s.requireUser(r)
|
|
if !ok {
|
|
writeJSONError(w, stdhttp.StatusUnauthorized, "unauthorized", "")
|
|
return
|
|
}
|
|
hostID := chi.URLParam(r, "id")
|
|
if hostID == "" {
|
|
writeJSONError(w, stdhttp.StatusBadRequest, "missing_host_id", "")
|
|
return
|
|
}
|
|
if _, err := s.deps.Store.GetHost(r.Context(), hostID); err != nil {
|
|
if errors.Is(err, store.ErrNotFound) {
|
|
writeJSONError(w, stdhttp.StatusNotFound, "host_not_found", "")
|
|
return
|
|
}
|
|
writeJSONError(w, stdhttp.StatusInternalServerError, "internal", "")
|
|
return
|
|
}
|
|
|
|
var req scheduleAPI
|
|
if err := json.NewDecoder(r.Body).Decode(&req); err != nil {
|
|
writeJSONError(w, stdhttp.StatusBadRequest, "invalid_json", err.Error())
|
|
return
|
|
}
|
|
if code, msg := validateSchedule(&req); code != "" {
|
|
writeJSONError(w, stdhttp.StatusBadRequest, code, msg)
|
|
return
|
|
}
|
|
|
|
row := store.Schedule{
|
|
ID: ulid.Make().String(),
|
|
HostID: hostID,
|
|
Kind: string(req.Kind),
|
|
CronExpr: req.CronExpr,
|
|
Paths: req.Paths,
|
|
Excludes: req.Excludes,
|
|
Tags: req.Tags,
|
|
RetentionPolicy: req.RetentionPolicy,
|
|
Options: req.Options,
|
|
PreHook: req.PreHook,
|
|
PostHook: req.PostHook,
|
|
Enabled: req.Enabled,
|
|
}
|
|
if err := s.deps.Store.CreateSchedule(r.Context(), &row); err != nil {
|
|
writeJSONError(w, stdhttp.StatusInternalServerError, "internal", err.Error())
|
|
return
|
|
}
|
|
|
|
_ = s.deps.Store.AppendAudit(r.Context(), store.AuditEntry{
|
|
ID: ulid.Make().String(),
|
|
UserID: &user.ID,
|
|
Actor: "user",
|
|
Action: "schedule.created",
|
|
TargetKind: ptr("schedule"),
|
|
TargetID: &row.ID,
|
|
TS: nowUTC(),
|
|
})
|
|
s.pushScheduleSetAsync(hostID)
|
|
writeJSON(w, stdhttp.StatusCreated, toScheduleAPI(row))
|
|
}
|
|
|
|
func (s *Server) handleUpdateSchedule(w stdhttp.ResponseWriter, r *stdhttp.Request) {
|
|
user, ok := s.requireUser(r)
|
|
if !ok {
|
|
writeJSONError(w, stdhttp.StatusUnauthorized, "unauthorized", "")
|
|
return
|
|
}
|
|
hostID := chi.URLParam(r, "id")
|
|
scheduleID := chi.URLParam(r, "sid")
|
|
if hostID == "" || scheduleID == "" {
|
|
writeJSONError(w, stdhttp.StatusBadRequest, "missing_id", "")
|
|
return
|
|
}
|
|
existing, err := s.deps.Store.GetSchedule(r.Context(), hostID, scheduleID)
|
|
if err != nil {
|
|
if errors.Is(err, store.ErrNotFound) {
|
|
writeJSONError(w, stdhttp.StatusNotFound, "schedule_not_found", "")
|
|
return
|
|
}
|
|
writeJSONError(w, stdhttp.StatusInternalServerError, "internal", "")
|
|
return
|
|
}
|
|
|
|
var req scheduleAPI
|
|
if err := json.NewDecoder(r.Body).Decode(&req); err != nil {
|
|
writeJSONError(w, stdhttp.StatusBadRequest, "invalid_json", err.Error())
|
|
return
|
|
}
|
|
// Kind is immutable; ignore whatever was sent and fix up before
|
|
// validation so validateSchedule sees the existing kind.
|
|
req.Kind = api.JobKind(existing.Kind)
|
|
if code, msg := validateSchedule(&req); code != "" {
|
|
writeJSONError(w, stdhttp.StatusBadRequest, code, msg)
|
|
return
|
|
}
|
|
|
|
existing.CronExpr = req.CronExpr
|
|
existing.Paths = req.Paths
|
|
existing.Excludes = req.Excludes
|
|
existing.Tags = req.Tags
|
|
existing.RetentionPolicy = req.RetentionPolicy
|
|
existing.Options = req.Options
|
|
existing.PreHook = req.PreHook
|
|
existing.PostHook = req.PostHook
|
|
existing.Enabled = req.Enabled
|
|
|
|
if err := s.deps.Store.UpdateSchedule(r.Context(), existing); err != nil {
|
|
if errors.Is(err, store.ErrNotFound) {
|
|
writeJSONError(w, stdhttp.StatusNotFound, "schedule_not_found", "")
|
|
return
|
|
}
|
|
writeJSONError(w, stdhttp.StatusInternalServerError, "internal", err.Error())
|
|
return
|
|
}
|
|
|
|
_ = s.deps.Store.AppendAudit(r.Context(), store.AuditEntry{
|
|
ID: ulid.Make().String(),
|
|
UserID: &user.ID,
|
|
Actor: "user",
|
|
Action: "schedule.updated",
|
|
TargetKind: ptr("schedule"),
|
|
TargetID: &existing.ID,
|
|
TS: nowUTC(),
|
|
})
|
|
s.pushScheduleSetAsync(hostID)
|
|
writeJSON(w, stdhttp.StatusOK, toScheduleAPI(*existing))
|
|
}
|
|
|
|
func (s *Server) handleDeleteSchedule(w stdhttp.ResponseWriter, r *stdhttp.Request) {
|
|
user, ok := s.requireUser(r)
|
|
if !ok {
|
|
writeJSONError(w, stdhttp.StatusUnauthorized, "unauthorized", "")
|
|
return
|
|
}
|
|
hostID := chi.URLParam(r, "id")
|
|
scheduleID := chi.URLParam(r, "sid")
|
|
if hostID == "" || scheduleID == "" {
|
|
writeJSONError(w, stdhttp.StatusBadRequest, "missing_id", "")
|
|
return
|
|
}
|
|
if err := s.deps.Store.DeleteSchedule(r.Context(), hostID, scheduleID); err != nil {
|
|
if errors.Is(err, store.ErrNotFound) {
|
|
writeJSONError(w, stdhttp.StatusNotFound, "schedule_not_found", "")
|
|
return
|
|
}
|
|
writeJSONError(w, stdhttp.StatusInternalServerError, "internal", err.Error())
|
|
return
|
|
}
|
|
_ = s.deps.Store.AppendAudit(r.Context(), store.AuditEntry{
|
|
ID: ulid.Make().String(),
|
|
UserID: &user.ID,
|
|
Actor: "user",
|
|
Action: "schedule.deleted",
|
|
TargetKind: ptr("schedule"),
|
|
TargetID: &scheduleID,
|
|
TS: nowUTC(),
|
|
})
|
|
s.pushScheduleSetAsync(hostID)
|
|
w.WriteHeader(stdhttp.StatusNoContent)
|
|
}
|
|
|
|
// validateSchedule rejects malformed inputs with a stable error code.
|
|
// Returns ("", "") on success.
|
|
func validateSchedule(s *scheduleAPI) (code, msg string) {
|
|
switch s.Kind {
|
|
case api.JobBackup, api.JobForget, api.JobPrune, api.JobCheck:
|
|
// ok — valid schedule kinds (init/unlock are operator-driven only).
|
|
default:
|
|
return "invalid_kind", "kind must be one of backup|forget|prune|check"
|
|
}
|
|
if strings.TrimSpace(s.CronExpr) == "" {
|
|
return "missing_cron_expr", "cron_expr is required"
|
|
}
|
|
if _, err := cronParser.Parse(s.CronExpr); err != nil {
|
|
return "invalid_cron_expr", err.Error()
|
|
}
|
|
if s.Kind == api.JobBackup && len(s.Paths) == 0 {
|
|
return "missing_paths", "backup schedules require at least one path"
|
|
}
|
|
// Hooks are only meaningful on backup schedules (spec §14.3).
|
|
if s.Kind != api.JobBackup && (s.PreHook != "" || s.PostHook != "") {
|
|
return "hooks_not_allowed", "pre_hook / post_hook only apply to backup schedules"
|
|
}
|
|
return "", ""
|
|
}
|
|
|
|
func toScheduleAPI(s store.Schedule) scheduleAPI {
|
|
out := scheduleAPI{
|
|
ID: s.ID,
|
|
Kind: api.JobKind(s.Kind),
|
|
CronExpr: s.CronExpr,
|
|
Paths: s.Paths,
|
|
Excludes: s.Excludes,
|
|
Tags: s.Tags,
|
|
RetentionPolicy: s.RetentionPolicy,
|
|
Options: s.Options,
|
|
PreHook: s.PreHook,
|
|
PostHook: s.PostHook,
|
|
Enabled: s.Enabled,
|
|
CreatedAt: s.CreatedAt.Format("2006-01-02T15:04:05.999999999Z07:00"),
|
|
UpdatedAt: s.UpdatedAt.Format("2006-01-02T15:04:05.999999999Z07:00"),
|
|
}
|
|
if out.Paths == nil {
|
|
out.Paths = []string{}
|
|
}
|
|
if out.Excludes == nil {
|
|
out.Excludes = []string{}
|
|
}
|
|
if out.Tags == nil {
|
|
out.Tags = []string{}
|
|
}
|
|
return out
|
|
}
|