d3c5367492
Drops the Dialect/Queries abstraction in favor of a single PostgreSQL 16+ implementation collapsed into the root authkit package, removes the public store interfaces, and reshapes the authorization model around seeded slugs (roles, permissions, abilities) with optional labels. Schema is now squashed into one migrations/0001_init.sql and applied automatically on authkit.New (opt-out via Config.SkipAutoMigrate). A schema verifier checks tables/columns/types/nullability on startup, tolerates extra columns, and falls back to default table names when a configured override is missing. Auth API: CreateUser + SetPassword replace Register; password is nullable. Email OTP (RequestEmailOTP/ConsumeEmailOTP) joins magic links and password reset, all with anti-enumeration silent-success defaults and a Config.RevealUnknownEmail opt-in. Service tokens drop owner columns and validate ability slugs against authkit_abilities at issue. Direct user permissions live alongside role-derived ones; queries return their UNION. Predicate API: HasRole/HasPermission/HasAbility leaves with AnyLogin/AllLogin/AnyServiceKey/AllServiceKey combinators. Validate runs at middleware construction, panicking on unknown slugs. Middleware collapses to RequireLogin (cookie + JWT), RequireGuest (configurable OnAuthenticated), and RequireServiceKey. UserIDFromCtx / UserFromCtx (lazy) / RefreshUserInCtx provide request-lifetime user caching. Cookie defaults flip to Secure=true and HttpOnly=true via *bool with BoolPtr opt-out. CLIs ship under cmd/perms, cmd/roles, cmd/abilities for seeding the authorization vocabulary; the library never seeds rows itself. Tests cover unit-level (slug validation + fuzz, opaque secrets, email normalization, extractors, predicates, OTP generator) and integration flows gated on AUTHKIT_TEST_DATABASE_URL (every Auth method, schema drift detection, migration idempotency, lazy user cache, all middleware paths). Co-Authored-By: Claude Opus 4.7 (1M context) <noreply@anthropic.com>
70 lines
2.1 KiB
Go
70 lines
2.1 KiB
Go
// Package clihelp is a small helper used by the cmd/perms, cmd/roles, and
|
|
// cmd/abilities seeding CLIs to dial Postgres, build an *authkit.Auth, and
|
|
// share argument-parsing scaffolding.
|
|
package clihelp
|
|
|
|
import (
|
|
"context"
|
|
"database/sql"
|
|
"errors"
|
|
"flag"
|
|
"fmt"
|
|
"os"
|
|
|
|
"git.juancwu.dev/juancwu/authkit"
|
|
"git.juancwu.dev/juancwu/authkit/hasher"
|
|
|
|
_ "github.com/jackc/pgx/v5/stdlib"
|
|
)
|
|
|
|
// DSNFlag returns a flag.FlagSet pre-populated with --dsn. Callers add their
|
|
// own flags and call Parse on it.
|
|
func DSNFlag(name string) (*flag.FlagSet, *string) {
|
|
fs := flag.NewFlagSet(name, flag.ExitOnError)
|
|
dsn := fs.String("dsn", "", "PostgreSQL DSN (defaults to $AUTHKIT_DATABASE_URL)")
|
|
return fs, dsn
|
|
}
|
|
|
|
// Dial opens a database connection using either the supplied DSN or the
|
|
// AUTHKIT_DATABASE_URL env var, then constructs an *authkit.Auth ready to
|
|
// run seed operations. Migrations and schema verification both run as part
|
|
// of New.
|
|
//
|
|
// The CLIs never sign JWTs or hash passwords, but Auth.New requires a JWT
|
|
// secret and a hasher — we supply a dummy secret and the default Argon2id
|
|
// hasher so the constructor passes.
|
|
func Dial(ctx context.Context, dsn string) (*authkit.Auth, *sql.DB, error) {
|
|
if dsn == "" {
|
|
dsn = os.Getenv("AUTHKIT_DATABASE_URL")
|
|
}
|
|
if dsn == "" {
|
|
return nil, nil, errors.New("no DSN: pass --dsn or set AUTHKIT_DATABASE_URL")
|
|
}
|
|
db, err := sql.Open("pgx", dsn)
|
|
if err != nil {
|
|
return nil, nil, fmt.Errorf("sql.Open: %w", err)
|
|
}
|
|
if err := db.PingContext(ctx); err != nil {
|
|
_ = db.Close()
|
|
return nil, nil, fmt.Errorf("ping: %w", err)
|
|
}
|
|
a, err := authkit.New(ctx, authkit.Deps{
|
|
DB: db,
|
|
Hasher: hasher.NewArgon2id(hasher.DefaultArgon2idParams(), nil),
|
|
}, authkit.Config{
|
|
// JWT secret is unused by seed flows but required by New.
|
|
JWTSecret: []byte("authkit-cli-not-used-for-anything-real"),
|
|
})
|
|
if err != nil {
|
|
_ = db.Close()
|
|
return nil, nil, err
|
|
}
|
|
return a, db, nil
|
|
}
|
|
|
|
// Fail prints err to stderr and exits with status 1. Used by every CLI's
|
|
// top-level dispatch.
|
|
func Fail(err error) {
|
|
fmt.Fprintf(os.Stderr, "error: %v\n", err)
|
|
os.Exit(1)
|
|
}
|