mirror of
https://github.com/shankar0123/certctl.git
synced 2026-06-07 19:11:30 +00:00
shankar0123
69f860171e
Bundle 1 / Phase 0: pure refactor splitting auth surface out of internal/api/middleware so Bundle 2 (OIDC + sessions) and the broader RBAC primitive (roles, permissions, scoped grants) have a clean home. Moved to internal/auth/: NamedAPIKey, HashAPIKey, AuthConfig, NewAuthWithNamedKeys, NewAuth, UserKey, AdminKey, GetUser, IsAdmin. Added testfixtures.go (WithActor / WithAdmin / WithActorAdmin) so handler tests don't construct context manually. Stayed in internal/api/middleware/: RequestID, Logging, NewLogging, Recovery, RateLimitConfig, NewRateLimiter (now imports auth.GetUser for per-user keying per audit Category C), CORSConfig, NewCORS, ContentType, CORS, GetRequestID, responseWriter, Chain, audit middleware (now imports auth.GetUser). Updated 22 caller files across cmd/, internal/api/handler/, internal/api/middleware/, internal/mcp/. Existing m008_admin_gate_test.go now scans for auth.IsAdmin( substring; Phase 3 will further evolve to track auth.RequirePermission. Behavior unchanged: all handler / middleware / service / connector / cmd / mcp tests pass with no test-logic edits, only import-path renames. Phase 0 exit criteria: internal/auth/ exists with 6 files; middleware.go went 575 -> 422 lines (auth-related ~150 lines moved out); grep -rE 'middleware\.(GetUser|IsAdmin|UserKey|AdminKey|NamedAPIKey|HashAPIKey|NewAuth)' returns 0 hits; context.WithValue(.*middleware.UserKey/AdminKey) returns 0 hits; go vet ./... clean; go test -short ./... green across all packages tested. Branch: dev/auth-bundle-1. Per cowork/auth-bundle-1-prompt.md, do not merge to master without (1) make verify green, (2) >= 2 external testers confirm, (3) >= 90% coverage on internal/auth/ in .github/coverage-thresholds.yml.
33 lines
1.3 KiB
Go
33 lines
1.3 KiB
Go
package auth
|
|
|
|
import "context"
|
|
|
|
// WithActor builds a context with UserKey populated, mirroring what
|
|
// NewAuthWithNamedKeys produces for a real authenticated request. Used
|
|
// by handler / service / middleware tests so they don't construct the
|
|
// context manually with internal context-key types.
|
|
//
|
|
// Phase 0 ships UserKey + AdminKey only; Phase 3 of Bundle 1 introduces
|
|
// the RBAC context (ActorIDKey, ActorTypeKey, RolesKey) and this helper
|
|
// will be extended to populate those too. Until then, admin should be
|
|
// passed via WithAdmin (separate helper below) to mirror the matched-key
|
|
// flag.
|
|
func WithActor(ctx context.Context, name string) context.Context {
|
|
return context.WithValue(ctx, UserKey{}, name)
|
|
}
|
|
|
|
// WithAdmin sets the AdminKey flag on the supplied context. Tests calling
|
|
// WithActor + WithAdmin together produce a context indistinguishable from
|
|
// what NewAuthWithNamedKeys produces for an admin-flagged NamedAPIKey.
|
|
func WithAdmin(ctx context.Context, admin bool) context.Context {
|
|
return context.WithValue(ctx, AdminKey{}, admin)
|
|
}
|
|
|
|
// WithActorAdmin is a convenience for the common "admin caller named X"
|
|
// pattern across handler tests.
|
|
func WithActorAdmin(ctx context.Context, name string, admin bool) context.Context {
|
|
ctx = WithActor(ctx, name)
|
|
ctx = WithAdmin(ctx, admin)
|
|
return ctx
|
|
}
|