Agent Mesh
Go a2aa2a-protocolagent-meshagentic-aiinferencemcpmeshmesh-networknetwork-securitynetworking-aip2p-network
fix(review): address PR review comments for roles resolution, OIDC shutdown, and k8s secret apply
Antonio Ojeacbf4b9be06e6
diff --git a/charts/sam-mesh/templates/bootstrap-job.yaml b/charts/sam-mesh/templates/bootstrap-job.yamlindex f7082a9d..181c7bde 100644--- a/charts/sam-mesh/templates/bootstrap-job.yaml+++ b/charts/sam-mesh/templates/bootstrap-job.yaml@@ -114,16 +114,9 @@ spec:fiecho "Writing bootstrap token to Kubernetes secret ${SECRET_NAME}..."-- # Delete existing secret first (ignore error if doesn't exist)- curl -s --cacert $CACERT -X DELETE \+ curl -s --cacert $CACERT -X PATCH \-H "Authorization: Bearer $K8S_TOKEN" \- "https://kubernetes.default.svc/api/v1/namespaces/${NAMESPACE}/secrets/${SECRET_NAME}" > /dev/null || true-- # Create new secret- curl -s --cacert $CACERT -X POST \- -H "Authorization: Bearer $K8S_TOKEN" \- -H "Content-Type: application/json" \+ -H "Content-Type: application/apply-patch+yaml" \-d '{"apiVersion": "v1","kind": "Secret",@@ -135,6 +128,6 @@ spec:"token": "'"${ROUTER_TOKEN}"'"}}' \- "https://kubernetes.default.svc/api/v1/namespaces/${NAMESPACE}/secrets" > /dev/null+ "https://kubernetes.default.svc/api/v1/namespaces/${NAMESPACE}/secrets/${SECRET_NAME}?fieldManager=sam-bootstrap&force=true" > /dev/nullecho "Bootstrap completed successfully!"diff --git a/internal/controlplane/server.go b/internal/controlplane/server.goindex 2a786c78..82efda8d 100644--- a/internal/controlplane/server.go+++ b/internal/controlplane/server.go@@ -1755,9 +1755,19 @@ func resolveRoles(claims jwt.MapClaims, bindings []*api.PolicyBinding) []string}}case api.FactUser:- if oidcSub == value || oidcEmail == value {+ if oidcSub == value {resolvedRoles[b.Role] = true}+ case api.FactEmail:+ if oidcEmail == value {+ resolvedRoles[b.Role] = true+ }+ case api.FactRole:+ for _, r := range oidcRoles {+ if r == value {+ resolvedRoles[b.Role] = true+ }+ }}}}diff --git a/internal/node/oidc.go b/internal/node/oidc.goindex 259165b5..130b6acb 100644--- a/internal/node/oidc.go+++ b/internal/node/oidc.go@@ -228,22 +228,24 @@ func (n *SamNode) InteractiveLogin(ctx context.Context, authURL, tokenURL, clien}}()+ shutdownSrv := func() {+ if srv != nil {+ shutdownCtx, cancel := context.WithTimeout(context.Background(), 5*time.Second)+ _ = srv.Shutdown(shutdownCtx)+ cancel()+ }+ }+var code stringselect {case <-ctx.Done():- if srv != nil {- _ = srv.Shutdown(context.Background())- }+ shutdownSrv()return "", ctx.Err()case err := <-errChan:- if srv != nil {- _ = srv.Shutdown(context.Background())- }+ shutdownSrv()return "", errcase code = <-codeChan:- if srv != nil {- _ = srv.Shutdown(context.Background())- }+ shutdownSrv()}tokenData := url.Values{}