fix: use hydra-ldap to fix example

README.md

@@ -2,10 +2,6 @@
 
 Kustomization du service "SSO" (Ory Hydra)
 
-## Usage
-
-[Voir la documentation](./doc/README.md)
-
 ## Exemple
 
 Ce projet contient un exemple fonctionnel de déploiement dans le répertoire [`./examples/authenticated-app`](./examples/authenticated-app)

components/hydra-ldap/resources/deployment.yaml

@@ -24,8 +24,6 @@ spec:
             - configMapRef:
                 name: hydra-ldap-env
           env:
-        - name: WERTHER_WEB_DIR
-          value: "/usr/share/werther/login/"
             - name: WERTHER_LDAP_BINDDN
               valueFrom:
                 secretKeyRef:

components/hydra-saml/resources/hydra-saml-remote-user.yaml

@@ -24,6 +24,8 @@ spec:
                 name: hydra-saml-env
           ports:
             - containerPort: 8080
+          command:
+            - /bin/apache2-foreground
           resources: {}
       restartPolicy: Always
 ---

components/oidc-test/kustomization.yaml

@@ -17,4 +17,5 @@ configMapGenerator:
       - OIDC_REDIRECT_URL=https://example.net/oauth2/callback
       - OIDC_POST_LOGOUT_REDIRECT_URL=https://example.net
       - OIDC_SKIP_ISSUER_VERIFICATION="true"
+      - OIDC_SCOPES="openid profile"
       - OIDC_INSECURE_SKIP_VERIFY="true"

components/oidc-test/resources/deployment.yaml

@@ -30,10 +30,10 @@ spec:
               valueFrom:
                 secretKeyRef:
                   name: oidc-test-oauth2-client
-                key: client_id
+                  key: CLIENT_ID
             - name: OIDC_CLIENT_SECRET
               valueFrom:
                 secretKeyRef:
                   name: oidc-test-oauth2-client
-                key: client_secret
+                  key: CLIENT_SECRET
       restartPolicy: Always

components/oidc-test/resources/oauth2-client.yaml

@@ -10,7 +10,7 @@ spec:
     - refresh_token
   responseTypes:
     - code
-  scope: "openid email"
+  scope: "openid email profile"
   secretName: oidc-test-oauth2-client
   redirectUris:
     - https://example.net/oauth2/callback

examples/authenticated-app/README.md

@@ -1,6 +1,6 @@
 # Exemple: Déploiement d'une application authentifiée avec la stack SSO
 
-L'exemple est actuellement déployé avec le composant `hydra-saml` uniquement.
+L'exemple est actuellement déployé avec le composant `hydra-ldap` uniquement.
 
 ## Procédure
 
@@ -24,14 +24,6 @@ L'exemple est actuellement déployé avec le composant `hydra-saml` uniquement.
    kubectl apply -k ./examples/authenticated-app
    ```
 
-   **Note** Il est possible d'avoir l'erreur suivante:
-
-   ```
-   error: resource mapping not found for name: "app-oauth2-client" namespace: "" from "./examples/authenticated-app": no matches for kind "OAuth2Client" in version "hydra.ory.sh/v1alpha1"
-   ```
-
-   Cette erreur est "normale" (voir https://github.com/kubernetes/kubectl/issues/1117). Dans ce cas, attendre la création de la CRD (voir ticket) puis relancer la commande.
-
 4. Ajouter l'entrée suivante dans votre fichier `/etc/hosts`
 
    ```
@@ -48,14 +40,11 @@ kind delete cluster -n sso-kustom-example
 
 ## Authentification
 
-### SAML
+### LDAP
 
-- Utilisateur: `user1`
+- Utilisateur: `jdoe`
-- Mot de passe `user1pass`
+- Mot de passe `jdoe`
 
-#### URL utiles
+#### Gestion des comptes
 
-|URL|Description|
+Les comptes LDAP sont définis dans le fichier [`./files/glauth.conf`](./files/glauth.conf)
-|---|-----------|
-|https://ssokustom/auth/saml/Shibboleth.sso/Session|Attributs de la session SP Shibboleth|
-|https://ssokustom/auth/saml/Shibboleth.sso/Metadata|Métadonnées du SP Shibboleth|

examples/authenticated-app/files/glauth.conf

