steve
a781e95c94
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.
102 lines
3.2 KiB
Go
102 lines
3.2 KiB
Go
package http
|
|
|
|
import (
|
|
stdhttp "net/http"
|
|
|
|
"gitea.dcglab.co.uk/steve/restic-manager/internal/store"
|
|
)
|
|
|
|
// hostView is the JSON projection of a Host row. Same shape as the
|
|
// store row, but with explicit time-strings so wire format is stable
|
|
// across DB driver changes.
|
|
type hostView struct {
|
|
ID string `json:"id"`
|
|
Name string `json:"name"`
|
|
OS string `json:"os"`
|
|
Arch string `json:"arch"`
|
|
AgentVersion string `json:"agent_version,omitempty"`
|
|
ResticVersion string `json:"restic_version,omitempty"`
|
|
ProtocolVersion int `json:"protocol_version"`
|
|
EnrolledAt string `json:"enrolled_at"`
|
|
LastSeenAt *string `json:"last_seen_at,omitempty"`
|
|
Status string `json:"status"`
|
|
Tags []string `json:"tags"`
|
|
CurrentJobID *string `json:"current_job_id,omitempty"`
|
|
LastBackupAt *string `json:"last_backup_at,omitempty"`
|
|
LastBackupStatus *string `json:"last_backup_status,omitempty"`
|
|
RepoSizeBytes int64 `json:"repo_size_bytes"`
|
|
SnapshotCount int `json:"snapshot_count"`
|
|
OpenAlertCount int `json:"open_alert_count"`
|
|
}
|
|
|
|
// handleListHosts returns the full fleet as JSON. Authenticated; the
|
|
// shape mirrors what the dashboard renders, so external API consumers
|
|
// see the same projection.
|
|
func (s *Server) handleListHosts(w stdhttp.ResponseWriter, r *stdhttp.Request) {
|
|
if !s.authedUser(r) {
|
|
writeJSONError(w, stdhttp.StatusUnauthorized, "unauthorised", "")
|
|
return
|
|
}
|
|
hosts, err := s.deps.Store.ListHosts(r.Context())
|
|
if err != nil {
|
|
writeJSONError(w, stdhttp.StatusInternalServerError, "internal", "")
|
|
return
|
|
}
|
|
out := make([]hostView, 0, len(hosts))
|
|
for _, h := range hosts {
|
|
out = append(out, hostToView(h))
|
|
}
|
|
writeJSON(w, stdhttp.StatusOK, map[string]any{
|
|
"count": len(out),
|
|
"hosts": out,
|
|
})
|
|
}
|
|
|
|
// handleFleetSummary returns the dashboard tile aggregate.
|
|
func (s *Server) handleFleetSummary(w stdhttp.ResponseWriter, r *stdhttp.Request) {
|
|
if !s.authedUser(r) {
|
|
writeJSONError(w, stdhttp.StatusUnauthorized, "unauthorised", "")
|
|
return
|
|
}
|
|
fs, err := s.deps.Store.FleetSummary(r.Context())
|
|
if err != nil {
|
|
writeJSONError(w, stdhttp.StatusInternalServerError, "internal", "")
|
|
return
|
|
}
|
|
writeJSON(w, stdhttp.StatusOK, fs)
|
|
}
|
|
|
|
// hostToView converts a store.Host to its JSON shape. Times become
|
|
// RFC 3339 strings; nullable times are passed through as nil.
|
|
func hostToView(h store.Host) hostView {
|
|
v := hostView{
|
|
ID: h.ID,
|
|
Name: h.Name,
|
|
OS: h.OS,
|
|
Arch: h.Arch,
|
|
AgentVersion: h.AgentVersion,
|
|
ResticVersion: h.ResticVersion,
|
|
ProtocolVersion: h.ProtocolVersion,
|
|
EnrolledAt: h.EnrolledAt.Format("2006-01-02T15:04:05.000000000Z"),
|
|
Status: h.Status,
|
|
Tags: h.Tags,
|
|
CurrentJobID: h.CurrentJobID,
|
|
LastBackupStatus: h.LastBackupStatus,
|
|
RepoSizeBytes: h.RepoSizeBytes,
|
|
SnapshotCount: h.SnapshotCount,
|
|
OpenAlertCount: h.OpenAlertCount,
|
|
}
|
|
if v.Tags == nil {
|
|
v.Tags = []string{}
|
|
}
|
|
if h.LastSeenAt != nil {
|
|
s := h.LastSeenAt.Format("2006-01-02T15:04:05.000000000Z")
|
|
v.LastSeenAt = &s
|
|
}
|
|
if h.LastBackupAt != nil {
|
|
s := h.LastBackupAt.Format("2006-01-02T15:04:05.000000000Z")
|
|
v.LastBackupAt = &s
|
|
}
|
|
return v
|
|
}
|