admin
2958946517
${IMPORT_PATH} = <system namespace root>/userdata/import — ONE drop-zone per box,
on the system drive, injected at BOTH compose-env builders with NO per-drive
fallback (unresolvable leaves it unset so compose fails loudly rather than
quietly building a second, dead drop-zone).
Third BindRoot (RootImport) + Import list in BackupSpec, extended through
ValidateBackupSpec/ClassifyBinds. Load-bearing: a stale `userdata: import/<app>`
entry against the moved bind would be a WHOLE-BLOCK reject, taking the app's
mandatory hdd classification with it.
Exhaustive-root audit: resolveAbs/structuralGuard/ComputeCaptureSet/
ComputeFabBuckets now take importRoot explicitly (an import bind resolved
against hddPath would name a directory on the wrong drive); unresolvable is
refused loudly into Skipped. GetImportRoot added to both provider interfaces.
Catalog-derived skeleton: UserdataSkeleton() -> UserdataSkeletonCarry() +
BuildUserdataSkeleton(), SORTED. The carry-list makes zero-removals true by
construction (`documents` is in no catalog app but on both boxes) and is the
fresh-box floor. The sort is not tidiness: the naive map-order derivation
measured 20 distinct outputs from 20 identical runs, which with fbNeedsRecreate
is a fleet-wide FileBrowser restart loop.
One authoritative compose parser: ParseComposeUserdataMounts now delegates to
ParseComposeClassifiableBinds. Import root excluded from per-app migration.
Surfaces: FileBrowser /srv/beolvasas source; app-page "Hova tegyem a fajlokat?"
with PathEscape deep links (never QueryEscape) and class-driven copy;
data_paths: annotation with the Fork-3 asymmetry; system-owned beolvasas SMB
share refused server-side at handler AND store, button omitted in template.
Caught on the way: the sharing template's row struct was function-local, so
adding {{if .System}} would have 500'd every share row. ShareRow is now
package-level and the render test uses the handler's own type.
Tests 915 -> 949, all green. MinAgent unchanged.
97 lines
4.1 KiB
Go
97 lines
4.1 KiB
Go
package appbackup
|
|
|
|
import (
|
|
"reflect"
|
|
"testing"
|
|
)
|
|
|
|
func bucketAbs(b []CapturePath) []string {
|
|
out := make([]string, 0, len(b))
|
|
for _, p := range b {
|
|
out = append(out, p.Abs)
|
|
}
|
|
return out
|
|
}
|
|
|
|
// classified app → three buckets, resolved + Abs-sorted.
|
|
func TestComputeFabBuckets_Classified(t *testing.T) {
|
|
binds := []ClassifiedBind{
|
|
{ComposeBind: ComposeBind{Root: RootUserdata, RelPath: "media/books"}, Class: ClassMandatory},
|
|
{ComposeBind: ComposeBind{Root: RootUserdata, RelPath: "media/comics"}, Class: ClassOptional},
|
|
{ComposeBind: ComposeBind{Root: RootUserdata, RelPath: "media/movies"}, Class: ClassExcluded},
|
|
{ComposeBind: ComposeBind{Root: RootHDD, RelPath: "appdata/app"}, Class: ClassMandatory},
|
|
}
|
|
fb := ComputeFabBuckets(binds, true, drv, "")
|
|
if !fb.HasClassification {
|
|
t.Fatal("HasClassification must be true")
|
|
}
|
|
if got, want := bucketAbs(fb.Mandatory), []string{hdd("appdata/app"), udat("media/books")}; !reflect.DeepEqual(got, want) {
|
|
t.Errorf("Mandatory = %v, want %v", got, want)
|
|
}
|
|
if got, want := bucketAbs(fb.Optional), []string{udat("media/comics")}; !reflect.DeepEqual(got, want) {
|
|
t.Errorf("Optional = %v, want %v", got, want)
|
|
}
|
|
if got, want := bucketAbs(fb.Excluded), []string{udat("media/movies")}; !reflect.DeepEqual(got, want) {
|
|
t.Errorf("Excluded = %v, want %v", got, want)
|
|
}
|
|
}
|
|
|
|
// legacy (no block) → empty buckets (the full-root capture stays out of the classified plan).
|
|
func TestComputeFabBuckets_LegacyEmpty(t *testing.T) {
|
|
binds := []ClassifiedBind{{ComposeBind: ComposeBind{Root: RootUserdata, RelPath: "media/tv"}, Origin: OriginLegacy}}
|
|
fb := ComputeFabBuckets(binds, false, drv, "")
|
|
if fb.HasClassification || fb.Mandatory != nil || fb.Optional != nil || fb.Excluded != nil {
|
|
t.Errorf("legacy app must yield empty buckets, got %+v", fb)
|
|
}
|
|
}
|
|
|
|
// Scenario E: structural guards run over ALL classes — a traversal path in an EXCLUDED bind is Skipped,
|
|
// never plannable (opt-in or not).
|
|
func TestComputeFabBuckets_GuardsAllClasses(t *testing.T) {
|
|
binds := []ClassifiedBind{
|
|
{ComposeBind: ComposeBind{Root: RootHDD, RelPath: "../evil"}, Class: ClassExcluded},
|
|
{ComposeBind: ComposeBind{Root: RootHDD, RelPath: "appdata/ok"}, Class: ClassMandatory},
|
|
}
|
|
fb := ComputeFabBuckets(binds, true, drv, "")
|
|
for _, b := range [][]CapturePath{fb.Mandatory, fb.Optional, fb.Excluded} {
|
|
for _, p := range b {
|
|
if p.RelPath == "../evil" {
|
|
t.Fatal("a traversal path must never enter a bucket (guards run over all classes)")
|
|
}
|
|
}
|
|
}
|
|
if len(fb.Skipped) != 1 || fb.Skipped[0].RelPath != "../evil" {
|
|
t.Errorf("traversal excluded path must be Skipped, got %+v", fb.Skipped)
|
|
}
|
|
}
|
|
|
|
// no cross-bucket containment dedup: a mandatory CHILD inside an excluded PARENT both survive.
|
|
func TestComputeFabBuckets_NoCrossBucketContainment(t *testing.T) {
|
|
binds := []ClassifiedBind{
|
|
{ComposeBind: ComposeBind{Root: RootUserdata, RelPath: "media"}, Class: ClassExcluded},
|
|
{ComposeBind: ComposeBind{Root: RootUserdata, RelPath: "media/books"}, Class: ClassMandatory},
|
|
}
|
|
fb := ComputeFabBuckets(binds, true, drv, "")
|
|
if got, want := bucketAbs(fb.Mandatory), []string{udat("media/books")}; !reflect.DeepEqual(got, want) {
|
|
t.Errorf("mandatory child must survive independently: Mandatory = %v, want %v", got, want)
|
|
}
|
|
if got, want := bucketAbs(fb.Excluded), []string{udat("media")}; !reflect.DeepEqual(got, want) {
|
|
t.Errorf("excluded parent must survive: Excluded = %v, want %v", got, want)
|
|
}
|
|
}
|
|
|
|
// equal-Abs collapse: two spellings of one path collapse, mandatory wins (into the mandatory bucket).
|
|
func TestComputeFabBuckets_EqualAbsMandatoryWins(t *testing.T) {
|
|
binds := []ClassifiedBind{
|
|
{ComposeBind: ComposeBind{Root: RootHDD, RelPath: "userdata/media"}, Class: ClassOptional},
|
|
{ComposeBind: ComposeBind{Root: RootUserdata, RelPath: "media"}, Class: ClassMandatory},
|
|
}
|
|
fb := ComputeFabBuckets(binds, true, drv, "")
|
|
if got, want := bucketAbs(fb.Mandatory), []string{udat("media")}; !reflect.DeepEqual(got, want) {
|
|
t.Errorf("collapsed path must land in Mandatory, got Mandatory=%v", got)
|
|
}
|
|
if len(fb.Optional) != 0 {
|
|
t.Errorf("optional spelling must collapse away, got %v", bucketAbs(fb.Optional))
|
|
}
|
|
}
|