Skip to content

Agent Mesh

hub check expration time on tokens

Antonio Ojea7eaf6806e821
diff --git a/cmd/sam-hub/main.go b/cmd/sam-hub/main.go
index 7027141a..6128fa2d 100644
--- a/cmd/sam-hub/main.go
+++ b/cmd/sam-hub/main.go
@@ -865,6 +865,20 @@ func (h *Hub) verifyBiscuit(biscuitData []byte, remotePeer peer.ID) (*biscuit.Bi
continue
}
+ authorizer.AddFact(biscuit.Fact{
+ Predicate: biscuit.Predicate{
+ Name: "time",
+ IDs: []biscuit.Term{biscuit.Date(time.Now())},
+ },
+ })
+
+ timeCheck, err := parser.FromStringCheck(`check if time($time), expiration($exp), $time <= $exp`)
+ if err != nil {
+ lastErr = err
+ continue
+ }
+ authorizer.AddCheck(timeCheck)
+
rule, err := parser.FromStringPolicy("allow if true")
if err != nil {
lastErr = err
diff --git a/cmd/sam-hub/main_test.go b/cmd/sam-hub/main_test.go
index 47df075c..3b089460 100644
--- a/cmd/sam-hub/main_test.go
+++ b/cmd/sam-hub/main_test.go
@@ -270,3 +270,69 @@ func TestHandleInfoHTTP(t *testing.T) {
t.Errorf("Expected audience 'test-audience-1', got %q", info.Audience)
}
}
+
+func TestVerifyBiscuit_Expiration(t *testing.T) {
+ dir := t.TempDir()
+ dbPath := filepath.Join(dir, "test.db")
+
+ kr, err := NewKeyRing(dbPath, 24*time.Hour, nil)
+ if err != nil {
+ t.Fatal(err)
+ }
+ defer func() { _ = kr.Close() }()
+
+ hub := &Hub{
+ KeyRing: kr,
+ Policy: &api.PolicyConfig{},
+ }
+
+ priv, _, err := crypto.GenerateKeyPair(crypto.Ed25519, -1)
+ if err != nil {
+ t.Fatal(err)
+ }
+ dummyPeer, err := peer.IDFromPrivateKey(priv)
+ if err != nil {
+ t.Fatal(err)
+ }
+
+ tests := []struct {
+ name string
+ expiry time.Time
+ expectError bool
+ }{
+ {
+ name: "Valid unexpired token",
+ expiry: time.Now().Add(1 * time.Hour),
+ expectError: false,
+ },
+ {
+ name: "Expired token",
+ expiry: time.Now().Add(-1 * time.Hour),
+ expectError: true,
+ },
+ }
+
+ for _, tt := range tests {
+ t.Run(tt.name, func(t *testing.T) {
+ token := &oidc.IDToken{
+ Expiry: tt.expiry,
+ }
+ claims := jwt.MapClaims{
+ "roles": []any{"admin"},
+ }
+
+ biscuitData, err := hub.mintBiscuitToken(claims, token, dummyPeer)
+ if err != nil {
+ t.Fatalf("mintBiscuitToken failed: %v", err)
+ }
+
+ _, err = hub.verifyBiscuit(biscuitData, dummyPeer)
+ if tt.expectError && err == nil {
+ t.Errorf("Expected error due to expiration, got nil")
+ }
+ if !tt.expectError && err != nil {
+ t.Errorf("Expected no error, got: %v", err)
+ }
+ })
+ }
+}