65a0134101
Bug fixes from the Playwright sweep against the live smoke server:
1. Snapshot-picker layout. The .snap-row class was used in the wireframe
but never landed in web/styles/input.css; rows rendered as vertical
blocks instead of a 6-column grid. Added the token (mirrors host-row
shape with restore-specific column widths).
2. Tree expansion. hx-target='closest .tree-row + .tree-children' isn't
a valid HTMX selector — modifiers don't chain. Replaced HTMX-driven
expansion with a small window.__rmTreeToggle helper that uses plain
fetch + .tree-pair wrapper structure for trivial sibling lookup.
Caches loaded state per node.
3. --no-ownership flag dropped. Restic 0.17 introduced --no-ownership;
0.16 rejects it ('unknown flag') before doing any work. Since the
agent runs as root in the systemd unit, restored files keep their
original uid/gid either way and the parent dir is root-owned, so
the 'cp without sudo' rationale doesn't hold. Drop the flag entirely.
4. Default target dir moved to /var/lib/restic-manager/restore. The
systemd unit pins ReadWritePaths to /etc/restic-manager +
/var/lib/restic-manager (with ProtectSystem=strict making the rest
of /var read-only); writes to /var/restic-restore failed with
'read-only file system'.
5. Confirm summary HTML escaping. defaultTarget JS literal evaluates
to a string with literal angle brackets; insertion into innerHTML
must escape them. Added an inline HTML-escape pass.
tasks.md ticked for the Restore sub-phase with a sweep summary
covering the live end-to-end test.
220 lines
7.0 KiB
Go
220 lines
7.0 KiB
Go
package restic
|
|
|
|
import (
|
|
"bufio"
|
|
"context"
|
|
"encoding/json"
|
|
"errors"
|
|
"fmt"
|
|
"io"
|
|
"os/exec"
|
|
"strings"
|
|
)
|
|
|
|
// RestoreStatus mirrors the JSON `status` lines `restic restore --json`
|
|
// emits while restoring. Field names track restic's wire format; we
|
|
// project a subset (the rest are cosmetic).
|
|
type RestoreStatus struct {
|
|
MessageType string `json:"message_type"`
|
|
SecondsElapsed int64 `json:"seconds_elapsed"`
|
|
PercentDone float64 `json:"percent_done"`
|
|
TotalFiles int64 `json:"total_files"`
|
|
FilesRestored int64 `json:"files_restored"`
|
|
FilesSkipped int64 `json:"files_skipped"`
|
|
TotalBytes int64 `json:"total_bytes"`
|
|
BytesRestored int64 `json:"bytes_restored"`
|
|
BytesSkipped int64 `json:"bytes_skipped"`
|
|
}
|
|
|
|
// RestoreSummary is the final summary line emitted after a successful
|
|
// restore. Newer restic prints it; older clients leave us with no
|
|
// summary, in which case the agent skips the stats and the live UI
|
|
// just sees percent reach 100%.
|
|
type RestoreSummary struct {
|
|
MessageType string `json:"message_type"`
|
|
SecondsElapsed int64 `json:"seconds_elapsed"`
|
|
TotalFiles int64 `json:"total_files"`
|
|
FilesRestored int64 `json:"files_restored"`
|
|
FilesSkipped int64 `json:"files_skipped"`
|
|
TotalBytes int64 `json:"total_bytes"`
|
|
BytesRestored int64 `json:"bytes_restored"`
|
|
BytesSkipped int64 `json:"bytes_skipped"`
|
|
}
|
|
|
|
// RunRestore executes `restic restore <snapshotID> --target <dir>
|
|
// [--include <p>...]` with --json and pumps progress events into
|
|
// handle. paths is the operator-selected list (each becomes an
|
|
// `--include` flag); preserveOwner controls --no-ownership.
|
|
//
|
|
// inPlace toggles target semantics:
|
|
// - true → target is "/" and ownership is preserved
|
|
// - false → target is targetDir and --no-ownership is passed
|
|
//
|
|
// targetDir is created on demand by restic itself.
|
|
func (e Env) RunRestore(ctx context.Context, snapshotID string, paths []string, inPlace bool, targetDir string, handle LineHandler) (*RestoreSummary, error) {
|
|
if snapshotID == "" {
|
|
return nil, fmt.Errorf("restic restore: snapshot id required")
|
|
}
|
|
if !inPlace && targetDir == "" {
|
|
return nil, fmt.Errorf("restic restore: target dir required for non-in-place restore")
|
|
}
|
|
|
|
args := []string{"restore", "--json", snapshotID}
|
|
target := targetDir
|
|
if inPlace {
|
|
target = "/"
|
|
}
|
|
args = append(args, "--target", target)
|
|
// NOTE: restic added --no-ownership in 0.17. Older versions reject
|
|
// the flag with "unknown flag: --no-ownership" before doing any
|
|
// work. Since the agent runs as root in the systemd unit, files
|
|
// land under /var/restic-restore with their original uid/gid
|
|
// either way — the original "cp without sudo" rationale doesn't
|
|
// hold (operators copying from /var/restic-restore need sudo
|
|
// regardless because the parent dir is root-owned). Drop the flag
|
|
// entirely until we drop 0.16 support; revisit if a non-root
|
|
// agent deployment requirement comes back.
|
|
for _, p := range paths {
|
|
args = append(args, "--include", p)
|
|
}
|
|
|
|
cmd := e.resticCmd(ctx, args...)
|
|
|
|
stdout, err := cmd.StdoutPipe()
|
|
if err != nil {
|
|
return nil, fmt.Errorf("restic restore: stdout pipe: %w", err)
|
|
}
|
|
stderr, err := cmd.StderrPipe()
|
|
if err != nil {
|
|
return nil, fmt.Errorf("restic restore: stderr pipe: %w", err)
|
|
}
|
|
|
|
if err := cmd.Start(); err != nil {
|
|
return nil, fmt.Errorf("restic restore: start: %w", err)
|
|
}
|
|
|
|
var summary *RestoreSummary
|
|
done := make(chan error, 2)
|
|
go func() { done <- pumpRestoreStdout(stdout, handle, &summary) }()
|
|
go func() { done <- pumpStderr(stderr, handle) }()
|
|
for i := 0; i < 2; i++ {
|
|
if err := <-done; err != nil && handle != nil {
|
|
handle("event", fmt.Sprintf("pump error: %v", err), nil)
|
|
}
|
|
}
|
|
werr := cmd.Wait()
|
|
if werr != nil {
|
|
var ee *exec.ExitError
|
|
if errors.As(werr, &ee) {
|
|
return summary, fmt.Errorf("restic restore: exit %d", ee.ExitCode())
|
|
}
|
|
return summary, fmt.Errorf("restic restore: %w", werr)
|
|
}
|
|
return summary, nil
|
|
}
|
|
|
|
// pumpRestoreStdout is the restore variant of pumpStdout: it emits
|
|
// `event` lines for the parsed status/summary objects (so the runner
|
|
// can shape them into job.progress) and forwards everything else as
|
|
// stdout — but unlike backup we include the raw status JSON in
|
|
// log.stream too because restore is short and the live log audience
|
|
// genuinely benefits from the per-file traffic. Actually — we mirror
|
|
// backup's behavior and DROP raw status lines from log.stream
|
|
// (they'd drown the log on a fast restore); the progress envelope
|
|
// covers them.
|
|
func pumpRestoreStdout(r io.Reader, handle LineHandler, summary **RestoreSummary) error {
|
|
scanner := bufio.NewScanner(r)
|
|
scanner.Buffer(make([]byte, 0, 64*1024), 4*1024*1024)
|
|
for scanner.Scan() {
|
|
line := scanner.Text()
|
|
if handle == nil {
|
|
continue
|
|
}
|
|
if !strings.HasPrefix(line, "{") {
|
|
handle("stdout", line, nil)
|
|
continue
|
|
}
|
|
var probe struct {
|
|
MessageType string `json:"message_type"`
|
|
}
|
|
if err := json.Unmarshal([]byte(line), &probe); err != nil {
|
|
handle("stdout", line, nil)
|
|
continue
|
|
}
|
|
switch probe.MessageType {
|
|
case "status":
|
|
var ev RestoreStatus
|
|
if json.Unmarshal([]byte(line), &ev) == nil {
|
|
// Don't tee status lines to log.stream — too chatty.
|
|
handle("event", line, ev)
|
|
continue
|
|
}
|
|
case "summary":
|
|
var ev RestoreSummary
|
|
if json.Unmarshal([]byte(line), &ev) == nil {
|
|
if summary != nil {
|
|
s := ev
|
|
*summary = &s
|
|
}
|
|
handle("event", line, ev)
|
|
continue
|
|
}
|
|
case "verbose_status":
|
|
handle("event", line, nil)
|
|
continue
|
|
}
|
|
handle("stdout", line, nil)
|
|
}
|
|
return scanner.Err()
|
|
}
|
|
|
|
// RunDiff executes `restic diff --json <a> <b>` and forwards every
|
|
// line to handle as stdout. Restic emits per-line "change" objects
|
|
// plus a final "statistics" object; we don't parse them server-side —
|
|
// the operator reads the raw output on the live job log page.
|
|
func (e Env) RunDiff(ctx context.Context, snapshotA, snapshotB string, handle LineHandler) error {
|
|
if snapshotA == "" || snapshotB == "" {
|
|
return fmt.Errorf("restic diff: two snapshot ids required")
|
|
}
|
|
cmd := e.resticCmd(ctx, "diff", "--json", snapshotA, snapshotB)
|
|
stdout, err := cmd.StdoutPipe()
|
|
if err != nil {
|
|
return fmt.Errorf("restic diff: stdout pipe: %w", err)
|
|
}
|
|
stderr, err := cmd.StderrPipe()
|
|
if err != nil {
|
|
return fmt.Errorf("restic diff: stderr pipe: %w", err)
|
|
}
|
|
if err := cmd.Start(); err != nil {
|
|
return fmt.Errorf("restic diff: start: %w", err)
|
|
}
|
|
done := make(chan error, 2)
|
|
// diff output isn't huge; pumpStderr-ish line-by-line forwarding
|
|
// is fine.
|
|
go func() {
|
|
s := bufio.NewScanner(stdout)
|
|
s.Buffer(make([]byte, 0, 64*1024), 1024*1024)
|
|
for s.Scan() {
|
|
if handle != nil {
|
|
handle("stdout", s.Text(), nil)
|
|
}
|
|
}
|
|
done <- s.Err()
|
|
}()
|
|
go func() { done <- pumpStderr(stderr, handle) }()
|
|
for i := 0; i < 2; i++ {
|
|
if err := <-done; err != nil && handle != nil {
|
|
handle("event", fmt.Sprintf("pump error: %v", err), nil)
|
|
}
|
|
}
|
|
werr := cmd.Wait()
|
|
if werr != nil {
|
|
var ee *exec.ExitError
|
|
if errors.As(werr, &ee) {
|
|
return fmt.Errorf("restic diff: exit %d", ee.ExitCode())
|
|
}
|
|
return fmt.Errorf("restic diff: %w", werr)
|
|
}
|
|
return nil
|
|
}
|