@@ -0,0 +1,48 @@
+debug = true
+
+[ldap]
+  enabled = true
+  listen = "0.0.0.0:3893"
+  tls = false
+
+[ldaps]
+  enabled = false
+
+[behaviors]
+  IgnoreCapabilities = true
+
+[backend]
+  datastore = "config"
+  baseDN = "dc=glauth,dc=com"
+
+[[users]]
+  uid = "serviceuser"
+  name = "serviceuser"
+  mail = "serviceuser@example.com"
+  uidnumber = 5003
+  primarygroup = 5502
+  passsha256 = "652c7dc687d98c9889304ed2e408c74b611e86a40caa51c4b43f1dd5913c5cd0" # mysecret
+    [[users.capabilities]]
+    action = "search"
+    object = "*"
+
+[[users]]
+  uid = "jdoe"
+  name = "jdoe"
+  uidnumber = 5001
+  primarygroup = 5501
+  givenname = "John"
+  sn = "Doe"
+  mail = "jdoe@example.com"
+  passsha256 = "d30a5f57532a603697ccbb51558fa02ccadd74a0c499fcf9d45b33863ee1582f" # jdoe
+    [[users.customattributes]]
+    employeetype = ["Intern", "Temp"]
+    employeenumber = [12345, 54321]
+
+[[groups]]
+  name = "users"
+  gidnumber = 5501
+
+[[groups]]
+  name = "svcaccts"
+  gidnumber = 5502

examples/authenticated-app/files/hydra-dispatcher-apps.yaml

@@ -0,0 +1,35 @@
+hydra:
+  apps:
+    - id: ldap
+      title:
+        fr: Connexion LDAP
+        en: Login LDAP
+      description:
+        fr: Authentification avec LDAP
+        en: Authentication with LDAP
+      login_url: "%env(string:HYDRA_DISPATCHER_LDAP_LOGIN_URL)%"
+      consent_url: "%env(string:HYDRA_DISPATCHER_LDAP_CONSENT_URL)%"
+      logout_url: "%env(string:HYDRA_DISPATCHER_LDAP_LOGOUT_URL)%"
+      attributes_rewrite_configuration:
+        family_name:
+          rules:
+            - "property_exists(consent.session.id_token, 'family_name') ? consent.session.id_token.family_name : null"
+        given_name:
+          rules:
+            - "property_exists(consent.session.id_token, 'given_name') ? consent.session.id_token.given_name : null"
+        email:
+          rules:
+            - "property_exists(consent.session.id_token, 'email') ? consent.session.id_token.email : null"
+  firewall:
+    additional_properties: true
+    rules:
+      email:
+        required: false
+      given_name:
+        required: false
+      family_name:
+        required: false
+  webhook:
+    enabled: false
+  webhook_post_login:
+    enabled: false

examples/authenticated-app/kustomization.yaml

@@ -2,12 +2,19 @@ apiVersion: kustomize.config.k8s.io/v1beta1
 kind: Kustomization
 
 resources:
-  - ../../overlays/full
+  - ../../overlays/base
+
   - ./resources/ingress.yaml
-  - ./resources/saml-idp.yaml
+  - ./resources/glauth-ldap.yaml
   - ./resources/self-signed-issuer.yaml
   - ./resources/port-forwarder.yaml
 
+components:
+  - ../../components/hydra-cnpg-database
+  - ../../components/hydra-ldap
+  - ../../components/oidc-test
+  - ../../components/redis
+
 patchesJson6902:
   - target:
       version: v1
@@ -22,8 +29,13 @@ patchesJson6902:
   - target:
       version: v1
       kind: ConfigMap
-      name: hydra-saml-env
+      name: hydra-ldap-env
-    path: patches/hydra-saml-env.yaml
+    path: patches/hydra-ldap-env.yaml
+  - target:
+      version: v1
+      kind: Secret
+      name: hydra-ldap-sc
+    path: patches/hydra-ldap-sc.yaml
   - target:
       version: v1
       kind: Secret
@@ -32,10 +44,19 @@ patchesJson6902:
   - target:
       version: v1
       kind: ConfigMap
-      name: oidc-test
+      name: oidc-test-env
     path: patches/oidc-test.yaml
   - target:
       version: v1alpha1
       kind: OAuth2Client
       name: oidc-test-oauth2-client
     path: patches/oidc-test-oauth2-client.yaml
+
+configMapGenerator:
+  - name: hydra-dispatcher-apps
+    behavior: replace
+    files:
+      - ./files/hydra-dispatcher-apps.yaml
+  - name: glauth-ldap-conf
+    files:
+      - ./files/glauth.conf

examples/authenticated-app/patches/hydra-dispatcher-env.yaml

@@ -1,3 +1,9 @@
+- op: replace
+  path: "/data/APP_ENV"
+  value: dev
+- op: replace
+  path: "/data/APP_DEBUG"
+  value: "true"
 - op: replace
   path: "/data/HYDRA_BASE_URL"
   value: http://hydra:4444
@@ -17,14 +23,13 @@
   path: "/data/COOKIE_PATH"
   value: /auth/dispatcher
 
-# Hydra SAML configuration
+# Hydra LDAP configuration
 - op: replace
-  path: "/data/HYDRA_DISPATCHER_SAML_LOGIN_URL"
+  path: "/data/HYDRA_DISPATCHER_LDAP_LOGIN_URL"
-  value: https://ssokustom/auth/saml/login
+  value: https://ssokustom/auth/ldap/auth/login
 - op: replace
-  path: "/data/HYDRA_DISPATCHER_SAML_CONSENT_URL"
+  path: "/data/HYDRA_DISPATCHER_LDAP_CONSENT_URL"
-  value: https://ssokustom/auth/saml/consent
+  value: https://ssokustom/auth/ldap/auth/consent
 - op: replace
-  path: "/data/HYDRA_DISPATCHER_SAML_LOGOUT_URL"
+  path: "/data/HYDRA_DISPATCHER_LDAP_LOGOUT_URL"
-  value: https://ssokustom/auth/saml/logout
+  value: https://ssokustom/auth/ldap/auth/logout
-  

examples/authenticated-app/patches/hydra-env.yaml

@@ -13,3 +13,12 @@
 - op: replace
   path: "/data/HYDRA_SERVE_ALL_ARGS"
   value: "--dev"
+- op: replace
+  path: "/data/SERVE_COOKIES_SAME_SITE_MODE"
+  value: "Lax"
+- op: replace
+  path: "/data/SERVE_COOKIES_SAME_SITE_LEGACY_WORKAROUND"
+  value: "true"
+- op: replace
+  path: "/data/SERVE_COOKIES_DOMAIN"
+  value: "ssokustom"

examples/authenticated-app/patches/hydra-ldap-env.yaml

@@ -0,0 +1,43 @@
+- op: replace
+  path: "/data/WERTHER_DEV_MODE"
+  value: "true"
+
+- op: replace
+  path: "/data/WERTHER_WEB_BASE_PATH"
+  value: "/auth/ldap/"
+
+- op: replace
+  path: "/data/WERTHER_IDENTP_HYDRA_URL"
+  value: "http://hydra-dispatcher"
+
+- op: replace
+  path: "/data/WERTHER_LDAP_ENDPOINTS"
+  value: "glauth-ldap:389"
+
+- op: replace
+  path: "/data/WERTHER_LDAP_BASEDN"
+  value: "dc=glauth,dc=com"
+
+- op: replace
+  path: "/data/WERTHER_LDAP_ROLE_BASEDN"
+  value: "ou=groups,dc=glauth,dc=com"
+
+- op: replace
+  path: "/data/WERTHER_IDENTP_CLAIM_SCOPES"
+  value: "uid:profile,name:profile,family_name:profile,given_name:profile,email:profile,https%3A%2F%2Fhydra%2Fclaims%2Froles:roles"
+
+- op: replace
+  path: "/data/WERTHER_INSECURE_SKIP_VERIFY"
+  value: "true"
+
+- op: replace
+  path: "/data/WERTHER_LDAP_IS_TLS"
+  value: "false"
+
+- op: replace
+  path: "/data/WERTHER_LDAP_CONNECTION_TIMEOUT"
+  value: "30s"
+
+- op: replace
+  path: "/data/WERTHER_LDAP_USER_SEARCH_QUERY"
+  value: "(&(objectClass=*)(|(uid=%[1]s)(mail=%[1]s)(userPrincipalName=%[1]s)(sAMAccountName=%[1]s)))"

