Skip to content

Agent Mesh

Deflake hub test

Antonio Ojea07dffaaa9429
diff --git a/cmd/sam-hub/main.go b/cmd/sam-hub/main.go
index 6e2177d1..e3e84263 100644
--- a/cmd/sam-hub/main.go
+++ b/cmd/sam-hub/main.go
@@ -39,6 +39,7 @@ import (
"time"
"github.com/biscuit-auth/biscuit-go/v2"
+ "github.com/biscuit-auth/biscuit-go/v2/datalog"
"github.com/biscuit-auth/biscuit-go/v2/parser"
"github.com/coreos/go-oidc/v3/oidc"
"github.com/golang-jwt/jwt/v5"
@@ -162,6 +163,7 @@ type Hub struct {
ExternalAddrs []string
AllowedAudiences []string
AllowLoopback bool
+ BiscuitTimeout time.Duration
authenticatedPeers sync.Map
}
@@ -856,10 +858,15 @@ func (h *Hub) verifyBiscuit(biscuitData []byte, remotePeer peer.ID) (*biscuit.Bi
return nil, fmt.Errorf("malformed biscuit: %w", err)
}
+ var authOpts []biscuit.AuthorizerOption
+ if h.BiscuitTimeout > 0 {
+ authOpts = append(authOpts, biscuit.WithWorldOptions(datalog.WithMaxDuration(h.BiscuitTimeout)))
+ }
+
keys := h.KeyRing.GetAllValidPublicKeys()
var lastErr error
for _, pubKey := range keys {
- authorizer, err := b.Authorizer(pubKey)
+ authorizer, err := b.Authorizer(pubKey, authOpts...)
if err != nil {
lastErr = err
continue
diff --git a/cmd/sam-hub/main_test.go b/cmd/sam-hub/main_test.go
index 6274c154..85652f05 100644
--- a/cmd/sam-hub/main_test.go
+++ b/cmd/sam-hub/main_test.go
@@ -282,8 +282,9 @@ func TestVerifyBiscuit_Expiration(t *testing.T) {
defer func() { _ = kr.Close() }()
hub := &Hub{
- KeyRing: kr,
- Policy: &api.PolicyConfig{},
+ KeyRing: kr,
+ Policy: &api.PolicyConfig{},
+ BiscuitTimeout: 500 * time.Millisecond,
}
priv, _, err := crypto.GenerateKeyPair(crypto.Ed25519, -1)