Agent Mesh
Go a2aa2a-protocolagent-meshagentic-aiinferencemcpmeshmesh-networknetwork-securitynetworking-aip2p-network
test: give bare Authorizer() calls a 5s Datalog budget
Antonio Ojeaf1399f6ce580
diff --git a/api/datalog_test.go b/api/datalog_test.goindex f7fe7c91..d9c45734 100644--- a/api/datalog_test.go+++ b/api/datalog_test.go@@ -333,7 +333,7 @@ func TestControlPlaneStaticTimeCheck(t *testing.T) {}})tok, _ := builder.Build()- authorizer, _ := tok.Authorizer(pub)+ authorizer, _ := tok.Authorizer(pub, biscuit.WithWorldOptions(datalog.WithMaxDuration(5*time.Second)))authorizer.AddFact(biscuit.Fact{Predicate: biscuit.Predicate{Name: FactTime,diff --git a/internal/controlplane/biscuit_ttl_test.go b/internal/controlplane/biscuit_ttl_test.goindex 48168f62..bf1917f4 100644--- a/internal/controlplane/biscuit_ttl_test.go+++ b/internal/controlplane/biscuit_ttl_test.go@@ -28,6 +28,7 @@ import ("github.com/biscuit-auth/biscuit-go/v2""github.com/biscuit-auth/biscuit-go/v2/parser""github.com/google/sam/api"+ "github.com/google/sam/internal/identity""github.com/google/sam/internal/storage""github.com/libp2p/go-libp2p/core/crypto""github.com/libp2p/go-libp2p/core/peer"@@ -35,14 +36,14 @@ import ()// biscuitExpiration reads the expiration() authority fact out of a minted token.-func biscuitExpiration(t *testing.T, tokenBytes []byte, cpPubKey ed25519.PublicKey) time.Time {+func biscuitExpiration(t *testing.T, tokenBytes []byte, cpPubKey ed25519.PublicKey, timeout time.Duration) time.Time {t.Helper()b, err := biscuit.Unmarshal(tokenBytes)if err != nil {t.Fatalf("malformed biscuit: %v", err)}- authorizer, err := b.Authorizer(cpPubKey)+ authorizer, err := b.Authorizer(cpPubKey, identity.AuthorizerOptions(timeout)...)if err != nil {t.Fatalf("authorizer: %v", err)}@@ -185,6 +186,7 @@ func TestBiscuitExpiryIsCappedByItsVoucher(t *testing.T) {t.Helper()srv, store, cpURL := setupTestServer(t, issuer, func(o *Options) {o.BiscuitTTL = ttl+ o.BiscuitTimeout = 5 * time.Second})t.Cleanup(func() {_ = srv.Close()@@ -199,29 +201,29 @@ func TestBiscuitExpiryIsCappedByItsVoucher(t *testing.T) {}t.Run("register clamps to the OIDC token when it expires first", func(t *testing.T) {- _, _, cpURL := start(t, 24*time.Hour)+ srv, _, cpURL := start(t, 24*time.Hour)oidcExpiry := time.Now().Add(10 * time.Minute)_, _, resp := registerNode(t, cpURL, newJWT(10*time.Minute))cpPubKey := ed25519.PublicKey(resp.ControlPlanePublicKey)- assertNear(t, "biscuit expiration()", biscuitExpiration(t, resp.BiscuitToken, cpPubKey), oidcExpiry)+ assertNear(t, "biscuit expiration()", biscuitExpiration(t, resp.BiscuitToken, cpPubKey, srv.config.BiscuitTimeout), oidcExpiry)assertNear(t, "EnrollResponse.Expiration", time.Unix(resp.Expiration, 0), oidcExpiry)})t.Run("register uses the configured TTL when it expires first", func(t *testing.T) {- _, _, cpURL := start(t, 5*time.Minute)+ srv, _, cpURL := start(t, 5*time.Minute)want := time.Now().Add(5 * time.Minute)_, _, resp := registerNode(t, cpURL, newJWT(time.Hour))cpPubKey := ed25519.PublicKey(resp.ControlPlanePublicKey)- assertNear(t, "biscuit expiration()", biscuitExpiration(t, resp.BiscuitToken, cpPubKey), want)+ assertNear(t, "biscuit expiration()", biscuitExpiration(t, resp.BiscuitToken, cpPubKey, srv.config.BiscuitTimeout), want)assertNear(t, "EnrollResponse.Expiration", time.Unix(resp.Expiration, 0), want)})t.Run("refresh clamps to the end of the OIDC session", func(t *testing.T) {- _, store, cpURL := start(t, 24*time.Hour)+ srv, store, cpURL := start(t, 24*time.Hour)priv, peerID, resp := registerNode(t, cpURL, newJWT(time.Hour))cpPubKey := ed25519.PublicKey(resp.ControlPlanePublicKey)@@ -237,12 +239,12 @@ func TestBiscuitExpiryIsCappedByItsVoucher(t *testing.T) {}refreshed := refreshNode(t, cpURL, priv, resp.BiscuitToken)- assertNear(t, "refreshed biscuit expiration()", biscuitExpiration(t, refreshed.BiscuitToken, cpPubKey), sessionEnd)+ assertNear(t, "refreshed biscuit expiration()", biscuitExpiration(t, refreshed.BiscuitToken, cpPubKey, srv.config.BiscuitTimeout), sessionEnd)assertNear(t, "TokenRefreshResponse.ExpiresAt", time.Unix(refreshed.ExpiresAt, 0), sessionEnd)})t.Run("refresh uses the configured TTL when the session never expires", func(t *testing.T) {- _, store, cpURL := start(t, 30*time.Minute)+ srv, store, cpURL := start(t, 30*time.Minute)priv, peerID, resp := registerNode(t, cpURL, newJWT(time.Hour))cpPubKey := ed25519.PublicKey(resp.ControlPlanePublicKey)@@ -258,6 +260,6 @@ func TestBiscuitExpiryIsCappedByItsVoucher(t *testing.T) {want := time.Now().Add(30 * time.Minute)refreshed := refreshNode(t, cpURL, priv, resp.BiscuitToken)- assertNear(t, "refreshed biscuit expiration()", biscuitExpiration(t, refreshed.BiscuitToken, cpPubKey), want)+ assertNear(t, "refreshed biscuit expiration()", biscuitExpiration(t, refreshed.BiscuitToken, cpPubKey, srv.config.BiscuitTimeout), want)})}diff --git a/internal/identity/attenuation_test.go b/internal/identity/attenuation_test.goindex 15f82da3..4bbbe97d 100644--- a/internal/identity/attenuation_test.go+++ b/internal/identity/attenuation_test.go@@ -77,7 +77,7 @@ func TestAttenuationBlockFactsAreInvisibleToTheAuthorizer(t *testing.T) {t.Fatalf("appended block count = %d, want 1", attenuated.BlockCount())}- authorizer, err := attenuated.Authorizer(pub)+ authorizer, err := attenuated.Authorizer(pub, AuthorizerOptions(5*time.Second)...)if err != nil {t.Fatalf("Authorizer: %v", err)}diff --git a/internal/identity/biscuit_test.go b/internal/identity/biscuit_test.goindex cde10414..3b5f6190 100644--- a/internal/identity/biscuit_test.go+++ b/internal/identity/biscuit_test.go@@ -360,7 +360,7 @@ func TestMintBiscuitToken_VariousClaimsTypes(t *testing.T) {t.Fatalf("Unmarshal biscuit failed: %v", err)}- authorizer, err := b.Authorizer(pub)+ authorizer, err := b.Authorizer(pub, AuthorizerOptions(5*time.Second)...)if err != nil {t.Fatalf("Authorizer failed: %v", err)}@@ -439,7 +439,7 @@ func TestMintBiscuitToken_WithPolicyRoles(t *testing.T) {t.Fatalf("Unmarshal biscuit failed: %v", err)}- authorizer, err := b.Authorizer(pub)+ authorizer, err := b.Authorizer(pub, AuthorizerOptions(5*time.Second)...)if err != nil {t.Fatalf("Authorizer failed: %v", err)}@@ -468,7 +468,7 @@ func TestMintBiscuitToken_WithPolicyRoles(t *testing.T) {t.Fatalf("Unmarshal biscuit failed: %v", err)}- authorizer, err := b.Authorizer(pub)+ authorizer, err := b.Authorizer(pub, AuthorizerOptions(5*time.Second)...)if err != nil {t.Fatalf("Authorizer failed: %v", err)}@@ -504,7 +504,7 @@ func TestMintBiscuitToken_LabelFacts(t *testing.T) {// Every declared label is present as its own fact.for k, v := range labels {- authorizer, err := b.Authorizer(pub)+ authorizer, err := b.Authorizer(pub, AuthorizerOptions(5*time.Second)...)if err != nil {t.Fatalf("Authorizer failed: %v", err)}@@ -526,7 +526,7 @@ func TestMintBiscuitToken_LabelFacts(t *testing.T) {if err != nil {t.Fatalf("Unmarshal biscuit failed: %v", err)}- authorizer, err := b2.Authorizer(pub)+ authorizer, err := b2.Authorizer(pub, AuthorizerOptions(5*time.Second)...)if err != nil {t.Fatalf("Authorizer failed: %v", err)}diff --git a/tests/integration/policy_grants_test.go b/tests/integration/policy_grants_test.goindex 70e7019b..f755c21c 100644--- a/tests/integration/policy_grants_test.go+++ b/tests/integration/policy_grants_test.go@@ -30,6 +30,7 @@ import ("github.com/biscuit-auth/biscuit-go/v2""github.com/biscuit-auth/biscuit-go/v2/parser""github.com/google/sam/api"+ "github.com/google/sam/internal/identity""github.com/libp2p/go-libp2p/core/crypto""github.com/libp2p/go-libp2p/core/peer""google.golang.org/protobuf/proto"@@ -271,7 +272,7 @@ func authorizeToken(t *testing.T, tokenBytes []byte, pub ed25519.PublicKey) biscif err != nil {t.Fatalf("unmarshal biscuit: %v", err)}- authorizer, err := b.Authorizer(pub)+ authorizer, err := b.Authorizer(pub, identity.AuthorizerOptions(5*time.Second)...)if err != nil {t.Fatalf("authorizer: %v", err)}