examples/authenticated-app/patches/hydra-ldap-sc.yaml

@@ -0,0 +1,7 @@
+- op: replace
+  path: "/data/WERTHER_LDAP_BINDDN"
+  value: "Y249c2VydmljZXVzZXIsb3U9c3ZjYWNjdHMsb3U9dXNlcnMsZGM9Z2xhdXRoLGRjPWNvbQ==" # cn=serviceuser,ou=svcaccts,ou=users,dc=glauth,dc=com
+
+- op: replace
+  path: "/data/WERTHER_LDAP_BINDPW"
+  value: "bXlzZWNyZXQ=" # mysecret

examples/authenticated-app/patches/hydra-saml-env.yaml

@@ -1,43 +0,0 @@
-- op: replace
-  path: "/data/HTTP_BASE_URL"
-  value: https://ssokustom/auth/saml
-- op: replace
-  path: "/data/COOKIE_PATH"
-  value: /auth/saml
-- op: replace
-  path: "/data/HYDRA_ADMIN_BASE_URL"
-  value: http://hydra-dispatcher
-- op: replace
-  path: "/data/LOGOUT_REDIRECT_URL_PATTERN"
-  value: https://ssokustom/auth/saml/Shibboleth.sso/Logout?return=%s
-- op: replace
-  path: "/data/PATH_PREFIX"
-  value: "/auth/saml"
-
-- op: replace
-  path: "/data/SP_ENTITY_ID"
-  value: https://ssokustom/auth/saml
-- op: replace
-  path: "/data/IDP_ENTITY_ID"
-  value: https://ssokustom/simplesaml/saml2/idp/metadata.php
-- op: replace
-  path: "/data/IDP_METADATA_URL"
-  value: https://ssokustom/simplesaml/saml2/idp/metadata.php
-- op: replace
-  path: "/data/APACHE_FORCE_HTTPS"
-  value: "true"
-- op: replace
-  path: "/data/SP_HANDLER_BASE_PATH"
-  value: "/auth/saml"
-- op: replace
-  path: "/data/SP_LOG_LEVEL"
-  value: DEBUG
-- op: replace
-  path: "/data/SP_SESSIONS_REDIRECT_LIMIT"
-  value: none
-- op: replace
-  path: "/data/SP_SESSIONS_REDIRECT_ALLOW"
-  value: https://ssokustom
-- op: replace
-  path: "/data/SP_SESSIONS_COOKIE_PROPS"
-  value: https

examples/authenticated-app/patches/oidc-test-oauth2-client.yaml

@@ -4,3 +4,6 @@
 - op: replace
   path: "/spec/postLogoutRedirectUris/0"
   value: https://ssokustom
+- op: replace
+  path: "/spec/scope"
+  value: "openid profile roles"

examples/authenticated-app/patches/oidc-test.yaml

@@ -4,3 +4,6 @@
 - op: replace
   path: "/data/OIDC_POST_LOGOUT_REDIRECT_URL"
   value: https://ssokustom
+- op: replace
+  path: "/data/OIDC_SCOPES"
+  value: "openid profile roles"

examples/authenticated-app/resources/glauth-ldap.yaml

@@ -0,0 +1,55 @@
+apiVersion: apps/v1
+kind: Deployment
+metadata:
+  labels:
+    app.kubernetes.io/name: glauth-ldap
+  name: glauth-ldap
+spec:
+  replicas: 1
+  selector:
+    matchLabels:
+      app.kubernetes.io/name: glauth-ldap
+  strategy:
+    type: Recreate
+  template:
+    metadata:
+      labels:
+        app.kubernetes.io/name: glauth-ldap
+    spec:
+      containers:
+        - image: glauth/glauth:v2.3.2
+          name: glauth-ldap
+          ports:
+            - containerPort: 3893
+              name: ldap
+            - containerPort: 3894
+              name: ldaps
+          resources: {}
+          volumeMounts:
+            - name: glauth-ldap-conf
+              mountPath: /app/config/config.cfg
+              subPath: glauth.conf
+      restartPolicy: Always
+      volumes:
+        - name: glauth-ldap-conf
+          configMap:
+            name: glauth-ldap-conf
+---
+apiVersion: v1
+kind: Service
+metadata:
+  labels:
+    app.kubernetes.io/name: glauth-ldap
+  name: glauth-ldap
+spec:
+  ports:
+    - name: ldap
+      port: 389
+      targetPort: ldap
+    - name: ldaps
+      port: 636
+      targetPort: ldaps
+  selector:
+    app.kubernetes.io/name: glauth-ldap
+status:
+  loadBalancer: {}

