mirror of
https://github.com/Kpa-clawbot/meshcore-analyzer.git
synced 2026-10-13 04:37:33 +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>
140 lines
4.2 KiB
Go
140 lines
4.2 KiB
Go
// Package users is CoreScope's optional account store (user management,
|
|
// docs/specs/2026-10-06-user-management-design.md). It owns users.db, a
|
|
// SQLite file separate from the measurement database. cmd/server never
|
|
// writes measurement data (#1283); this package is the single, opt-in
|
|
// exception, and Open refuses to touch the measurement database by path.
|
|
package users
|
|
|
|
import (
|
|
"database/sql"
|
|
"errors"
|
|
"fmt"
|
|
"os"
|
|
"path/filepath"
|
|
"strings"
|
|
"time"
|
|
|
|
_ "modernc.org/sqlite"
|
|
)
|
|
|
|
var (
|
|
ErrNotFound = errors.New("users: not found")
|
|
ErrEmailTaken = errors.New("users: email already registered")
|
|
ErrTokenInvalid = errors.New("users: token invalid or already used")
|
|
ErrTokenExpired = errors.New("users: token expired")
|
|
// ErrAccountChanged: the account is no longer pending with the
|
|
// password hash the caller verified (a re-register or an admin got
|
|
// there first).
|
|
ErrAccountChanged = errors.New("users: account changed since it was read")
|
|
// ErrNoScopes: a device session must name what it may do; an empty
|
|
// scope list would mean full (web) access.
|
|
ErrNoScopes = errors.New("users: a device session needs at least one scope")
|
|
ErrBadPubkey = errors.New("users: pubkey must be 64 hex characters")
|
|
// Link challenges (companion linking). A challenge is consumed by every
|
|
// lookup, whichever of these it returns.
|
|
ErrChallengeMissing = errors.New("users: link challenge unknown or already used")
|
|
ErrChallengeExpired = errors.New("users: link challenge expired")
|
|
ErrChallengeMismatch = errors.New("users: link challenge bound to another user or pubkey")
|
|
)
|
|
|
|
// noLimit is SQLite's LIMIT value for "every row" (the account export).
|
|
const noLimit = -1
|
|
|
|
// Store is the users.db handle. Safe for concurrent use.
|
|
type Store struct {
|
|
db *sql.DB
|
|
now func() time.Time
|
|
}
|
|
|
|
// Open opens (creating if needed) the users database at path and applies
|
|
// pending migrations. forbidden lists paths Open must refuse; the server
|
|
// passes the measurement DB path so a misconfigured dbPath can never turn
|
|
// this package into a writer of measurement data.
|
|
func Open(path string, forbidden ...string) (*Store, error) {
|
|
if strings.ContainsAny(path, "?#") {
|
|
return nil, fmt.Errorf("users: database path %q must not contain '?' or '#'", path)
|
|
}
|
|
abs, err := filepath.Abs(path)
|
|
if err != nil {
|
|
return nil, fmt.Errorf("users: resolve %s: %w", path, err)
|
|
}
|
|
for _, f := range forbidden {
|
|
if strings.TrimSpace(f) != "" && samePath(abs, f) {
|
|
return nil, fmt.Errorf("users: refusing to open %s: it is the measurement database", path)
|
|
}
|
|
}
|
|
if err := os.MkdirAll(filepath.Dir(abs), 0o755); err != nil {
|
|
return nil, fmt.Errorf("users: create dir for %s: %w", path, err)
|
|
}
|
|
db, err := sql.Open("sqlite", abs+"?_pragma=busy_timeout(5000)&_pragma=journal_mode(WAL)&_pragma=foreign_keys(1)")
|
|
if err != nil {
|
|
return nil, fmt.Errorf("users: open %s: %w", path, err)
|
|
}
|
|
// Account traffic is tiny; one connection removes SQLITE_BUSY between
|
|
// our own writers and keeps the per-connection pragmas in force.
|
|
db.SetMaxOpenConns(1)
|
|
s := &Store{db: db, now: time.Now}
|
|
if err := s.migrate(); err != nil {
|
|
db.Close()
|
|
return nil, err
|
|
}
|
|
return s, nil
|
|
}
|
|
|
|
func samePath(abs, other string) bool {
|
|
oa, err := filepath.Abs(other)
|
|
if err != nil {
|
|
return false
|
|
}
|
|
a, errA := os.Stat(abs)
|
|
b, errB := os.Stat(oa)
|
|
if errA == nil && errB == nil {
|
|
return os.SameFile(a, b)
|
|
}
|
|
return strings.EqualFold(filepath.Clean(abs), filepath.Clean(oa))
|
|
}
|
|
|
|
// Close closes the database.
|
|
func (s *Store) Close() error { return s.db.Close() }
|
|
|
|
// SetClock replaces the time source. Tests only.
|
|
func (s *Store) SetClock(now func() time.Time) { s.now = now }
|
|
|
|
type rowScanner interface{ Scan(dest ...any) error }
|
|
|
|
func unix(t time.Time) int64 { return t.Unix() }
|
|
func fromUnix(v int64) time.Time { return time.Unix(v, 0).UTC() }
|
|
|
|
func fromNullUnix(v sql.NullInt64) *time.Time {
|
|
if !v.Valid {
|
|
return nil
|
|
}
|
|
t := fromUnix(v.Int64)
|
|
return &t
|
|
}
|
|
|
|
func nullInt(p *int64) any {
|
|
if p == nil {
|
|
return nil
|
|
}
|
|
return *p
|
|
}
|
|
|
|
func expectOne(res sql.Result, err error) error {
|
|
if err != nil {
|
|
return err
|
|
}
|
|
n, err := res.RowsAffected()
|
|
if err != nil {
|
|
return err
|
|
}
|
|
if n == 0 {
|
|
return ErrNotFound
|
|
}
|
|
return nil
|
|
}
|
|
|
|
func isUniqueViolation(err error) bool {
|
|
return err != nil && strings.Contains(err.Error(), "UNIQUE constraint failed")
|
|
}
|