Wire tenant_roles as explicit opt-in configuration
All checks were successful
Build and Publish Container Image / build-and-push (push) Successful in 48s
All checks were successful
Build and Publish Container Image / build-and-push (push) Successful in 48s
Closes gap G07. The tenant-engine client and TokenHandler.TenantEngine were implemented and tested, but main.go supplied no client and exposed no configuration, so the stock executable left the field nil and the capability existed at library level only. A tenantEngine block with baseURL and an optional timeout now wires it. An empty baseURL leaves the stock server's behaviour exactly as it was, so enabling the claim is a deliberate act. Validation treats a configured source as one that must work: http/https with a host, and a timeout in (0, 10s] since it sits on the synchronous token-issuance path. A timeout set without a baseURL is rejected rather than ignored -- it means someone expected the claim to be on. Verified in the built executable, which is what G07 asks for, rather than at the wiring: against a stub source a real token carries tenant_roles; with no block the claim is absent; with the source configured but down, issuance succeeds without it, confirming the documented fail-open path end to end. Co-Authored-By: Claude Opus 5 <noreply@anthropic.com> Claude-Session: https://claude.ai/code/session_01NV9oijZukGyGbRQGGKnK4P Assistant: claude-code Assistant-Model: opus Assistant-Process: 713576@bnt-lap001 Assistant-Session: 384c511d-9bce-4cb8-a676-2aef6c0c8df6
This commit is contained in:
parent
01551d9b0a
commit
a0f3cac122
7 changed files with 163 additions and 3 deletions
|
|
@ -21,6 +21,7 @@ import (
|
|||
"keycape/internal/adapters/authelia"
|
||||
"keycape/internal/adapters/lldap"
|
||||
"keycape/internal/adapters/privacyidea"
|
||||
"keycape/internal/adapters/tenantengine"
|
||||
"keycape/internal/authclient"
|
||||
"keycape/internal/config"
|
||||
"keycape/internal/domain"
|
||||
|
|
@ -178,6 +179,11 @@ func main() {
|
|||
Issuer: issuer,
|
||||
TokenLifetime: tokenLifetime,
|
||||
Emitter: emitter,
|
||||
// Opt-in: nil unless tenantEngine.baseURL is configured, which is what
|
||||
// leaves tenant_roles off the stock server (KEY-WP-0024). The adapter
|
||||
// fails open, so a configured-but-unreachable cache omits the claim
|
||||
// rather than failing issuance.
|
||||
TenantEngine: buildTenantEngine(cfg.TenantEngine),
|
||||
}
|
||||
mux.Handle("/token", enforcement.Middleware(tokenHandler))
|
||||
|
||||
|
|
@ -320,3 +326,18 @@ func withEmitter(next http.Handler, e telemetry.Emitter) http.Handler {
|
|||
next.ServeHTTP(w, r.WithContext(ctx))
|
||||
})
|
||||
}
|
||||
|
||||
// buildTenantEngine returns the tenant_roles cache client, or nil when the
|
||||
// claim is not configured. Validation has already accepted the URL and timeout.
|
||||
func buildTenantEngine(cfg config.TenantEngineConfig) *tenantengine.Client {
|
||||
if cfg.BaseURL == "" {
|
||||
return nil
|
||||
}
|
||||
var httpClient *http.Client
|
||||
if cfg.Timeout != "" {
|
||||
if timeout, err := time.ParseDuration(cfg.Timeout); err == nil {
|
||||
httpClient = &http.Client{Timeout: timeout}
|
||||
}
|
||||
}
|
||||
return tenantengine.New(cfg.BaseURL, httpClient)
|
||||
}
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue