feat: Adds SSO control via individual namespaces. Fixes argoproj#6916 (…

…argoproj#6990)

Signed-off-by: bjenuhb <[email protected]>

cmd/argo/commands/server.go

@@ -46,6 +46,7 @@ func NewServerCommand() *cobra.Command {
  htst bool
  namespaced bool // --namespaced
  managedNamespace string // --managed-namespace
+ ssoNamespace string
  enableOpenBrowser bool
  eventOperationQueueSize int
  eventWorkerCount int
@@ -124,11 +125,29 @@ See %s`, help.ArgoServer),
  log.Warn("You are running without client authentication. Learn how to enable client authentication: https://argoproj.github.io/argo-workflows/argo-server-auth-mode/")
  }
 
+ if namespaced {
+ // Case 1: If ssoNamespace is not specified, default it to installation namespace
+ if ssoNamespace == "" {
+ ssoNamespace = namespace
+ }
+ // Case 2: If ssoNamespace is not equal to installation or managed namespace, default it to installation namespace
+ if ssoNamespace != namespace && ssoNamespace != managedNamespace {
+ log.Warn("--sso-namespace should be equal to --managed-namespace or the installation namespace")
+ ssoNamespace = namespace
+ }
+ } else {
+ if ssoNamespace != "" {
+ log.Warn("ignoring --sso-namespace because --namespaced is false")
+ }
+ ssoNamespace = namespace
+ }
  opts := apiserver.ArgoServerOpts{
  BaseHRef: baseHRef,
  TLSConfig: tlsConfig,
  HSTS: htst,
+ Namespaced: namespaced,
  Namespace: namespace,
+ SSONameSpace: ssoNamespace,
  Clients: clients,
  RestConfig: config,
  AuthModes: modes,
@@ -187,6 +206,7 @@ See %s`, help.ArgoServer),
  command.Flags().StringVar(&configMap, "configmap", "workflow-controller-configmap", "Name of K8s configmap to retrieve workflow controller configuration")
  command.Flags().BoolVar(&namespaced, "namespaced", false, "run as namespaced mode")
  command.Flags().StringVar(&managedNamespace, "managed-namespace", "", "namespace that watches, default to the installation namespace")
+ command.Flags().StringVar(&ssoNamespace, "sso-namespace", "", "namespace that will be used for SSO RBAC. Defaults to installation namespace. Used only in namespaced mode")
  command.Flags().BoolVarP(&enableOpenBrowser, "browser", "b", false, "enable automatic launching of the browser [local mode]")
  command.Flags().IntVar(&eventOperationQueueSize, "event-operation-queue-size", 16, "how many events operations that can be queued at once")
  command.Flags().IntVar(&eventWorkerCount, "event-worker-count", 4, "how many event workers to run")

docs/cli/argo_server.md

@@ -30,6 +30,7 @@ See https://argoproj.github.io/argo-workflows/argo-server/
  --managed-namespace string namespace that watches, default to the installation namespace
  --namespaced run as namespaced mode
  -p, --port int Port to listen on (default 2746)
