Agent Mesh
Go a2aa2a-protocolagent-meshagentic-aiinferencemcpmeshmesh-networknetwork-securitynetworking-aip2p-network
fix key initialization bug
Antonio Ojea8e4dc91fb1e3
diff --git a/cmd/sam-hub/keyring.go b/cmd/sam-hub/keyring.goindex e078cbdd..70f1cc6f 100644--- a/cmd/sam-hub/keyring.go+++ b/cmd/sam-hub/keyring.go@@ -15,6 +15,7 @@package mainimport (+ "bytes""crypto/ed25519""crypto/rand""encoding/json"@@ -41,7 +42,7 @@ type KeyRing struct {}// NewKeyRing opens or creates a BoltDB file to store the keyring.-func NewKeyRing(dbPath string, gracePeriod time.Duration) (*KeyRing, error) {+func NewKeyRing(dbPath string, gracePeriod time.Duration, initialSeed []byte) (*KeyRing, error) {db, err := bbolt.Open(dbPath, 0600, nil)if err != nil {return nil, fmt.Errorf("failed to open db: %w", err)@@ -63,8 +64,29 @@ func NewKeyRing(dbPath string, gracePeriod time.Duration) (*KeyRing, error) {return nil, fmt.Errorf("failed to load keyring: %w", err)}- // Generate initial key if empty- if len(kr.Current.Private) == 0 {+ if len(initialSeed) > 0 {+ if len(initialSeed) != ed25519.SeedSize {+ _ = db.Close()+ return nil, fmt.Errorf("invalid seed size: %d, expected %d", len(initialSeed), ed25519.SeedSize)+ }+ priv := ed25519.NewKeyFromSeed(initialSeed)+ pub := priv.Public().(ed25519.PublicKey)++ if !bytes.Equal(kr.Current.Private, priv) {+ if len(kr.Current.Private) > 0 {+ kr.Current.Expiration = time.Now().Add(gracePeriod)+ kr.Previous = append(kr.Previous, kr.Current)+ }+ kr.Current = KeyPair{+ Private: priv,+ Public: pub,+ }+ if err := kr.save(); err != nil {+ _ = db.Close()+ return nil, fmt.Errorf("failed to save initial key: %w", err)+ }+ }+ } else if len(kr.Current.Private) == 0 {if err := kr.rotate(gracePeriod); err != nil {_ = db.Close()return nil, fmt.Errorf("failed to generate initial key: %w", err)diff --git a/cmd/sam-hub/keyring_test.go b/cmd/sam-hub/keyring_test.goindex a4ac32a0..af4e31a8 100644--- a/cmd/sam-hub/keyring_test.go+++ b/cmd/sam-hub/keyring_test.go@@ -25,7 +25,7 @@ func TestNewKeyRing(t *testing.T) {dir := t.TempDir()dbPath := filepath.Join(dir, "test.db")- kr, err := NewKeyRing(dbPath, 24*time.Hour)+ kr, err := NewKeyRing(dbPath, 24*time.Hour, nil)if err != nil {t.Fatal(err)}@@ -43,7 +43,7 @@ func TestKeyRingRotate(t *testing.T) {dir := t.TempDir()dbPath := filepath.Join(dir, "test.db")- kr, err := NewKeyRing(dbPath, 24*time.Hour)+ kr, err := NewKeyRing(dbPath, 24*time.Hour, nil)if err != nil {t.Fatal(err)}@@ -72,7 +72,7 @@ func TestKeyRingPersistence(t *testing.T) {dir := t.TempDir()dbPath := filepath.Join(dir, "test.db")- kr, err := NewKeyRing(dbPath, 24*time.Hour)+ kr, err := NewKeyRing(dbPath, 24*time.Hour, nil)if err != nil {t.Fatal(err)}@@ -81,7 +81,7 @@ func TestKeyRingPersistence(t *testing.T) {_ = kr.Close()// Reopen- kr2, err := NewKeyRing(dbPath, 24*time.Hour)+ kr2, err := NewKeyRing(dbPath, 24*time.Hour, nil)if err != nil {t.Fatal(err)}@@ -96,7 +96,7 @@ func TestKeyRingCleanup(t *testing.T) {dir := t.TempDir()dbPath := filepath.Join(dir, "test.db")- kr, err := NewKeyRing(dbPath, 1*time.Millisecond) // Short grace period+ kr, err := NewKeyRing(dbPath, 1*time.Millisecond, nil) // Short grace periodif err != nil {t.Fatal(err)}diff --git a/cmd/sam-hub/main.go b/cmd/sam-hub/main.goindex 2865ff56..2ef015c8 100644--- a/cmd/sam-hub/main.go+++ b/cmd/sam-hub/main.go@@ -18,6 +18,7 @@ import ("context""crypto/ed25519""crypto/tls"+ "encoding/hex""fmt""net/http""os"@@ -147,7 +148,15 @@ func NewHub(ctx context.Context, policy *api.PolicyConfig) (*Hub, error) {logger.Infof("[OIDC] Trusted issuer: %s", iss)}- kr, err := NewKeyRing(keysDBPath, keyGracePeriod)+ var initialSeed []byte+ if biscuitHex != "" {+ var err error+ initialSeed, err = hex.DecodeString(biscuitHex)+ if err != nil {+ return nil, fmt.Errorf("failed to decode key flag: %w", err)+ }+ }+ kr, err := NewKeyRing(keysDBPath, keyGracePeriod, initialSeed)if err != nil {return nil, fmt.Errorf("failed to create keyring: %w", err)}