feat(storage): fingerprint proposed strategies

Co-authored-by: GPT-6 <gpt-6@openai.com>
This commit is contained in:
ZeusinaandGPT-6 Bot committed 2026-10-09 21:56:53 +03:00
1 parent e2b87e0416
commit 04fd9b370d
4 files changed
+405 -12

No files matched your search

+105 -9
View File
@@ -3,6 +3,7 @@ package main
import (
"bytes"
"context"
"crypto/sha256"
"database/sql"
"encoding/json"
"fmt"
@@ -113,7 +114,7 @@ func migrate(db *sql.DB) error {
if err = conn.QueryRowContext(ctx, "PRAGMA user_version").Scan(&version); err != nil {
return err
}
if version > 1 {
if version > 2 {
return fmt.Errorf("unsupported database schema version %d", version)
}
if version == 0 {
@@ -145,14 +146,105 @@ PRAGMA user_version = 1;`)
return err
}
}
if version < 2 {
// Check the required source columns before changing either schema or data.
for _, schema := range []struct {
table string
columns string
count int
}{
{"tune_runs", `(name = 'id' AND upper(type) = 'INTEGER') OR (name IN ('started_at', 'finished_at', 'target', 'state', 'args', 'output', 'error') AND upper(type) = 'TEXT')`, 8},
{"protocol_results", `(name IN ('run_id', 'passes_ok', 'passes_total') AND upper(type) = 'INTEGER') OR (name = 'protocol' AND upper(type) = 'TEXT')`, 4},
} {
var columns int
err := conn.QueryRowContext(ctx, "SELECT count(*) FROM pragma_table_info(?) WHERE ("+schema.columns+") AND EXISTS (SELECT 1 FROM sqlite_master WHERE name = ? AND type = 'table')", schema.table, schema.table).Scan(&columns)
if err != nil {
return err
}
if columns != schema.count {
return fmt.Errorf("invalid v1 schema: %s requires %d expected columns, found %d", schema.table, schema.count, columns)
}
}
if _, err := conn.ExecContext(ctx, "ALTER TABLE tune_runs ADD COLUMN fingerprint TEXT"); err != nil {
return err
}
rows, err := conn.QueryContext(ctx, "SELECT id, args FROM tune_runs WHERE state = 'PROPOSED'")
if err != nil {
return err
}
var fingerprints []struct {
id int64
value string
}
for rows.Next() {
var id int64
var args string
if err := rows.Scan(&id, &args); err != nil {
rows.Close()
return err
}
value, err := strategyFingerprint(args)
if err != nil {
rows.Close()
return fmt.Errorf("run %d fingerprint: %w", id, err)
}
fingerprints = append(fingerprints, struct {
id int64
value string
}{id, value})
}
err = rows.Err()
closeErr := rows.Close()
if err != nil {
return err
}
if closeErr != nil {
return closeErr
}
for _, fingerprint := range fingerprints {
if _, err := conn.ExecContext(ctx, "UPDATE tune_runs SET fingerprint = ? WHERE id = ?", fingerprint.value, fingerprint.id); err != nil {
return err
}
}
// Install only after backfill, so existing proposals can acquire their hash.
for _, event := range []string{"INSERT", "UPDATE"} {
if _, err := conn.ExecContext(ctx, `CREATE TRIGGER fingerprint_before_`+strings.ToLower(event)+` BEFORE `+event+` ON tune_runs
WHEN (NEW.state = 'PROPOSED' AND (NEW.fingerprint IS NULL
OR typeof(NEW.fingerprint) != 'text' OR length(NEW.fingerprint) != 64
OR length(CAST(NEW.fingerprint AS BLOB)) != 64
OR NEW.fingerprint GLOB '*[^0-9a-f]*'))
OR (NEW.state = 'FAILED' AND NEW.fingerprint IS NOT NULL)
BEGIN SELECT RAISE(ABORT, 'invalid state-dependent fingerprint'); END;`); err != nil {
return err
}
}
if _, err := conn.ExecContext(ctx, "PRAGMA user_version = 2"); err != nil {
return err
}
}
_, err = conn.ExecContext(ctx, "COMMIT")
return err
}
type storedRun struct {
ID int64
StartedAt, FinishedAt, State string
Args, Output, Error sql.NullString
ID int64
StartedAt, FinishedAt, State string
Args, Output, Error, Fingerprint sql.NullString
}
func strategyFingerprint(args string) (string, error) {
// The validated grammar permits only unquoted options, with no spaces in
// values. Collapse separators only; never sort or deduplicate arguments.
args = strings.NewReplacer("\t", " ", "\r", " ", "\n", " ", "\v", " ", "\f", " ").Replace(args)
c := candidate{Args: args}
if err := c.validateArgs(); err != nil {
return "", err
}
args = strings.Join(strings.Fields(args), " ")
if args == "" {
return "", fmt.Errorf("args must not be empty")
}
return fmt.Sprintf("%x", sha256.Sum256([]byte(args))), nil
}
// Validation is shared with tune's output path; only combined 3/3 evidence is stored.
@@ -165,7 +257,7 @@ func saveRun(db *sql.DB, started time.Time, args, output string, report []byte,
} `json:"strategies"`
}
state := "FAILED"
var savedArgs, savedOutput, savedError interface{}
var savedArgs, savedOutput, savedError, fingerprint interface{}
if runErr == nil {
verifiedOutput, err := combinedBlockcheckOutput(bytes.NewReader(report), args)
if err != nil {
@@ -177,6 +269,10 @@ func saveRun(db *sql.DB, started time.Time, args, output string, report []byte,
if err := json.Unmarshal(report, &evidence); err != nil {
return err
}
fingerprint, err = strategyFingerprint(args)
if err != nil {
return err
}
state, savedArgs, savedOutput = "PROPOSED", args, output
} else {
savedError = runErr.Error()
@@ -186,8 +282,8 @@ func saveRun(db *sql.DB, started time.Time, args, output string, report []byte,
return err
}
defer tx.Rollback()
result, err := tx.Exec(`INSERT INTO tune_runs (started_at, finished_at, target, state, args, output, error) VALUES (?, ?, 'youtube.com', ?, ?, ?, ?)`,
started.UTC().Format(time.RFC3339Nano), time.Now().UTC().Format(time.RFC3339Nano), state, savedArgs, savedOutput, savedError)
result, err := tx.Exec(`INSERT INTO tune_runs (started_at, finished_at, target, state, args, output, error, fingerprint) VALUES (?, ?, 'youtube.com', ?, ?, ?, ?, ?)`,
started.UTC().Format(time.RFC3339Nano), time.Now().UTC().Format(time.RFC3339Nano), state, savedArgs, savedOutput, savedError, fingerprint)
if err != nil {
return err
}
@@ -205,8 +301,8 @@ func saveRun(db *sql.DB, started time.Time, args, output string, report []byte,
func latestRun(db *sql.DB) (storedRun, error) {
var r storedRun
err := db.QueryRow(`SELECT id, started_at, finished_at, state, args, output, error FROM tune_runs ORDER BY id DESC LIMIT 1`).Scan(
&r.ID, &r.StartedAt, &r.FinishedAt, &r.State, &r.Args, &r.Output, &r.Error)
err := db.QueryRow(`SELECT id, started_at, finished_at, state, args, output, error, fingerprint FROM tune_runs ORDER BY id DESC LIMIT 1`).Scan(
&r.ID, &r.StartedAt, &r.FinishedAt, &r.State, &r.Args, &r.Output, &r.Error, &r.Fingerprint)
if err == nil && r.State == "PROPOSED" {
var results int
err = db.QueryRow(`SELECT count(*) FROM protocol_results WHERE run_id = ? AND protocol IN ('tls12', 'tls13') AND passes_ok = 3 AND passes_total = 3`, r.ID).Scan(&results)