mirror of
https://github.com/Kpa-clawbot/meshcore-analyzer.git
synced 2026-10-15 07:29:58 +00:00
Part 1 of 3 for #2173 (companion linking). This PR adds only the `users.db` side: the schema and store methods the server (part 2) and ingestor (part 3) build on. No route, no UI and no behaviour change for a running server. ## Changes in this PR - **Design spec** `docs/specs/2026-10-08-companion-linking-design.md`, including the optional linked-only ingest. - **Schema v6** (`internal/users/schema.go`): - `sessions` gains `kind` (`'web'` or `'device'`), `label` and `scopes` (`''` = full, for web sessions). - `companion_links (pubkey PRIMARY KEY, user_id, name, linked_at)`, cascading on user delete. - `link_challenges`: single-use challenges bound to a user and a pubkey, with an expiry. - **Device sessions** (`sessions.go`): create a device session with a label and scopes, list sessions with kind and label. - **Challenges** (`challenges.go`): issue and consume a challenge exactly once; consumed, expired, or bound to another user or pubkey all fail. - **Companion links** (`companions.go`): link, list, unlink. Linking a pubkey that belongs to another user moves it and reports the previous owner (transfer detection), so the server can audit and mail. - **Janitor**: the existing janitor also prunes expired challenges (`cmd/server/auth_service.go`, 3 lines). ## Upgrade note The store migrates `users.db` to v6 on start. A binary that only knows v5 refuses to open a v6 file (`users: database schema version 6 is newer than this binary supports (5)`), so rolling back after this lands needs the pre-upgrade `users.db` backup. ## Verification - `internal/users`: new tests for the v6 migration from v5, device sessions, challenges (single use, expiry, binding) and companion links (transfer, cascade on user delete). `go vet` and `go test ./...` green. - `cmd/server` full suite green against the v6 store. ## Not in this PR - Routes, bearer auth and the link handshake: part 2. - Ingestor filter, account page and "My coverage": part 3. --------- Co-authored-by: Claude Opus 5.5 (1M context) <noreply@anthropic.com>
77 lines
3.0 KiB
Go
77 lines
3.0 KiB
Go
package users
|
|
|
|
import (
|
|
"database/sql"
|
|
"path/filepath"
|
|
"strings"
|
|
"testing"
|
|
)
|
|
|
|
// A users.db written by a v5 binary gains the companion-linking schema and
|
|
// keeps its sessions, which become web sessions with no label or scopes.
|
|
func TestMigrateV5DatabaseToV6(t *testing.T) {
|
|
path := filepath.Join(t.TempDir(), "users.db")
|
|
db, err := sql.Open("sqlite", path)
|
|
if err != nil {
|
|
t.Fatal(err)
|
|
}
|
|
stmts := []string{`CREATE TABLE schema_version (version INTEGER NOT NULL)`, `INSERT INTO schema_version (version) VALUES (5)`}
|
|
for _, m := range migrations[:5] {
|
|
stmts = append(stmts, m...)
|
|
}
|
|
stmts = append(stmts,
|
|
`INSERT INTO users (email, display_name, password_hash, created_at) VALUES ('old@example.org', 'Old', 'x', 1)`,
|
|
`INSERT INTO sessions (token_hash, user_id, csrf_token, created_at, expires_at, last_seen_at) VALUES ('h', 1, 'c', 1, 4102444800, 1)`)
|
|
for _, s := range stmts {
|
|
if _, err := db.Exec(s); err != nil {
|
|
t.Fatalf("build v5 db: %v", err)
|
|
}
|
|
}
|
|
db.Close()
|
|
|
|
st, err := Open(path)
|
|
if err != nil {
|
|
t.Fatalf("Open v5 db: %v", err)
|
|
}
|
|
defer st.Close()
|
|
if len(migrations) < 6 {
|
|
t.Fatal("migration v6 missing")
|
|
}
|
|
if v, err := st.SchemaVersion(); err != nil || v != len(migrations) {
|
|
t.Fatalf("SchemaVersion = %d, %v; want %d", v, err, len(migrations))
|
|
}
|
|
|
|
var kind, label, scopes string
|
|
if err := st.db.QueryRow(`SELECT kind, label, scopes FROM sessions WHERE token_hash = 'h'`).Scan(&kind, &label, &scopes); err != nil {
|
|
t.Fatalf("v5 session lost: %v", err)
|
|
}
|
|
if kind != "web" || label != "" || scopes != "" {
|
|
t.Fatalf("migrated session kind=%q label=%q scopes=%q", kind, label, scopes)
|
|
}
|
|
if _, err := st.db.Exec(`UPDATE sessions SET kind = 'api_key' WHERE token_hash = 'h'`); err == nil || !strings.Contains(err.Error(), "CHECK") {
|
|
t.Fatalf("kind outside web/device accepted: %v", err)
|
|
}
|
|
if _, err := st.db.Exec(`UPDATE sessions SET kind = 'device' WHERE token_hash = 'h'`); err != nil {
|
|
t.Fatalf("kind device rejected: %v", err)
|
|
}
|
|
|
|
pk := strings.Repeat("ab", 32)
|
|
if _, err := st.db.Exec(`INSERT INTO companion_links (pubkey, user_id, linked_at) VALUES (?, 1, 1)`, pk); err != nil {
|
|
t.Fatalf("companion_links: %v", err)
|
|
}
|
|
var name string
|
|
if err := st.db.QueryRow(`SELECT name FROM companion_links WHERE pubkey = ?`, pk).Scan(&name); err != nil || name != "" {
|
|
t.Fatalf("companion_links default name = %q, %v", name, err)
|
|
}
|
|
if _, err := st.db.Exec(`INSERT INTO companion_links (pubkey, user_id, linked_at) VALUES (?, 99, 1)`, strings.Repeat("cd", 32)); err == nil {
|
|
t.Fatal("companion_links accepted an unknown user (foreign key off?)")
|
|
}
|
|
if _, err := st.db.Exec(`INSERT INTO link_challenges (challenge_hash, user_id, pubkey, expires_at) VALUES ('x', 1, ?, 1)`, pk); err != nil {
|
|
t.Fatalf("link_challenges: %v", err)
|
|
}
|
|
var idx int
|
|
if err := st.db.QueryRow(`SELECT COUNT(*) FROM sqlite_master WHERE type = 'index' AND name = 'companion_links_user'`).Scan(&idx); err != nil || idx != 1 {
|
|
t.Fatalf("index companion_links_user = %d, %v", idx, err)
|
|
}
|
|
}
|