mirror of
https://github.com/Kpa-clawbot/meshcore-analyzer.git
synced 2026-10-12 19:37:23 +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>
193 lines
6.4 KiB
Go
193 lines
6.4 KiB
Go
package users
|
|
|
|
import (
|
|
"database/sql"
|
|
"errors"
|
|
"fmt"
|
|
)
|
|
|
|
// migrations[i] upgrades the schema from version i to i+1. Forward-only:
|
|
// never edit a shipped entry, append a new one.
|
|
var migrations = [][]string{
|
|
{ // v1: sub-project A
|
|
`CREATE TABLE users (
|
|
id INTEGER PRIMARY KEY,
|
|
email TEXT NOT NULL UNIQUE,
|
|
display_name TEXT NOT NULL,
|
|
password_hash TEXT NOT NULL,
|
|
role TEXT NOT NULL DEFAULT 'user' CHECK (role IN ('user','admin')),
|
|
status TEXT NOT NULL DEFAULT 'pending' CHECK (status IN ('pending','active','disabled')),
|
|
created_at INTEGER NOT NULL,
|
|
activated_at INTEGER,
|
|
activated_by INTEGER,
|
|
last_login_at INTEGER,
|
|
email_bouncing INTEGER NOT NULL DEFAULT 0
|
|
)`,
|
|
`CREATE TABLE sessions (
|
|
id INTEGER PRIMARY KEY,
|
|
token_hash TEXT NOT NULL UNIQUE,
|
|
user_id INTEGER NOT NULL REFERENCES users(id) ON DELETE CASCADE,
|
|
csrf_token TEXT NOT NULL,
|
|
created_at INTEGER NOT NULL,
|
|
expires_at INTEGER NOT NULL,
|
|
last_seen_at INTEGER NOT NULL,
|
|
user_agent TEXT NOT NULL DEFAULT ''
|
|
)`,
|
|
`CREATE INDEX sessions_user ON sessions(user_id)`,
|
|
`CREATE TABLE tokens (
|
|
token_hash TEXT PRIMARY KEY,
|
|
user_id INTEGER NOT NULL REFERENCES users(id) ON DELETE CASCADE,
|
|
purpose TEXT NOT NULL CHECK (purpose IN ('activate','reset','email_change')),
|
|
new_email TEXT,
|
|
expires_at INTEGER NOT NULL,
|
|
used_at INTEGER
|
|
)`,
|
|
`CREATE INDEX tokens_user ON tokens(user_id, purpose)`,
|
|
`CREATE TABLE audit_log (
|
|
id INTEGER PRIMARY KEY,
|
|
at INTEGER NOT NULL,
|
|
actor_user_id INTEGER,
|
|
action TEXT NOT NULL,
|
|
target_user_id INTEGER,
|
|
detail TEXT NOT NULL DEFAULT '{}'
|
|
)`,
|
|
`CREATE INDEX audit_target ON audit_log(target_user_id)`,
|
|
`CREATE INDEX audit_actor ON audit_log(actor_user_id)`,
|
|
`CREATE TABLE mail_log (
|
|
id INTEGER PRIMARY KEY,
|
|
user_id INTEGER REFERENCES users(id) ON DELETE SET NULL,
|
|
to_email TEXT NOT NULL,
|
|
purpose TEXT NOT NULL,
|
|
provider_message_id TEXT,
|
|
sent_at INTEGER NOT NULL,
|
|
last_event TEXT NOT NULL DEFAULT 'sent',
|
|
last_event_at INTEGER NOT NULL,
|
|
last_reason TEXT NOT NULL DEFAULT ''
|
|
)`,
|
|
`CREATE INDEX mail_user ON mail_log(user_id)`,
|
|
`CREATE UNIQUE INDEX mail_msgid ON mail_log(provider_message_id) WHERE provider_message_id IS NOT NULL`,
|
|
`CREATE TABLE mail_events (
|
|
mail_id INTEGER NOT NULL REFERENCES mail_log(id) ON DELETE CASCADE,
|
|
event TEXT NOT NULL,
|
|
at INTEGER NOT NULL,
|
|
reason TEXT NOT NULL DEFAULT '',
|
|
UNIQUE (mail_id, event, at)
|
|
)`,
|
|
},
|
|
{ // v2: sub-project B, settings sync (one document per user)
|
|
`CREATE TABLE user_settings (
|
|
user_id INTEGER PRIMARY KEY REFERENCES users(id) ON DELETE CASCADE,
|
|
doc TEXT NOT NULL,
|
|
revision INTEGER NOT NULL,
|
|
generation TEXT NOT NULL,
|
|
updated_at INTEGER NOT NULL
|
|
)`,
|
|
},
|
|
{ // v3: sub-project C, global audit list ordered and filtered by time
|
|
`CREATE INDEX audit_at ON audit_log(at)`,
|
|
},
|
|
{ // v4: sub-project D, proposals (one generic table; this version ships the kind 'hashtag_channel')
|
|
`CREATE TABLE proposals (
|
|
id INTEGER PRIMARY KEY,
|
|
kind TEXT NOT NULL,
|
|
subject TEXT NOT NULL,
|
|
status TEXT NOT NULL CHECK (status IN ('pending','approved','rejected','revoked')),
|
|
proposer_id INTEGER REFERENCES users(id) ON DELETE SET NULL,
|
|
reviewer_id INTEGER REFERENCES users(id) ON DELETE SET NULL,
|
|
note TEXT NOT NULL DEFAULT '',
|
|
created_at INTEGER NOT NULL,
|
|
decided_at INTEGER
|
|
)`,
|
|
`CREATE UNIQUE INDEX proposals_kind_subject ON proposals(kind, subject)`,
|
|
`CREATE INDEX proposals_status ON proposals(status)`,
|
|
},
|
|
{ // v5: sub-project E, node notifications
|
|
`CREATE TABLE notification_prefs (
|
|
user_id INTEGER PRIMARY KEY REFERENCES users(id) ON DELETE CASCADE,
|
|
enabled INTEGER NOT NULL DEFAULT 1,
|
|
events TEXT NOT NULL DEFAULT '',
|
|
unsub_token TEXT NOT NULL UNIQUE,
|
|
updated_at INTEGER NOT NULL
|
|
)`,
|
|
`CREATE TABLE notification_watches (
|
|
user_id INTEGER NOT NULL REFERENCES users(id) ON DELETE CASCADE,
|
|
pubkey TEXT NOT NULL,
|
|
created_at INTEGER NOT NULL,
|
|
PRIMARY KEY (user_id, pubkey)
|
|
)`,
|
|
`CREATE TABLE notification_state (
|
|
user_id INTEGER NOT NULL REFERENCES users(id) ON DELETE CASCADE,
|
|
event TEXT NOT NULL,
|
|
subject TEXT NOT NULL,
|
|
state TEXT NOT NULL,
|
|
changed_at INTEGER NOT NULL,
|
|
PRIMARY KEY (user_id, event, subject)
|
|
)`,
|
|
},
|
|
{ // v6: sub-project F, companion linking (device sessions, linked companions)
|
|
`ALTER TABLE sessions ADD COLUMN kind TEXT NOT NULL DEFAULT 'web'
|
|
CHECK (kind IN ('web','device'))`,
|
|
`ALTER TABLE sessions ADD COLUMN label TEXT NOT NULL DEFAULT ''`,
|
|
`ALTER TABLE sessions ADD COLUMN scopes TEXT NOT NULL DEFAULT ''`,
|
|
`CREATE TABLE companion_links (
|
|
pubkey TEXT PRIMARY KEY,
|
|
user_id INTEGER NOT NULL REFERENCES users(id) ON DELETE CASCADE,
|
|
name TEXT NOT NULL DEFAULT '',
|
|
linked_at INTEGER NOT NULL
|
|
)`,
|
|
`CREATE INDEX companion_links_user ON companion_links(user_id)`,
|
|
`CREATE TABLE link_challenges (
|
|
challenge_hash TEXT PRIMARY KEY,
|
|
user_id INTEGER NOT NULL REFERENCES users(id) ON DELETE CASCADE,
|
|
pubkey TEXT NOT NULL,
|
|
expires_at INTEGER NOT NULL
|
|
)`,
|
|
},
|
|
}
|
|
|
|
func (s *Store) migrate() error {
|
|
if _, err := s.db.Exec(`CREATE TABLE IF NOT EXISTS schema_version (version INTEGER NOT NULL)`); err != nil {
|
|
return fmt.Errorf("users: schema_version: %w", err)
|
|
}
|
|
v, err := s.SchemaVersion()
|
|
if errors.Is(err, sql.ErrNoRows) {
|
|
if _, err := s.db.Exec(`INSERT INTO schema_version (version) VALUES (0)`); err != nil {
|
|
return fmt.Errorf("users: init schema_version: %w", err)
|
|
}
|
|
v = 0
|
|
} else if err != nil {
|
|
return fmt.Errorf("users: read schema_version: %w", err)
|
|
}
|
|
if v > len(migrations) {
|
|
return fmt.Errorf("users: database schema version %d is newer than this binary supports (%d)", v, len(migrations))
|
|
}
|
|
for i := v; i < len(migrations); i++ {
|
|
tx, err := s.db.Begin()
|
|
if err != nil {
|
|
return err
|
|
}
|
|
for _, stmt := range migrations[i] {
|
|
if _, err := tx.Exec(stmt); err != nil {
|
|
tx.Rollback()
|
|
return fmt.Errorf("users: migration %d: %w", i+1, err)
|
|
}
|
|
}
|
|
if _, err := tx.Exec(`UPDATE schema_version SET version = ?`, i+1); err != nil {
|
|
tx.Rollback()
|
|
return fmt.Errorf("users: migration %d: %w", i+1, err)
|
|
}
|
|
if err := tx.Commit(); err != nil {
|
|
return fmt.Errorf("users: migration %d: %w", i+1, err)
|
|
}
|
|
}
|
|
return nil
|
|
}
|
|
|
|
// SchemaVersion returns the applied schema version (sql.ErrNoRows on a
|
|
// database that has never been migrated).
|
|
func (s *Store) SchemaVersion() (int, error) {
|
|
var v int
|
|
err := s.db.QueryRow(`SELECT version FROM schema_version`).Scan(&v)
|
|
return v, err
|
|
}
|