diff --git a/cmd/zapret-autotune/managed_cli.go b/cmd/zapret-autotune/managed_cli.go index 7bfbb13..eb8dd29 100644 --- a/cmd/zapret-autotune/managed_cli.go +++ b/cmd/zapret-autotune/managed_cli.go @@ -31,7 +31,7 @@ type managedIdentity struct { type managedDeps struct { lookup func(string) (string, bool) openDB func() (*sql.DB, error) - openWriteDB func() (*sql.DB, error) + openWriteDB func(managedDeps) (*sql.DB, error) player playerRunner run func(string, ...string) error script, directory string @@ -42,9 +42,15 @@ type managedDeps struct { func managedDependencies(player playerRunner) managedDeps { return managedDeps{ lookup: os.LookupEnv, player: player, - openDB: func() (*sql.DB, error) { return openHistoryStore(databasePath()) }, - openWriteDB: func() (*sql.DB, error) { return openStore(databasePath()) }, - script: "/opt/zapret2/init.d/sysv/zapret2", directory: managedTargetDirectory, + openDB: func() (*sql.DB, error) { return openHistoryStore(databasePath()) }, + openWriteDB: func(d managedDeps) (*sql.DB, error) { + path, err := managedMonitorDatabase(d) + if err != nil { + return nil, err + } + return openStore(path) + }, + script: "/opt/zapret2/init.d/sysv/zapret2", directory: managedTargetDirectory, verifyRuntime: verifyManagedRuntime, verifySOCKS: verifyManagedSOCKS, run: func(path string, args ...string) error { ctx, cancel := context.WithTimeout(context.Background(), 30*time.Second) diff --git a/cmd/zapret-autotune/managed_experimental.go b/cmd/zapret-autotune/managed_experimental.go index 8c7e40f..4466df7 100644 --- a/cmd/zapret-autotune/managed_experimental.go +++ b/cmd/zapret-autotune/managed_experimental.go @@ -110,7 +110,7 @@ func managedExperimentalSuffix(m *managedTransaction, d managedDeps) error { if d.openWriteDB == nil { return fmt.Errorf("experimental candidate writer unavailable") } - db, err := d.openWriteDB() + db, err := d.openWriteDB(d) if err != nil { return err } diff --git a/cmd/zapret-autotune/managed_store_test.go b/cmd/zapret-autotune/managed_store_test.go index 950206c..41a533f 100644 --- a/cmd/zapret-autotune/managed_store_test.go +++ b/cmd/zapret-autotune/managed_store_test.go @@ -1,14 +1,32 @@ package main import ( + "bytes" + "os" "path/filepath" + "syscall" "testing" ) +func managedWriterFixture(t *testing.T) (managedDeps, map[string]string) { + t.Helper() + d, env, _ := managedCLIFixture(t) + env["ZAPRET_AUTOTUNE_DB"] = managedTargetDirectory + "/candidates.db" + d.openWriteDB = managedDependencies(nil).openWriteDB + return d, env +} + func TestManagedCandidateWriterPreservesReadOnlyHistory(t *testing.T) { - t.Setenv("ZAPRET_AUTOTUNE_DB", filepath.Join(t.TempDir(), "candidates.db")) - d := managedDependencies(nil) - db, err := d.openWriteDB() + d, _ := managedWriterFixture(t) + path := filepath.Join(d.directory, "candidates.db") + initial, err := openStore(path) + if err != nil { + t.Fatal(err) + } + if err := initial.Close(); err != nil { + t.Fatal(err) + } + db, err := d.openWriteDB(d) if err != nil { t.Fatal(err) } @@ -29,7 +47,8 @@ func TestManagedCandidateWriterPreservesReadOnlyHistory(t *testing.T) { if err != nil || c.Qualified { t.Fatalf("experimental definition must remain unqualified: %+v %v", c, err) } - history, err := d.openDB() + t.Setenv("ZAPRET_AUTOTUNE_DB", path) + history, err := managedDependencies(nil).openDB() if err != nil { t.Fatal(err) } @@ -41,3 +60,86 @@ func TestManagedCandidateWriterPreservesReadOnlyHistory(t *testing.T) { t.Fatal(err) } } + +func TestManagedCandidateWriterRejectsUnsafeStoreBeforeMutation(t *testing.T) { + for _, suffix := range []string{"", "-wal", "-shm", "-journal"} { + for _, kind := range []string{"wrong-path", "symlink", "hardlink", "mode", "owner", "directory"} { + t.Run(suffix+"/"+kind, func(t *testing.T) { + d, env := managedWriterFixture(t) + path := filepath.Join(d.directory, "candidates.db"+suffix) + outside := filepath.Join(t.TempDir(), "unrelated") + data := []byte("operator-owned bytes; never migrate or chmod") + if err := os.WriteFile(outside, data, 0640); err != nil { + t.Fatal(err) + } + if err := os.WriteFile(path, data, 0600); err != nil { + t.Fatal(err) + } + switch kind { + case "wrong-path": + env["ZAPRET_AUTOTUNE_DB"] = outside + case "symlink", "hardlink", "directory": + if err := os.Remove(path); err != nil { + t.Fatal(err) + } + var err error + if kind == "symlink" { + err = os.Symlink(outside, path) + } else if kind == "hardlink" { + err = os.Link(outside, path) + } else { + err = os.Mkdir(path, 0700) + } + if err != nil { + t.Fatal(err) + } + case "mode": + if err := os.Chmod(path, 0640); err != nil { + t.Fatal(err) + } + case "owner": + if os.Geteuid() != 0 { + t.Skip("wrong-UID fixture requires root") + } + if err := os.Chown(path, 1, -1); err != nil { + t.Fatal(err) + } + } + before, err := os.Lstat(path) + if err != nil { + t.Fatal(err) + } + outsideBefore, err := os.Stat(outside) + if err != nil { + t.Fatal(err) + } + if db, err := d.openWriteDB(d); err == nil { + _ = db.Close() + t.Fatal("unsafe writer accepted") + } + after, err := os.Lstat(path) + if err != nil || !os.SameFile(before, after) || before.Mode() != after.Mode() || before.Sys().(*syscall.Stat_t).Uid != after.Sys().(*syscall.Stat_t).Uid { + t.Fatal("unsafe file mutated", err) + } + outsideAfter, err := os.Stat(outside) + if err != nil || !os.SameFile(outsideBefore, outsideAfter) || outsideBefore.Mode() != outsideAfter.Mode() { + t.Fatal("unrelated file mutated", err) + } + for _, p := range []string{outside, path} { + if p == path && kind == "directory" { + continue + } + b, err := os.ReadFile(p) + if err != nil || !bytes.Equal(b, data) { + t.Fatal("file contents changed", err) + } + } + if suffix != "" { + if _, err := os.Lstat(filepath.Join(d.directory, "candidates.db")); !os.IsNotExist(err) { + t.Fatal("guard created database before rejecting sidecar", err) + } + } + }) + } + } +}