examples/authenticated-app/resources/ingress.yaml

@@ -27,10 +27,14 @@ spec:
 apiVersion: networking.k8s.io/v1
 kind: Ingress
 metadata:
-  name: auth-saml
+  name: auth-ldap
   annotations:
     cert-manager.io/issuer: "self-signed"
     nginx.ingress.kubernetes.io/force-ssl-redirect: "true"
+    nginx.ingress.kubernetes.io/rewrite-target: /$2
+    nginx.ingress.kubernetes.io/x-forwarded-prefix: /auth/ldap
+    nginx.ingress.kubernetes.io/configuration-snippet: |
+      proxy_set_header X-Forwarded-Proto https;
 spec:
   ingressClassName: nginx
   tls:
@@ -40,13 +44,13 @@ spec:
   rules:
     - http:
         paths:
-      - path: /auth/saml(/|$)(.*)
+          - path: /auth/ldap(/|$)(.*)
             pathType: Prefix
             backend:
               service:
-            name: hydra-saml
+                name: hydra-ldap
                 port:
-              name: http
+                  name: hydra-ldap
 ---
 apiVersion: networking.k8s.io/v1
 kind: Ingress
@@ -57,6 +61,8 @@ metadata:
     nginx.ingress.kubernetes.io/force-ssl-redirect: "true"
     nginx.ingress.kubernetes.io/rewrite-target: /$2
     nginx.ingress.kubernetes.io/x-forwarded-prefix: /auth/dispatcher
+    nginx.ingress.kubernetes.io/configuration-snippet: |
+      proxy_set_header X-Forwarded-Proto https;
 spec:
   ingressClassName: nginx
   tls:
@@ -82,6 +88,9 @@ metadata:
     cert-manager.io/issuer: "self-signed"
     nginx.ingress.kubernetes.io/force-ssl-redirect: "true"
     nginx.ingress.kubernetes.io/rewrite-target: /$2
+    nginx.ingress.kubernetes.io/x-forwarded-prefix: /auth
+    nginx.ingress.kubernetes.io/configuration-snippet: |
+      proxy_set_header X-Forwarded-Proto https;
 spec:
   ingressClassName: nginx
   tls:
@@ -98,34 +107,3 @@ spec:
                 name: hydra
                 port:
                   name: hydra-public
----
-apiVersion: networking.k8s.io/v1
-kind: Ingress
-metadata:
-  name: saml-idp
-  annotations:
-    cert-manager.io/issuer: "self-signed"
-    nginx.ingress.kubernetes.io/force-ssl-redirect: "true"
-    nginx.ingress.kubernetes.io/rewrite-target: /simplesaml/$2
-    nginx.ingress.kubernetes.io/backend-protocol: "HTTPS"
-spec:
-  ingressClassName: nginx
-  tls:
-  - hosts:
-    - ssokustom
-    secretName: ssokustom-example-tls
-  rules:
-  - http:
-      paths:     
-      - path: /simplesaml(/|$)(.*)
-        pathType: Prefix
-        backend:
-          service:
-            name: saml-idp
-            port:
-              name: https
-
-     
-
-      
-          

examples/authenticated-app/resources/saml-idp.yaml

