Skip to content

Agent Mesh

Fix race condition in router lease verify by retrieving exact verifying key

Antonio Ojea73a8673dc0d0
diff --git a/internal/controlplane/server.go b/internal/controlplane/server.go
index ec563118..b395e8d3 100644
--- a/internal/controlplane/server.go
+++ b/internal/controlplane/server.go
@@ -657,7 +657,7 @@ func (s *Server) HandleRouterLease(w http.ResponseWriter, r *http.Request) {
}
// Verify Biscuit and enforce expected remote peer id
- b, err := identity.VerifyBiscuit(req.Biscuit, pID, cpPubKeys, s.config.BiscuitTimeout)
+ b, verifyingKey, err := identity.VerifyBiscuitAndGetKey(req.Biscuit, pID, cpPubKeys, s.config.BiscuitTimeout)
if err != nil {
logger.Warnf("Router %s failed biscuit verification: %v", req.PeerId, err)
http.Error(w, "Biscuit verification failed: "+err.Error(), http.StatusUnauthorized)
@@ -665,7 +665,7 @@ func (s *Server) HandleRouterLease(w http.ResponseWriter, r *http.Request) {
}
// Enforce role("router") or role("bootstrap") inside the biscuit
- authorizer, err := b.Authorizer(cpPubKeys[0]) // First public key is generally the current one, but biscuit-go handles matches internally
+ authorizer, err := b.Authorizer(verifyingKey)
if err != nil {
http.Error(w, "Internal authorizer error", http.StatusInternalServerError)
return
@@ -681,7 +681,7 @@ func (s *Server) HandleRouterLease(w http.ResponseWriter, r *http.Request) {
authorizer.AddPolicy(api.AllowIfTruePolicy)
if err := authorizer.Authorize(); err != nil {
- logger.Warnf("Router %s lacks router role in its biscuit: %v", req.PeerId, err)
+ logger.Warnf("Router %s lacks router role in its biscuit: %v\nWorld state:\n%s", req.PeerId, err, authorizer.PrintWorld())
http.Error(w, "Unauthorized: entity is not a router", http.StatusForbidden)
return
}
diff --git a/internal/identity/biscuit.go b/internal/identity/biscuit.go
index c02c1c6c..b6d1eb5c 100644
--- a/internal/identity/biscuit.go
+++ b/internal/identity/biscuit.go
@@ -373,9 +373,14 @@ func mintBiscuit(signingKey ed25519.PrivateKey, remotePeer peer.ID, roles []stri
// 2. The token is not expired.
// 3. The token is securely bound to the expected remotePeer.
func VerifyBiscuit(biscuitData []byte, expectedPeer peer.ID, trustedPublicKeys []ed25519.PublicKey, timeout time.Duration) (*biscuit.Biscuit, error) {
+ b, _, err := VerifyBiscuitAndGetKey(biscuitData, expectedPeer, trustedPublicKeys, timeout)
+ return b, err
+}
+
+func VerifyBiscuitAndGetKey(biscuitData []byte, expectedPeer peer.ID, trustedPublicKeys []ed25519.PublicKey, timeout time.Duration) (*biscuit.Biscuit, ed25519.PublicKey, error) {
b, err := biscuit.Unmarshal(biscuitData)
if err != nil {
- return nil, fmt.Errorf("malformed biscuit: %w", err)
+ return nil, nil, fmt.Errorf("malformed biscuit: %w", err)
}
var authOpts []biscuit.AuthorizerOption
@@ -385,6 +390,7 @@ func VerifyBiscuit(biscuitData []byte, expectedPeer peer.ID, trustedPublicKeys [
var lastErr error
var authorized bool
+ var verifyingKey ed25519.PublicKey
for _, pubKey := range trustedPublicKeys {
authorizer, err := b.Authorizer(pubKey, authOpts...)
if err != nil {
@@ -404,6 +410,7 @@ func VerifyBiscuit(biscuitData []byte, expectedPeer peer.ID, trustedPublicKeys [
if err := authorizer.Authorize(); err == nil {
authorized = true
+ verifyingKey = pubKey
break
} else {
lastErr = err
@@ -411,7 +418,7 @@ func VerifyBiscuit(biscuitData []byte, expectedPeer peer.ID, trustedPublicKeys [
}
if !authorized {
- return nil, fmt.Errorf("no valid key found for verification: %v", lastErr)
+ return nil, nil, fmt.Errorf("no valid key found for verification: %v", lastErr)
}
// Enforce hardware binding
@@ -420,10 +427,10 @@ func VerifyBiscuit(biscuitData []byte, expectedPeer peer.ID, trustedPublicKeys [
IDs: []biscuit.Term{biscuit.String(expectedPeer.String())},
}}
if _, err := b.GetBlockID(boundFact); err != nil {
- return nil, fmt.Errorf("token is not bound to peer %s: %w", expectedPeer, err)
+ return nil, nil, fmt.Errorf("token is not bound to peer %s: %w", expectedPeer, err)
}
- return b, nil
+ return b, verifyingKey, nil
}
func translateClaimsToFacts(addFact func(biscuit.Fact) error, claims map[string]any) error {