84c3c3aa9c
- Add `AllowPasswordGrant` boolean field to OIDCIdentityProvider's spec
- The oidc upstream watcher controller copies the value of
`AllowPasswordGrant` into the configuration of the cached provider
- Add password grant to the UpstreamOIDCIdentityProviderI interface
which is implemented by the cached provider instance for use in the
authorization endpoint
- Enhance the IDP discovery endpoint to return the supported "flows"
for each IDP ("cli_password" and/or "browser_authcode")
- Enhance `pinniped get kubeconfig` to help the user choose the desired
flow for the selected IDP, and to write the flow into the resulting
kubeconfg
- Enhance `pinniped login oidc` to have a flow flag to tell it which
client-side flow it should use for auth (CLI-based or browser-based)
- In the Dex config, allow the resource owner password grant, which Dex
implements to also return ID tokens, for use in integration tests
- Enhance the authorize endpoint to perform password grant when
requested by the incoming headers. This commit does not include unit
tests for the enhancements to the authorize endpoint, which will come
in the next commit
- Extract some shared helpers from the callback endpoint to share the
code with the authorize endpoint
- Add new integration tests
111 lines
2.4 KiB
YAML
111 lines
2.4 KiB
YAML
#! Copyright 2020-2021 the Pinniped contributors. All Rights Reserved.
|
|
#! SPDX-License-Identifier: Apache-2.0
|
|
|
|
#@ load("@ytt:data", "data")
|
|
#@ load("@ytt:sha256", "sha256")
|
|
#@ load("@ytt:yaml", "yaml")
|
|
|
|
#@ def dexConfig():
|
|
issuer: https://dex.tools.svc.cluster.local/dex
|
|
storage:
|
|
type: sqlite3
|
|
config:
|
|
file: ":memory:"
|
|
web:
|
|
https: 0.0.0.0:8443
|
|
tlsCert: /var/certs/dex.pem
|
|
tlsKey: /var/certs/dex-key.pem
|
|
oauth2:
|
|
skipApprovalScreen: true
|
|
#! Allow the resource owner password grant, which Dex implements to also return ID tokens.
|
|
passwordConnector: local
|
|
staticClients:
|
|
- id: pinniped-cli
|
|
name: 'Pinniped CLI'
|
|
public: true
|
|
redirectURIs:
|
|
- #@ "http://127.0.0.1:" + str(data.values.ports.cli) + "/callback"
|
|
- #@ "http://[::1]:" + str(data.values.ports.cli) + "/callback"
|
|
- id: pinniped-supervisor
|
|
name: 'Pinniped Supervisor'
|
|
secret: pinniped-supervisor-secret
|
|
redirectURIs: #@ data.values.supervisor_redirect_uris
|
|
enablePasswordDB: true
|
|
staticPasswords:
|
|
- username: "pinny"
|
|
email: "pinny@example.com"
|
|
hash: #@ data.values.pinny_bcrypt_passwd_hash
|
|
userID: "061d23d1-fe1e-4777-9ae9-59cd12abeaaa"
|
|
#@ end
|
|
|
|
---
|
|
apiVersion: v1
|
|
kind: ConfigMap
|
|
metadata:
|
|
name: dex-config
|
|
namespace: tools
|
|
labels:
|
|
app: dex
|
|
data:
|
|
config.yaml: #@ yaml.encode(dexConfig())
|
|
---
|
|
apiVersion: apps/v1
|
|
kind: Deployment
|
|
metadata:
|
|
name: dex
|
|
namespace: tools
|
|
labels:
|
|
app: dex
|
|
spec:
|
|
replicas: 1
|
|
selector:
|
|
matchLabels:
|
|
app: dex
|
|
template:
|
|
metadata:
|
|
labels:
|
|
app: dex
|
|
annotations:
|
|
dexConfigHash: #@ sha256.sum(yaml.encode(dexConfig()))
|
|
spec:
|
|
containers:
|
|
- name: dex
|
|
image: #@ data.values.dex_image
|
|
imagePullPolicy: IfNotPresent
|
|
command:
|
|
- /usr/local/bin/dex
|
|
- serve
|
|
- /etc/dex/cfg/config.yaml
|
|
ports:
|
|
- name: https
|
|
containerPort: 8443
|
|
volumeMounts:
|
|
- name: dex-config
|
|
mountPath: /etc/dex/cfg
|
|
- name: certs
|
|
mountPath: /var/certs
|
|
readOnly: true
|
|
volumes:
|
|
- name: dex-config
|
|
configMap:
|
|
name: dex-config
|
|
- name: certs
|
|
secret:
|
|
secretName: certs
|
|
---
|
|
apiVersion: v1
|
|
kind: Service
|
|
metadata:
|
|
name: dex
|
|
namespace: tools
|
|
labels:
|
|
app: dex
|
|
spec:
|
|
type: ClusterIP
|
|
selector:
|
|
app: dex
|
|
ports:
|
|
- name: https
|
|
port: 443
|
|
targetPort: 8443
|