diff --git a/cmd/zapret-autotune/managed_cli.go b/cmd/zapret-autotune/managed_cli.go index 97bbaaf..7bfbb13 100644 --- a/cmd/zapret-autotune/managed_cli.go +++ b/cmd/zapret-autotune/managed_cli.go @@ -31,6 +31,7 @@ type managedIdentity struct { type managedDeps struct { lookup func(string) (string, bool) openDB func() (*sql.DB, error) + openWriteDB func() (*sql.DB, error) player playerRunner run func(string, ...string) error script, directory string @@ -41,8 +42,9 @@ type managedDeps struct { func managedDependencies(player playerRunner) managedDeps { return managedDeps{ lookup: os.LookupEnv, player: player, - openDB: func() (*sql.DB, error) { return openHistoryStore(databasePath()) }, - script: "/opt/zapret2/init.d/sysv/zapret2", directory: managedTargetDirectory, + 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, 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 78fed49..8c7e40f 100644 --- a/cmd/zapret-autotune/managed_experimental.go +++ b/cmd/zapret-autotune/managed_experimental.go @@ -107,7 +107,10 @@ func managedExperimentalSuffix(m *managedTransaction, d managedDeps) error { if err != nil { return fmt.Errorf("fresh GGC identity unavailable") } - db, err := d.openDB() + if d.openWriteDB == nil { + return fmt.Errorf("experimental candidate writer unavailable") + } + db, err := d.openWriteDB() if err != nil { return err } diff --git a/cmd/zapret-autotune/managed_store_test.go b/cmd/zapret-autotune/managed_store_test.go new file mode 100644 index 0000000..950206c --- /dev/null +++ b/cmd/zapret-autotune/managed_store_test.go @@ -0,0 +1,43 @@ +package main + +import ( + "path/filepath" + "testing" +) + +func TestManagedCandidateWriterPreservesReadOnlyHistory(t *testing.T) { + t.Setenv("ZAPRET_AUTOTUNE_DB", filepath.Join(t.TempDir(), "candidates.db")) + d := managedDependencies(nil) + db, err := d.openWriteDB() + if err != nil { + t.Fatal(err) + } + defer db.Close() + tx, err := db.Begin() + if err != nil { + t.Fatal(err) + } + id, err := insertStrategyCandidate(tx, "googlevideo", []string{"rr1---sn-alpha.googlevideo.com"}, managedGooglevideoArgs, nil) + if err != nil { + _ = tx.Rollback() + t.Fatal(err) + } + if err := tx.Commit(); err != nil { + t.Fatal(err) + } + c, err := readStrategyCandidate(db, id) + if err != nil || c.Qualified { + t.Fatalf("experimental definition must remain unqualified: %+v %v", c, err) + } + history, err := d.openDB() + if err != nil { + t.Fatal(err) + } + defer history.Close() + if _, err := history.Exec("CREATE TABLE managed_readonly_probe(value INTEGER)"); err == nil { + t.Fatal("ordinary managed history became writable") + } + if _, err := readStrategyCandidate(history, id); err != nil { + t.Fatal(err) + } +}