978334a4bc
Implements the v0.12 R-021 load-bearing change's working IdP path: - orca auth init-idp: renders Dex config + systemd unit + Traefik route (atomic deploy, RP ID from --rp-id, C-38) - orca auth register: opens browser to WebAuthn registration page - loadOIDCConfig: config-file loading (oidc block + cluster_domain), falls back to flags + env vars - orca doctor oidc: health check (systemctl is-active + .well-known) - config.go: OIDCConfig block + ClusterDomain field - markdown.go: oidc block parsing in config frontmatter ---ci--- project: orca phase: 6 milestone: v0.13 status: complete requirements: covered: [155] ---/ci---
227 lines
6.4 KiB
Go
227 lines
6.4 KiB
Go
package config
|
|
|
|
import (
|
|
"fmt"
|
|
"os"
|
|
"strings"
|
|
|
|
"github.com/hashicorp/hcl/v2/hclsimple"
|
|
)
|
|
|
|
type CapacityConfig struct {
|
|
CPU int `hcl:"cpu,optional"`
|
|
MemoryMB int `hcl:"memory_mb,optional"`
|
|
}
|
|
|
|
type Config struct {
|
|
DBPath string `hcl:"db_path,optional"`
|
|
ListenAddr string `hcl:"listen_addr,optional"`
|
|
CAPath string `hcl:"ca_path,optional"`
|
|
ServerCertPath string `hcl:"server_cert_path,optional"`
|
|
ServerKeyPath string `hcl:"server_key_path,optional"`
|
|
NodeCapacity *CapacityConfig `hcl:"node_capacity,block"`
|
|
|
|
// OIDC is the OIDC client config block (P06, v0.13; R-021). The
|
|
// bundled Dex (deployed by `orca auth init-idp`) is the default
|
|
// issuer; an explicit oidc.issuer here repoints the CLI to a BYO
|
|
// external IdP. loadOIDCConfig reads this block before falling back
|
|
// to --issuer/--client-id flags and env vars.
|
|
OIDC *OIDCConfig `hcl:"oidc,block"`
|
|
|
|
// ClusterDomain is the cluster's Traefik-served domain (C-38). It
|
|
// is the WebAuthn relying-party ID default and the Dex issuer host.
|
|
// May be overridden by --rp-id on `orca auth init-idp`.
|
|
ClusterDomain string `hcl:"cluster_domain,optional"`
|
|
|
|
// ACL is the access-control config block (P04, v0.13; C-45).
|
|
// When ACL.Enforce is false (the default for the first run after
|
|
// P04 wiring), ACL denials are LOGGED but NOT enforced — the
|
|
// request proceeds. The operator switches to true after verifying
|
|
// the bootstrap ACL.
|
|
ACL *ACLConfig `hcl:"acl,block"`
|
|
}
|
|
|
|
// ACLConfig is the acl block in config (P04, C-45).
|
|
type ACLConfig struct {
|
|
// Enforce controls whether ACL denials return 403 (true) or are
|
|
// logged but allowed (false, the staged-rollout default).
|
|
Enforce bool `hcl:"enforce,optional"`
|
|
}
|
|
|
|
// OIDCConfig is the oidc block in config (P06, R-021). Mirrors
|
|
// identity.OIDCConfig (kept separate to avoid an internal/config ->
|
|
// internal/identity dependency cycle).
|
|
type OIDCConfig struct {
|
|
Issuer string `hcl:"issuer,optional"`
|
|
ClientID string `hcl:"client_id,optional"`
|
|
ClientSecret string `hcl:"client_secret,optional"`
|
|
Scopes []string `hcl:"scopes,optional"`
|
|
}
|
|
|
|
type Flags struct {
|
|
DBPath *string
|
|
ListenAddr *string
|
|
CAPath *string
|
|
ServerCertPath *string
|
|
ServerKeyPath *string
|
|
CPU *int
|
|
MemoryMB *int
|
|
}
|
|
|
|
type Environ map[string]string
|
|
|
|
// Load is the config dispatcher (R-014). It tries each path in order,
|
|
// skipping missing files, and dispatches to the appropriate loader
|
|
// based on file extension: .hcl → LoadHCL (legacy, R-013),
|
|
// .md → LoadMarkdown (new Markdown-frontmatter loader), and
|
|
// .yaml/.yml → LoadMarkdown with an empty body. The first successfully
|
|
// decoded file wins. If no path exists or decodes, a zero Config is
|
|
// returned.
|
|
//
|
|
// The signature is preserved from the v0.8 single-loader API so
|
|
// internal/cli/root.go requires no changes yet.
|
|
func Load(paths ...string) (*Config, error) {
|
|
for _, p := range paths {
|
|
if _, err := os.Stat(p); err != nil {
|
|
continue
|
|
}
|
|
cfg, err := loadByExtension(p)
|
|
if err != nil {
|
|
return nil, err
|
|
}
|
|
return cfg, nil
|
|
}
|
|
return &Config{}, nil
|
|
}
|
|
|
|
func loadByExtension(p string) (*Config, error) {
|
|
ext := strings.ToLower(filepathExt(p))
|
|
switch ext {
|
|
case ".hcl":
|
|
return LoadHCL(p)
|
|
case ".md", ".markdown":
|
|
return LoadMarkdown(p)
|
|
case ".yaml", ".yml":
|
|
return LoadMarkdownYAML(p)
|
|
default:
|
|
// Unknown extension: hclsimple.Decode rejects non-.hcl
|
|
// suffixes, so for backward compat with the v0.8 single-loader
|
|
// behavior (which assumed HCL), decode the file content as HCL
|
|
// against a synthesized .hcl path.
|
|
data, err := os.ReadFile(p)
|
|
if err != nil {
|
|
return nil, fmt.Errorf("read config %s: %w", p, err)
|
|
}
|
|
var cfg Config
|
|
if err := hclsimple.Decode(p+".hcl", data, nil, &cfg); err != nil {
|
|
return nil, fmt.Errorf("decode config %s: %w", p, err)
|
|
}
|
|
return &cfg, nil
|
|
}
|
|
}
|
|
|
|
// filepathExt is a thin wrapper around filepath.Ext to keep the import
|
|
// localized to the dispatcher. Returns the extension including the dot,
|
|
// lowercased by the caller.
|
|
func filepathExt(p string) string {
|
|
i := strings.LastIndex(p, ".")
|
|
if i < 0 {
|
|
return ""
|
|
}
|
|
return p[i:]
|
|
}
|
|
|
|
// LoadHCL decodes a legacy HCL config file (R-013).
|
|
//
|
|
// Deprecated: use LoadMarkdown or the dispatcher. HCL is legacy per
|
|
// R-013. Retained for the v0.9 dual-write window (REQ-090); new
|
|
// deployments should author config.md with YAML frontmatter.
|
|
func LoadHCL(path string) (*Config, error) {
|
|
data, err := os.ReadFile(path)
|
|
if err != nil {
|
|
return nil, fmt.Errorf("read config %s: %w", path, err)
|
|
}
|
|
var cfg Config
|
|
if err := hclsimple.Decode(path, data, nil, &cfg); err != nil {
|
|
return nil, fmt.Errorf("decode config %s: %w", path, err)
|
|
}
|
|
return &cfg, nil
|
|
}
|
|
|
|
func (c *Config) MergeOverrides(flags Flags, env Environ) *Config {
|
|
out := &Config{
|
|
DBPath: c.DBPath,
|
|
ListenAddr: c.ListenAddr,
|
|
CAPath: c.CAPath,
|
|
ServerCertPath: c.ServerCertPath,
|
|
ServerKeyPath: c.ServerKeyPath,
|
|
NodeCapacity: c.NodeCapacity,
|
|
OIDC: c.OIDC,
|
|
ClusterDomain: c.ClusterDomain,
|
|
}
|
|
|
|
applyStr := func(flag *string, envKey, fileVal string) string {
|
|
if flag != nil {
|
|
return *flag
|
|
}
|
|
if v, ok := env[envKey]; ok && v != "" {
|
|
return v
|
|
}
|
|
return fileVal
|
|
}
|
|
|
|
out.DBPath = applyStr(flags.DBPath, "ORCA_DB", out.DBPath)
|
|
out.ListenAddr = applyStr(flags.ListenAddr, "ORCA_LISTEN_ADDR", out.ListenAddr)
|
|
out.CAPath = applyStr(flags.CAPath, "ORCA_CA_PATH", out.CAPath)
|
|
out.ServerCertPath = applyStr(flags.ServerCertPath, "ORCA_SERVER_CERT_PATH", out.ServerCertPath)
|
|
out.ServerKeyPath = applyStr(flags.ServerKeyPath, "ORCA_SERVER_KEY_PATH", out.ServerKeyPath)
|
|
|
|
if out.NodeCapacity == nil {
|
|
out.NodeCapacity = &CapacityConfig{}
|
|
} else {
|
|
nc := *out.NodeCapacity
|
|
out.NodeCapacity = &nc
|
|
}
|
|
|
|
if flags.CPU != nil {
|
|
out.NodeCapacity.CPU = *flags.CPU
|
|
} else if v, ok := env["ORCA_NODE_CPU"]; ok && v != "" {
|
|
if n, err := atoi(v); err == nil {
|
|
out.NodeCapacity.CPU = n
|
|
}
|
|
}
|
|
|
|
if flags.MemoryMB != nil {
|
|
out.NodeCapacity.MemoryMB = *flags.MemoryMB
|
|
} else if v, ok := env["ORCA_NODE_MEMORY_MB"]; ok && v != "" {
|
|
if n, err := atoi(v); err == nil {
|
|
out.NodeCapacity.MemoryMB = n
|
|
}
|
|
}
|
|
|
|
return out
|
|
}
|
|
|
|
func atoi(s string) (int, error) {
|
|
n := 0
|
|
if s == "" {
|
|
return 0, fmt.Errorf("empty")
|
|
}
|
|
neg := false
|
|
i := 0
|
|
if s[0] == '-' {
|
|
neg = true
|
|
i = 1
|
|
}
|
|
for ; i < len(s); i++ {
|
|
if s[i] < '0' || s[i] > '9' {
|
|
return 0, fmt.Errorf("bad")
|
|
}
|
|
n = n*10 + int(s[i]-'0')
|
|
}
|
|
if neg {
|
|
n = -n
|
|
}
|
|
return n, nil
|
|
}
|