+ --sso-namespace string namespace that will be used for SSO RBAC. Defaults to installation namespace. Used only in namespaced mode
  --x-frame-options string Set X-Frame-Options header in HTTP responses. (default "DENY")
 ```
 

manifests/cluster-install/argo-server-rbac/argo-server-clusterole.yaml

@@ -18,6 +18,8 @@ rules:
  verbs:
  - get
  - create
+ - list
+ - watch
  - apiGroups:
  - ""
  resources:
@@ -44,6 +46,7 @@ rules:
  verbs:
  - get
  - list
+ - watch
  - apiGroups:
  - argoproj.io
  resources:

manifests/install.yaml

@@ -472,6 +472,8 @@ rules:
  verbs:
  - get
  - create
+ - list
+ - watch
 - apiGroups:
  - ""
  resources:
@@ -498,6 +500,7 @@ rules:
  verbs:
  - get
  - list
+ - watch
 - apiGroups:
  - argoproj.io
  resources:

manifests/namespace-install.yaml

@@ -377,6 +377,8 @@ rules:
  verbs:
  - get
  - create
+ - list
+ - watch
 - apiGroups:
  - ""
  resources:
@@ -403,6 +405,7 @@ rules:
  verbs:
  - get
  - list
+ - watch
 - apiGroups:
  - argoproj.io
  resources:

manifests/namespace-install/argo-server-rbac/argo-server-role.yaml

@@ -18,6 +18,8 @@ rules:
  verbs:
  - get
  - create
+ - list
+ - watch
  - apiGroups:
  - ""
  resources:
@@ -44,6 +46,7 @@ rules:
  verbs:
  - get
  - list
+ - watch
  - apiGroups:
  - argoproj.io
  resources:

manifests/quick-start-minimal.yaml

@@ -382,6 +382,8 @@ rules:
  verbs:
  - get
  - create
+ - list
+ - watch
 - apiGroups:
  - ""
  resources:
@@ -408,6 +410,7 @@ rules:
  verbs:
  - get
  - list
+ - watch
 - apiGroups:
  - argoproj.io
  resources:

manifests/quick-start-mysql.yaml

@@ -382,6 +382,8 @@ rules:
  verbs:
  - get
  - create
+ - list
+ - watch
 - apiGroups:
  - ""
  resources:
@@ -408,6 +410,7 @@ rules:
  verbs:
  - get
  - list
+ - watch
 - apiGroups:
  - argoproj.io
  resources:

manifests/quick-start-postgres.yaml

@@ -382,6 +382,8 @@ rules:
  verbs:
  - get
  - create
+ - list
+ - watch
 - apiGroups:
  - ""
  resources:
@@ -408,6 +410,7 @@ rules:
  verbs:
  - get
  - list
+ - watch
 - apiGroups:
  - argoproj.io
  resources:

manifests/quick-start/sso/overlays/workflow-controller-configmap.yaml

@@ -2,7 +2,7 @@ apiVersion: v1
 data:
  sso: |
  issuer: http:https://dex:5556/dex
- issuerAlias: http:https://mydex:5556/dex
+ issuerAlias: http:https://dex:5556/dex
  clientId:
  name: argo-server-sso
  key: clientID

pkg/apiclient/argo-kube-client.go

@@ -71,7 +71,7 @@ func newArgoKubeClient(ctx context.Context, clientConfig clientcmd.ClientConfig,
  Sensor: sensorInterface,
  Workflow: wfClient,
  }
- gatekeeper, err := auth.NewGatekeeper(auth.Modes{auth.Server: true}, clients, restConfig, nil, auth.DefaultClientForAuthorization, "unused")
+ gatekeeper, err := auth.NewGatekeeper(auth.Modes{auth.Server: true}, clients, restConfig, nil, auth.DefaultClientForAuthorization, "unused", "unused", false, nil)
  if err != nil {
  return nil, nil, err
  }

server/apiserver/argoserver.go

@@ -20,6 +20,7 @@ import (
  "google.golang.org/grpc"
  "google.golang.org/grpc/credentials"
  "google.golang.org/grpc/metadata"
+ v1 "k8s.io/api/core/v1"
  "k8s.io/apimachinery/pkg/util/wait"
  "k8s.io/client-go/rest"
  "k8s.io/utils/env"
@@ -42,6 +43,7 @@ import (
  "github.com/argoproj/argo-workflows/v3/server/auth"
  "github.com/argoproj/argo-workflows/v3/server/auth/sso"
  "github.com/argoproj/argo-workflows/v3/server/auth/webhook"
+ "github.com/argoproj/argo-workflows/v3/server/cache"
  "github.com/argoproj/argo-workflows/v3/server/clusterworkflowtemplate"
  "github.com/argoproj/argo-workflows/v3/server/cronworkflow"
  "github.com/argoproj/argo-workflows/v3/server/event"
@@ -81,18 +83,21 @@ type argoServer struct {
  eventAsyncDispatch bool
  xframeOptions string
  accessControlAllowOrigin string
+ cache *cache.ResourceCache
 }
 
 type ArgoServerOpts struct {
  BaseHRef string
  TLSConfig *tls.Config
+ Namespaced bool
  Namespace string
  Clients *types.Clients
  RestConfig *rest.Config
  AuthModes auth.Modes
  // config map name
  ConfigName string
  ManagedNamespace string
+ SSONameSpace string
  HSTS bool
  EventOperationQueueSize int
  EventWorkerCount int
@@ -109,8 +114,16 @@ func init() {
  }
 }
 
+func getResourceCacheNamespace(opts ArgoServerOpts) string {
+ if opts.Namespaced {
+ return opts.SSONameSpace
+ }
+ return v1.NamespaceAll
+}
+
 func NewArgoServer(ctx context.Context, opts ArgoServerOpts) (*argoServer, error) {
  configController := config.NewController(opts.Namespace, opts.ConfigName, opts.Clients.Kubernetes, emptyConfigFunc)
+ var resourceCache *cache.ResourceCache = nil
  ssoIf := sso.NullSSO
  if opts.AuthModes[auth.SSO] {
  c, err := configController.Get(ctx)
@@ -121,11 +134,12 @@ func NewArgoServer(ctx context.Context, opts ArgoServerOpts) (*argoServer, error
  if err != nil {
  return nil, err
  }
+ resourceCache = cache.NewResourceCache(opts.Clients.Kubernetes, ctx, getResourceCacheNamespace(opts))
  log.Info("SSO enabled")
  } else {
  log.Info("SSO disabled")
  }
- gatekeeper, err := auth.NewGatekeeper(opts.AuthModes, opts.Clients, opts.RestConfig, ssoIf, auth.DefaultClientForAuthorization, opts.Namespace)
+ gatekeeper, err := auth.NewGatekeeper(opts.AuthModes, opts.Clients, opts.RestConfig, ssoIf, auth.DefaultClientForAuthorization, opts.Namespace, opts.SSONameSpace, opts.Namespaced, resourceCache)
  if err != nil {
  return nil, err
  }
@@ -145,6 +159,7 @@ func NewArgoServer(ctx context.Context, opts ArgoServerOpts) (*argoServer, error
  eventAsyncDispatch: opts.EventAsyncDispatch,
  xframeOptions: opts.XFrameOptions,
  accessControlAllowOrigin: opts.AccessControlAllowOrigin,
+ cache: resourceCache,
  }, nil
 }
 

server/artifacts/artifact_server.go

@@ -21,6 +21,7 @@ import (
  "github.com/argoproj/argo-workflows/v3/persist/sqldb"
  wfv1 "github.com/argoproj/argo-workflows/v3/pkg/apis/workflow/v1alpha1"
  "github.com/argoproj/argo-workflows/v3/server/auth"
+ "github.com/argoproj/argo-workflows/v3/server/types"
  "github.com/argoproj/argo-workflows/v3/util/instanceid"
  "github.com/argoproj/argo-workflows/v3/workflow/artifactrepositories"
  artifact "github.com/argoproj/argo-workflows/v3/workflow/artifacts"
@@ -53,18 +54,17 @@ func (a *ArtifactServer) GetInputArtifact(w http.ResponseWriter, r *http.Request
 }
 
 func (a *ArtifactServer) getArtifact(w http.ResponseWriter, r *http.Request, isInput bool) {
- ctx, err := a.gateKeeping(r)
+ requestPath := strings.SplitN(r.URL.Path, "/", 6)
+ namespace := requestPath[2]
+ workflowName := requestPath[3]
+ nodeId := requestPath[4]
+ artifactName := requestPath[5]
+
+ ctx, err := a.gateKeeping(r, types.NamespaceHolder(namespace))
  if err != nil {
- w.WriteHeader(401)
- _, _ = w.Write([]byte(err.Error()))
+ a.unauthorizedError(err, w)
  return
  }
- path := strings.SplitN(r.URL.Path, "/", 6)
-
- namespace := path[2]
- workflowName := path[3]
- nodeId := path[4]
- artifactName := path[5]
 
  log.WithFields(log.Fields{"namespace": namespace, "workflowName": workflowName, "nodeId": nodeId, "artifactName": artifactName, "isInput": isInput}).Info("Download artifact")
 
@@ -91,27 +91,33 @@ func (a *ArtifactServer) GetInputArtifactByUID(w http.ResponseWriter, r *http.Re
 }
 
 func (a *ArtifactServer) getArtifactByUID(w http.ResponseWriter, r *http.Request, isInput bool) {
- ctx, err := a.gateKeeping(r)
+ requestPath := strings.SplitN(r.URL.Path, "/", 6)
+
+ uid := requestPath[2]
+ nodeId := requestPath[3]
+ artifactName := requestPath[4]
+
+ // We need to know the namespace before we can do gate keeping
+ wf, err := a.wfArchive.GetWorkflow(uid)
  if err != nil {
- w.WriteHeader(401)
- _, _ = w.Write([]byte(err.Error()))
+ a.serverInternalError(err, w)
  return
  }
 
- path := strings.SplitN(r.URL.Path, "/", 6)
-
- uid := path[2]
- nodeId := path[3]
- artifactName := path[4]
-
- log.WithFields(log.Fields{"uid": uid, "nodeId": nodeId, "artifactName": artifactName, "isInput": isInput}).Info("Download artifact")
+ ctx, err := a.gateKeeping(r, types.NamespaceHolder(wf.GetNamespace()))
+ if err != nil {
+ a.unauthorizedError(err, w)
+ return
+ }
 
- wf, err := a.getWorkflowByUID(ctx, uid)
+ // return 401 if the client does not have permission to get wf
+ err = a.validateAccess(ctx, wf)
  if err != nil {
- a.serverInternalError(err, w)
+ a.unauthorizedError(err, w)
  return
  }
 
+ log.WithFields(log.Fields{"uid": uid, "nodeId": nodeId, "artifactName": artifactName, "isInput": isInput}).Info("Download artifact")
  err = a.returnArtifact(ctx, w, r, wf, nodeId, artifactName, isInput)
 
  if err != nil {
@@ -120,7 +126,7 @@ func (a *ArtifactServer) getArtifactByUID(w http.ResponseWriter, r *http.Request
  }
 }
 
-func (a *ArtifactServer) gateKeeping(r *http.Request) (context.Context, error) {
+func (a *ArtifactServer) gateKeeping(r *http.Request, ns types.NamespacedRequest) (context.Context, error) {
  token := r.Header.Get("Authorization")
  if token == "" {
  cookie, err := r.Cookie("authorization")
@@ -133,7 +139,12 @@ func (a *ArtifactServer) gateKeeping(r *http.Request) (context.Context, error) {
  }
  }
  ctx := metadata.NewIncomingContext(r.Context(), metadata.MD{"authorization": []string{token}})
- return a.gatekeeper.Context(ctx)
+ return a.gatekeeper.ContextWithRequest(ctx, ns)
+}
+
+func (a *ArtifactServer) unauthorizedError(err error, w http.ResponseWriter) {
+ w.WriteHeader(401)
+ _, _ = w.Write([]byte(err.Error()))
 }
 
 func (a *ArtifactServer) serverInternalError(err error, w http.ResponseWriter) {
@@ -229,17 +240,13 @@ func (a *ArtifactServer) getWorkflowAndValidate(ctx context.Context, namespace s
  return wf, nil
 }
 
-func (a *ArtifactServer) getWorkflowByUID(ctx context.Context, uid string) (*wfv1.Workflow, error) {
- wf, err := a.wfArchive.GetWorkflow(uid)
- if err != nil {
- return nil, err
- }
+func (a *ArtifactServer) validateAccess(ctx context.Context, wf *wfv1.Workflow) error {
  allowed, err := auth.CanI(ctx, "get", "workflows", wf.Namespace, wf.Name)
  if err != nil {
- return nil, err
+ return err
  }
  if !allowed {
- return nil, status.Error(codes.PermissionDenied, "permission denied")
+ return status.Error(codes.PermissionDenied, "permission denied")
  }
- return wf, nil
+ return nil
 }