Agent Mesh
Go a2aa2a-protocolagent-meshagentic-aiinferencemcpmeshmesh-networknetwork-securitynetworking-aip2p-network
fix(controlplane, storage): add policy validation and rows.Err checks
Antonio Ojea12ec0c69a506
diff --git a/internal/controlplane/server.go b/internal/controlplane/server.goindex 82efda8d..7c1283de 100644--- a/internal/controlplane/server.go+++ b/internal/controlplane/server.go@@ -371,7 +371,7 @@ func (s *Server) HandleRegister(w http.ResponseWriter, r *http.Request) {finalRoles = append(finalRoles, customAccessRoles...)policyRoles, _, err := s.store.GetMeshPolicy(ctx)- if err != nil {+ if err != nil && err != storage.ErrNotFound {logger.Errorf("Failed to retrieve mesh policy: %v", err)http.Error(w, "Internal server error", http.StatusInternalServerError)return@@ -595,7 +595,7 @@ func (s *Server) HandleRefresh(w http.ResponseWriter, r *http.Request) {finalRoles = append(finalRoles, customAccessRoles...)policyRoles, _, err := s.store.GetMeshPolicy(ctx)- if err != nil {+ if err != nil && err != storage.ErrNotFound {logger.Errorf("Failed to retrieve mesh policy for node %s: %v", nodeRecord.PeerID, err)http.Error(w, "Internal server error", http.StatusInternalServerError)return@@ -610,7 +610,7 @@ func (s *Server) HandleRefresh(w http.ResponseWriter, r *http.Request) {} else {// Bootstrap nodepolicyRoles, _, err := s.store.GetMeshPolicy(ctx)- if err != nil {+ if err != nil && err != storage.ErrNotFound {logger.Errorf("Failed to retrieve mesh policy for node %s: %v", nodeRecord.PeerID, err)http.Error(w, "Internal server error", http.StatusInternalServerError)return@@ -865,6 +865,11 @@ func (s *Server) HandlePolicies(w http.ResponseWriter, r *http.Request) {}}+ if err := validatePolicyConfig(&req); err != nil {+ http.Error(w, "Invalid policy configuration: "+err.Error(), http.StatusBadRequest)+ return+ }+if err := s.store.SaveMeshPolicy(r.Context(), req.Roles, req.Bindings); err != nil {logger.Errorf("Failed to save policy: %v", err)http.Error(w, "Internal server error", http.StatusInternalServerError)@@ -1047,7 +1052,7 @@ func (s *Server) HandleEnroll(w http.ResponseWriter, r *http.Request) {if s.config.AutoApproveEnrollment {// Mode A: Auto-ApprovepolicyRoles, _, err := s.store.GetMeshPolicy(ctx)- if err != nil {+ if err != nil && err != storage.ErrNotFound {logger.Errorf("Failed to retrieve mesh policy: %v", err)http.Error(w, "Internal server error", http.StatusInternalServerError)return@@ -1395,7 +1400,7 @@ func (s *Server) HandleAdminEnrollmentAction(w http.ResponseWriter, r *http.Requ}policyRoles, _, err := s.store.GetMeshPolicy(ctx)- if err != nil {+ if err != nil && err != storage.ErrNotFound {logger.Errorf("Failed to retrieve mesh policy: %v", err)http.Error(w, "Internal server error", http.StatusInternalServerError)return@@ -1804,3 +1809,43 @@ func toStringSlice(val any) []string {}return nil}++func validatePolicyConfig(req *api.PolicyConfigUpdateRequest) error {+ roleNames := make(map[string]bool)+ for _, r := range req.Roles {+ if r == nil {+ continue+ }+ if strings.TrimSpace(r.Name) == "" {+ return fmt.Errorf("role name cannot be empty")+ }+ if roleNames[r.Name] {+ return fmt.Errorf("duplicate role name: %s", r.Name)+ }+ roleNames[r.Name] = true++ for _, svc := range r.AllowedServices {+ if err := api.ValidateServiceFormat(svc); err != nil {+ return fmt.Errorf("invalid allowed_service %q in role %s: %w", svc, r.Name, err)+ }+ }+ for _, target := range r.AllowedTargets {+ if err := api.ValidateTargetFormat(target); err != nil {+ return fmt.Errorf("invalid allowed_target %q in role %s: %w", target, r.Name, err)+ }+ }+ }++ for _, b := range req.Bindings {+ if b == nil {+ continue+ }+ if strings.TrimSpace(b.Role) == "" {+ return fmt.Errorf("binding role cannot be empty")+ }+ if !roleNames[b.Role] {+ return fmt.Errorf("binding references undefined role: %s", b.Role)+ }+ }+ return nil+}diff --git a/internal/storage/sql_store.go b/internal/storage/sql_store.goindex 13ca82a1..8734dd69 100644--- a/internal/storage/sql_store.go+++ b/internal/storage/sql_store.go@@ -659,6 +659,9 @@ func (s *SQLStore) GetMeshPolicy(ctx context.Context) ([]*api.PolicyRole, []*apirolesMap[name] = roleroles = append(roles, role)}+ if err := rolesRows.Err(); err != nil {+ return nil, nil, err+ }permsRows, err := s.db.QueryContext(ctx, s.rebind("SELECT role_name, resource_type, resource_value FROM role_permissions"))if err != nil {@@ -682,6 +685,9 @@ func (s *SQLStore) GetMeshPolicy(ctx context.Context) ([]*api.PolicyRole, []*api}}}+ if err := permsRows.Err(); err != nil {+ return nil, nil, err+ }bindingsRows, err := s.db.QueryContext(ctx, s.rebind("SELECT role_name, member FROM role_bindings"))if err != nil {@@ -702,6 +708,9 @@ func (s *SQLStore) GetMeshPolicy(ctx context.Context) ([]*api.PolicyRole, []*api}b.Members = append(b.Members, member)}+ if err := bindingsRows.Err(); err != nil {+ return nil, nil, err+ }var bindings []*api.PolicyBindingfor _, b := range bindingsMap {