Admin client certificates as an alternative to the admin token
rollcall admin-cert request NAME makes a key locally and sends a CSR; the region signs admin:NAME (client auth) and records the serial; a verified, recorded, unrevoked certificate is an admin. CLI/console read it from client.json, a .p12 is written for the browser; the web UI no longer insists on a token. Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com>
This commit is contained in:
1 parent
28a0c2952f
commit
53c05bb44d
14 files changed
+492
-12
No files matched your search
@@ -37,6 +37,8 @@ type App struct {
|
||||
|
||||
ipam ipamProvider // nil = built-in IPAM only
|
||||
ipamSt *ipamState
|
||||
|
||||
adminCC adminCertCache
|
||||
}
|
||||
|
||||
type apiError struct {
|
||||
@@ -64,7 +66,10 @@ func tokenEqual(a, b string) bool {
|
||||
|
||||
func (a *App) isAdmin(r *http.Request) bool {
|
||||
h := r.Header.Get("Authorization")
|
||||
return strings.HasPrefix(h, "Bearer ") && tokenEqual(strings.TrimPrefix(h, "Bearer "), a.cfg.AdminToken)
|
||||
if strings.HasPrefix(h, "Bearer ") && tokenEqual(strings.TrimPrefix(h, "Bearer "), a.cfg.AdminToken) {
|
||||
return true
|
||||
}
|
||||
return a.peerAdmin(r) != "" // an admin client certificate (admincert.go)
|
||||
}
|
||||
|
||||
// adminOverHTTP applies admin_http to requests that did not come over TLS.
|
||||
@@ -228,6 +233,9 @@ func (a *App) routes() http.Handler {
|
||||
mux.HandleFunc("POST /api/v1/ips", a.adminAuth(a.handleIPs))
|
||||
mux.HandleFunc("DELETE /api/v1/ips/{ip}", a.adminAuth(a.handleIPDelete))
|
||||
mux.HandleFunc("GET /api/v1/ipam", a.adminAuth(a.handleIPAM))
|
||||
mux.HandleFunc("GET /api/v1/admin-certs", a.adminAuth(a.handleAdminCerts))
|
||||
mux.HandleFunc("POST /api/v1/admin-certs", a.adminAuth(a.handleAdminCerts))
|
||||
mux.HandleFunc("DELETE /api/v1/admin-certs/{ref}", a.adminAuth(a.handleAdminCertRevoke))
|
||||
mux.HandleFunc("POST /api/v1/ipam/sync", a.adminAuth(a.handleIPAMSync))
|
||||
mux.HandleFunc("GET /api/v1/ipam/prefixes", a.adminAuth(a.handleIPAMPrefixes))
|
||||
mux.HandleFunc("POST /api/v1/ipam/prefixes", a.adminAuth(a.handleIPAMPrefixes))
|
||||
|
||||
Reference in new issue
Block a user