Skip to content

Agent Mesh

address comments reviw

Antonio Ojeaed1dafa079c1
diff --git a/internal/controlplane/mesh.go b/internal/controlplane/mesh.go
index 5d05b042..8714c25b 100644
--- a/internal/controlplane/mesh.go
+++ b/internal/controlplane/mesh.go
@@ -96,8 +96,8 @@ type P2PMeshAdapter struct {
}
func NewP2PMeshAdapter(h host.Host, ps *pubsub.PubSub, store storage.Store) (*P2PMeshAdapter, error) {
- if h == nil || ps == nil {
- return nil, fmt.Errorf("host and pubsub cannot be nil")
+ if h == nil || ps == nil || store == nil {
+ return nil, fmt.Errorf("host, pubsub, and store cannot be nil")
}
topic, err := ps.Join(api.GossipEvents)
if err != nil {
diff --git a/internal/controlplane/server.go b/internal/controlplane/server.go
index fdcbfea2..16df2db5 100644
--- a/internal/controlplane/server.go
+++ b/internal/controlplane/server.go
@@ -807,7 +807,7 @@ func (s *Server) HandlePolicies(w http.ResponseWriter, r *http.Request) {
peerID, err := identity.VerifyAndExtractPeerID(trustedKeys, biscuitBytes)
if err == nil {
nodeRecord, nodeErr := s.store.GetNode(r.Context(), peerID.String())
- if nodeErr == nil && !nodeRecord.Banned {
+ if nodeErr == nil && nodeRecord != nil && !nodeRecord.Banned {
isNode = true
}
}
@@ -1736,6 +1736,9 @@ func (s *Server) HandleUserRevoke(w http.ResponseWriter, r *http.Request) {
}
func resolveRoles(peerID string, claims jwt.MapClaims, bindings []*api.PolicyBinding) []string {
+ if claims == nil {
+ claims = make(jwt.MapClaims)
+ }
oidcRoles := toStringSlice(claims["roles"])
oidcGroups := toStringSlice(claims["groups"])
oidcSub, _ := claims["sub"].(string)
diff --git a/internal/storage/sql_store.go b/internal/storage/sql_store.go
index 8734dd69..bdce875f 100644
--- a/internal/storage/sql_store.go
+++ b/internal/storage/sql_store.go
@@ -608,6 +608,9 @@ func (s *SQLStore) SaveMeshPolicy(ctx context.Context, roles []*api.PolicyRole,
}
for _, r := range roles {
+ if r == nil {
+ continue
+ }
if _, err := tx.ExecContext(ctx, s.rebind("INSERT INTO roles (name, description, created_at) VALUES (?, '', ?)"), r.Name, time.Now().UnixMilli()); err != nil {
return err
}
@@ -629,6 +632,9 @@ func (s *SQLStore) SaveMeshPolicy(ctx context.Context, roles []*api.PolicyRole,
}
for _, b := range bindings {
+ if b == nil {
+ continue
+ }
for _, member := range b.Members {
if _, err := tx.ExecContext(ctx, s.rebind("INSERT INTO role_bindings (role_name, member) VALUES (?, ?)"), b.Role, member); err != nil {
return err