@@ -1,51 +0,0 @@
-apiVersion: apps/v1
-kind: Deployment
-metadata:
-  labels:
-    app.kubernetes.io/name: saml-idp
-  name: saml-idp
-spec:
-  replicas: 1
-  selector:
-    matchLabels:
-      app.kubernetes.io/name: saml-idp
-  strategy:
-    type: Recreate
-  template:
-    metadata:
-      labels:
-        app.kubernetes.io/name: saml-idp
-    spec:
-      containers:
-        - image: kristophjunge/test-saml-idp:1.15
-          name: saml-idp
-          ports:
-            - containerPort: 8443
-          resources: {}
-          env:
-            - name: SIMPLESAMLPHP_SP_ENTITY_ID
-              value: https://ssokustom/auth/saml
-            - name: SIMPLESAMLPHP_SP_ASSERTION_CONSUMER_SERVICE
-              value: https://ssokustom/auth/saml/Shibboleth.sso/SAML2/POST
-            - name: SIMPLESAMLPHP_SP_SINGLE_LOGOUT_SERVICE
-              value: https://ssokustom/auth/saml/Shibboleth.sso/Logout?return=https://ssokustom
-      restartPolicy: Always
----
-apiVersion: v1
-kind: Service
-metadata:
-  labels:
-    app.kubernetes.io/name: saml-idp
-  name: saml-idp
-spec:
-  ports:
-    - name: http
-      port: 8080
-      targetPort: 8080
-    - name: https
-      port: 8443
-      targetPort: 8443
-  selector:
-    app.kubernetes.io/name: saml-idp
-status:
-  loadBalancer: {}

examples/k8s/kind/cluster/kustomization.yaml

@@ -6,10 +6,15 @@ resources:
   - https://forge.cadoles.com/CadolesKube/c-kustom//base/redis?ref=develop
   - https://raw.githubusercontent.com/kubernetes/ingress-nginx/main/deploy/static/provider/kind/deploy.yaml
 
-patchesJson6902:
+  # 'By executive order', l'inclusion de la CRD OAuth2Client est désormais gérée à la création des clusters Cadoles.
-  - target:
+  # Dans cet environnement de développement il est cependant nécessaire de l'intégrer manuellement.
-      version: v1
+  # Le numéro de version devrait être raccord avec celui de l'image utilisée par la ressource 'hydra-maester'.
+  # cf. resources/hydra/resources/hydra-maester/resources/hydra-maester-deployment.yaml
+  - https://raw.githubusercontent.com/ory/hydra-maester/refs/tags/v0.0.25/config/crd/bases/hydra.ory.sh_oauth2clients.yaml
+
+patches:
+  - path: patches/nginx-controller.yaml
+    target:
       kind: ConfigMap
       name: ingress-nginx-controller
       namespace: ingress-nginx
-    path: patches/nginx-controller.yaml

examples/k8s/kind/cluster/patches/nginx-controller.yaml

@@ -1,6 +1,9 @@
-- op: replace
+kind: ConfigMap
-  path: "/data/allow-snippet-annotations"
+apiVersion: v1
-  value: "true"
+metadata:
-- op: replace
+  name: ingress-nginx-controller
-  path: "/data/use-forwarded-headers"
+data:
-  value: "true"
+  allow-snippet-annotations: "true"
+  use-forwarded-headers: "true"
+  strict-validate-path-type: "false"
+  annotations-risk-level: "Critical"

resources/hydra-dispatcher/files/hydra/default.yaml

@@ -15,3 +15,5 @@ hydra:
   firewall:
     additional_properties: "%env(bool:HYDRA_DISPATCHER_FIREWALL_ADDITIONAL_PROPERTIES)%"
     rules: {}
+  webhook_post_login:
+    enabled: false

resources/hydra-dispatcher/resources/hydra-dispatcher-deployment.yaml

@@ -3,6 +3,7 @@ kind: Deployment
 metadata:
   labels:
     app.kubernetes.io/name: hydra-dispatcher
+    com.cadoles.forge.sso-kustom/session: redis
   name: hydra-dispatcher
 spec:
   replicas: 1

resources/hydra/resources/hydra-maester/resources/hydra-maester-deployment.yaml

@@ -7,7 +7,7 @@ metadata:
   labels:
     app.kubernetes.io/name: hydra-maester
     app.kubernetes.io/instance: hydra-master
-    app.kubernetes.io/version: "v0.0.23"
+    app.kubernetes.io/version: "v0.0.25"
 spec:
   replicas: 1
   revisionHistoryLimit: 10
@@ -38,8 +38,7 @@ spec:
             - --hydra-url=$(HYDRA_ADMIN_BASE_URL)
             - --hydra-port=$(HYDRA_ADMIN_PORT)
             - --endpoint=/admin/clients
-          resources:
+          resources: {}
-            {}
           terminationMessagePath: /dev/termination-log
           terminationMessagePolicy: File
           securityContext: