steve
f0dfa689fe
Three small follow-ups from review:
1. Restore target is now operator-editable. Default value is the
literal '\$HOME/rm-restore/<job-id>/' (agent expands \$HOME at
run time using os.UserHomeDir(); also handles \${HOME} and ~/
prefixes). Operator can replace with any absolute path.
- ui_restore.go validates the input is either absolute or starts
with one of the recognised prefixes; other env-var refs (\$PATH
etc.) are deliberately rejected so operator paths can't pick up
arbitrary agent env values.
- host_restore.html replaces the read-only mono-text display with
a real <input>; help text spells out that \$HOME resolves
agent-side and <job-id> is substituted on dispatch.
- install.sh + the systemd unit prep /root/rm-restore so the
default works under the sandbox: ReadWritePaths gains a soft
'-/root/rm-restore' entry (the '-' makes the bind-mount soft-fail
if missing, but install.sh pre-creates it root-owned 0700).
2. --no-ownership flag now gated on restic version. The flag was
added in restic 0.17 and 0.16 rejects it. Previously dropped it
wholesale — that meant new-dir restores silently preserved
ownership against design intent on 0.17+. Now the agent threads
its detected restic version (sysinfo already collects it) through
runner.Config -> restic.Env, and RunRestore appends --no-ownership
only when AtLeastVersion(0, 17) returns true. 0.16 hosts still
restore with original uid/gid; help text in the wizard explicitly
notes this. The previous 'Original ownership is preserved' copy
was wrong for new-dir mode and is corrected.
3. golangci-lint misspell locale switched US -> UK and the codebase
swept (73 corrections, mostly behaviour/serialise/recognise/honour).
Wire-format ErrorCode 'unauthorized' -> 'unauthorised' is a tiny
contract change but the agent doesn't parse those codes today and
no external API consumers exist yet. Tests passed before + after.
Tests:
- internal/restic/version_test.go covers Env.AtLeastVersion across
edge cases (empty, exact match, patch above, minor below, non-
numeric) and expandHome on \$HOME / \${HOME} / ~/, plus
pass-through for absolute paths and refusal of other env vars.
- ui_restore_test updated: TargetDir now starts '\$HOME/rm-restore/'
with the job_id substituted into the placeholder.
Live verified on the smoke env: default target restored to
/root/rm-restore/<job-id>/ as the agent's expanded \$HOME (2 files,
14 bytes); custom override '/tmp/custom-restore/<job-id>/' restored
into the agent's PrivateTmp namespace (1 file, 6 bytes); both jobs
'succeeded', exit 0.
83 lines
2.3 KiB
Go
83 lines
2.3 KiB
Go
package http
|
|
|
|
import (
|
|
stdhttp "net/http"
|
|
"time"
|
|
|
|
"github.com/go-chi/chi/v5"
|
|
)
|
|
|
|
// snapshotView is the public JSON shape for a snapshot. Matches the
|
|
// wire-protocol Snapshot type plus a `refreshed_at` field so the UI
|
|
// can show "list last refreshed Xm ago" — useful when the projection
|
|
// is stale because the host has been offline for a while.
|
|
type snapshotView struct {
|
|
ID string `json:"id"`
|
|
ShortID string `json:"short_id"`
|
|
Time time.Time `json:"time"`
|
|
Hostname string `json:"hostname"`
|
|
Paths []string `json:"paths"`
|
|
Tags []string `json:"tags,omitempty"`
|
|
SizeBytes int64 `json:"size_bytes,omitempty"`
|
|
FileCount int64 `json:"file_count,omitempty"`
|
|
}
|
|
|
|
type listSnapshotsResponse struct {
|
|
HostID string `json:"host_id"`
|
|
Count int `json:"count"`
|
|
RefreshedAt *time.Time `json:"refreshed_at,omitempty"`
|
|
Snapshots []snapshotView `json:"snapshots"`
|
|
}
|
|
|
|
// handleListHostSnapshots returns the cached snapshot projection for
|
|
// one host. The agent refreshes this by sending `snapshots.report`
|
|
// after each successful backup; this endpoint is a read-only view
|
|
// onto whatever the server most recently received.
|
|
func (s *Server) handleListHostSnapshots(w stdhttp.ResponseWriter, r *stdhttp.Request) {
|
|
if _, ok := s.requireUser(r); !ok {
|
|
writeJSONError(w, stdhttp.StatusUnauthorized, "unauthorised", "")
|
|
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 {
|
|
writeJSONError(w, stdhttp.StatusNotFound, "host_not_found", "")
|
|
return
|
|
}
|
|
|
|
snaps, err := s.deps.Store.ListSnapshotsByHost(r.Context(), hostID)
|
|
if err != nil {
|
|
writeJSONError(w, stdhttp.StatusInternalServerError, "internal", "")
|
|
return
|
|
}
|
|
|
|
out := listSnapshotsResponse{
|
|
HostID: hostID,
|
|
Count: len(snaps),
|
|
Snapshots: make([]snapshotView, len(snaps)),
|
|
}
|
|
if len(snaps) > 0 {
|
|
t := snaps[0].RefreshedAt
|
|
out.RefreshedAt = &t
|
|
}
|
|
for i, sn := range snaps {
|
|
out.Snapshots[i] = snapshotView{
|
|
ID: sn.ID,
|
|
ShortID: sn.ShortID,
|
|
Time: sn.Time,
|
|
Hostname: sn.Hostname,
|
|
Paths: sn.Paths,
|
|
Tags: sn.Tags,
|
|
SizeBytes: sn.SizeBytes,
|
|
FileCount: sn.FileCount,
|
|
}
|
|
}
|
|
|
|
writeJSON(w, stdhttp.StatusOK, out)
|
|
}
|