wip: integrate hydra-sql in example environment

components/hydra-ldap/resources/deployment.yaml

@@ -38,7 +38,7 @@ spec:
                   key: WERTHER_LDAP_BINDPW
           ports:
             - containerPort: 8080
-          name: hydra-ldap-http
+              name: http
           securityContext:
             allowPrivilegeEscalation: false
             capabilities:

components/hydra-ldap/resources/service.yaml

@@ -7,9 +7,9 @@ metadata:
 spec:
   type: ClusterIP
   ports:
-    - name: hydra-ldap
+    - name: http
       port: 8080
-      targetPort: hydra-ldap-http
+      targetPort: http
       protocol: TCP
   selector:
     app.kubernetes.io/name: hydra-ldap

components/hydra-oidc/resources/hydra-oidc-deployment.yaml

@@ -18,7 +18,7 @@ spec:
     spec:
       containers:
         - name: hydra-oidc-php-fpm
-        image: reg.cadoles.com/cadoles/hydra-oidc-base:2023.12.15-develop.1012.d57f2ad
+          image: reg.cadoles.com/cadoles/hydra-oidc-base:2024.4.2-develop.1349.c4711f6
           imagePullPolicy: Always
           args: ["/usr/sbin/php-fpm81", "-F", "-e"]
           readinessProbe:
@@ -46,11 +46,23 @@ spec:
             - configMapRef:
                 name: hydra-oidc-env
           resources: {}
+          securityContext:
+            runAsNonRoot: true
+            runAsGroup: 1000
+            runAsUser: 1000
 
-      - image: reg.cadoles.com/cadoles/hydra-oidc-base:2023.12.15-develop.1012.d57f2ad
+        - name: hydra-oidc-caddy
+          image: reg.cadoles.com/cadoles/hydra-oidc-base:2024.4.2-develop.1349.c4711f6
           imagePullPolicy: Always
-        name: hydra-oidc-nginx
-        args: ["/usr/sbin/nginx"]
+          args:
+            [
+              "/usr/sbin/caddy",
+              "run",
+              "--adapter",
+              "caddyfile",
+              "--config",
+              "/etc/caddy/Caddyfile",
+            ]
           readinessProbe:
             httpGet:
               path: /healthy
@@ -65,22 +77,26 @@ spec:
             initialDelaySeconds: 15
             timeoutSeconds: 5
             periodSeconds: 15
+          ports:
+            - containerPort: 8080
+              name: http
           envFrom:
             - configMapRef:
                 name: hydra-oidc-env
           env:
-        - name: NGINX_APP_UPSTREAM_BACKEND_SERVER
+            - name: CADDY_APP_UPSTREAM_BACKEND_SERVER
               value: 127.0.0.1:9000
-        - name: NGINX_APP_ROOT
-          value: "/public/"
-        - name: NGINX_APP_PHP_INDEX
-          value: "/index.php"
-        - name: NGINX_ERROR_LOG_LEVEL
-          value: "warn"
-        - name: NGINX_APP_PHP_NON_FILE_PATTERN
-          value: "^/index\\.php(/|$)"
-        ports:
-        - containerPort: 8080
+            - name: CADDY_HTTPS_PORT
+              value: "8443"
+            - name: CADDY_HTTP_PORT
+              value: "8080"
+            - name: CADDY_DATA_FS
+              value: "/tmp/caddy"
+            - name: CADDY_APP_ROOT_PUBLIC
+              value: "/app/public/"
           resources: {}
+          securityContext:
+            runAsNonRoot: true
+            runAsGroup: 1000
+            runAsUser: 1000
       restartPolicy: Always
-

components/hydra-oidc/resources/hydra-oidc-service.yaml

@@ -6,8 +6,9 @@ metadata:
   name: hydra-oidc
 spec:
   ports:
-  - name: hydra-oidc
-    port: 8080
+    - name: http
+      port: 80
+      targetPort: http
   selector:
     app.kubernetes.io/name: hydra-oidc
 status:

components/hydra-sql/files/hydra/sql.yaml

@@ -0,0 +1,30 @@
+hydra:
+  apps:
+    - id: sql
+      title:
+        fr: Connexion SQL
+        en: Login SQL
+      description:
+        fr: Authentification avec SQL
+        en: Authentication with SQL
+      login_url: "%env(string:HYDRA_DISPATCHER_SQL_LOGIN_URL)%"
+      consent_url: "%env(string:HYDRA_DISPATCHER_SQL_CONSENT_URL)%"
+      logout_url: "%env(string:HYDRA_DISPATCHER_SQL_LOGOUT_URL)%"
+      attributes_rewrite_configuration:
+        uid:
+          rules:
+            - "property_exists(consent.session.id_token, 'uid') ? consent.session.id_token.uid : null"
+        email:
+          rules:
+            - "property_exists(consent.session.id_token, 'email') ? consent.session.id_token.email : null"
+        eduPersonAffiliation:
+          rules:
+            - "property_exists(consent.session.id_token, 'eduPersonAffiliation') ? consent.session.id_token.eduPersonAffiliation : null"
+  firewall:
+    rules:
+      email:
+        required: false
+      uid:
+        required: false
+      eduPersonAffiliation:
+        required: false

components/hydra-sql/kustomization.yaml

@@ -2,15 +2,15 @@ apiVersion: kustomize.config.k8s.io/v1alpha1
 kind: Component
 
 resources:
-- ./resources/hydra-sql-service.yaml
-- ./resources/hydra-sql-deployment.yaml
+  - ./resources/hydra-sql-service.yaml
+  - ./resources/hydra-sql-deployment.yaml
 
 generatorOptions:
   labels:
     com.cadoles.forge.sso-kustom/session: redis
 
 configMapGenerator:
-- name: hydra-sql-env
+  - name: hydra-sql-env
     literals:
       - ISSUER_URL="http://localhost:8000"
       - BASE_URL='http://localhost:8080'
@@ -23,6 +23,17 @@ configMapGenerator:
       - DB_PASSWORD="makeMeASecret"
       - REDIS_DSN="redis://redis:6379"
       - PEPPER="MakeMeABigSecret"
-- name: sql-login-config
+  - name: sql-login-config
     files:
       - ./files/sql_login.yaml
+  - name: hydra-dispatcher-apps
+    behavior: merge
+    files:
+      - ./files/hydra/sql.yaml
+
+patchesJson6902:
+  - target:
+      version: v1
+      kind: ConfigMap
+      name: hydra-dispatcher-env
+    path: patches/hydra-dispatcher-env.yaml

components/hydra-sql/patches/hydra-dispatcher-env.yaml

@@ -0,0 +1,9 @@
+- op: replace
+  path: "/data/HYDRA_DISPATCHER_SQL_LOGIN_URL"
+  value: http://hydra-sql/login
+- op: replace
+  path: "/data/HYDRA_DISPATCHER_SQL_CONSENT_URL"
+  value: http://hydra-sql/consent
+- op: replace
+  path: "/data/HYDRA_DISPATCHER_SQL_LOGOUT_URL"
+  value: http://hydra-sql/logout

components/hydra-sql/resources/hydra-sql-deployment.yaml

@@ -18,7 +18,7 @@ spec:
     spec:
       containers:
         - name: hydra-sql-fpm
-        image: reg.cadoles.com/cadoles/hydra-sql-base:2023.12.14-develop.1107.740a756
+          image: reg.cadoles.com/cadoles/hydra-sql-base:2024.4.2-develop.953.fc87b24
           imagePullPolicy: Always
           args: ["/usr/sbin/php-fpm81", "-F", "-e"]
           readinessProbe:
@@ -36,6 +36,10 @@ spec:
             initialDelaySeconds: 10
             periodSeconds: 30
           resources: {}
+          securityContext:
+            runAsNonRoot: true
+            runAsGroup: 1000
+            runAsUser: 1000
           envFrom:
             - configMapRef:
                 name: hydra-sql-env
@@ -53,10 +57,18 @@ spec:
               mountPath: "/app/config/sql_login_configuration/sql_login.yaml"
               subPath: "sql_login.yaml"
 
-      - name: hydra-sql-nginx
-        image: reg.cadoles.com/cadoles/hydra-sql-base:2023.12.14-develop.1107.740a756
+        - name: hydra-sql-caddy
+          image: reg.cadoles.com/cadoles/hydra-sql-base:2024.4.2-develop.953.fc87b24
           imagePullPolicy: Always
-        args: ["/usr/sbin/nginx"]
+          args:
+            [
+              "/usr/sbin/caddy",
+              "run",
+              "--adapter",
+              "caddyfile",
+              "--config",
+              "/etc/caddy/Caddyfile",
+            ]
           readinessProbe:
             httpGet:
               path: /health
@@ -75,19 +87,24 @@ spec:
             - configMapRef:
                 name: hydra-sql-env
           env:
-        - name: NGINX_APP_UPSTREAM_BACKEND_SERVER
+            - name: CADDY_APP_UPSTREAM_BACKEND_SERVER
               value: 127.0.0.1:9000
-        - name: NGINX_APP_ROOT
-          value: "/public"
-        - name: NGINX_APP_PHP_INDEX
-          value: "/index.php"
-        - name: NGINX_ERROR_LOG_LEVEL
-          value: "warn"
-        - name: NGINX_APP_PHP_NON_FILE_PATTERN
-          value: "^/index\\.php(/|$)"
+            - name: CADDY_HTTPS_PORT
+              value: "8443"
+            - name: CADDY_HTTP_PORT
+              value: "8080"
+            - name: CADDY_DATA_FS
+              value: "/tmp/caddy"
+            - name: CADDY_APP_ROOT_PUBLIC
+              value: "/app/public/"
           resources: {}
+          securityContext:
+            runAsNonRoot: true
+            runAsGroup: 1000
+            runAsUser: 1000
           ports:
             - containerPort: 8080
+              name: http
           volumeMounts:
             - name: sql-login-config
               mountPath: "/app/config/sql_login_configuration/sql_login.yaml"

components/hydra-sql/resources/hydra-sql-service.yaml

@@ -6,8 +6,9 @@ metadata:
   name: hydra-sql
 spec:
   ports:
-  - name: hydra-sql
-    port: 8080
+    - name: http
+      port: 80
+      targetPort: http
   selector:
     app.kubernetes.io/name: hydra-sql
 status:

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

examples/authenticated-app/README.md

@@ -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`
 
    ```
@@ -55,7 +47,7 @@ kind delete cluster -n sso-kustom-example
 
 #### URL utiles
 
-|URL|Description|
-|---|-----------|
-|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|
+| URL                                                 | Description                           |
+| --------------------------------------------------- | ------------------------------------- |
+| 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/kustomization.yaml

@@ -8,7 +8,7 @@ resources:
   - ./resources/self-signed-issuer.yaml
   - ./resources/port-forwarder.yaml
 
-patchesJson6902:
+patches:
   - target:
       version: v1
       kind: ConfigMap
@@ -39,3 +39,8 @@ patchesJson6902:
       kind: OAuth2Client
       name: oidc-test-oauth2-client
     path: patches/oidc-test-oauth2-client.yaml
+  - target:
+      version: v1
+      kind: ConfigMap
+      name: hydra-sql-env
+    path: patches/hydra-sql-env.yaml

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

@@ -28,3 +28,13 @@
   path: "/data/HYDRA_DISPATCHER_SAML_LOGOUT_URL"
   value: https://ssokustom/auth/saml/logout
 
+# Hydra SQL configuration
+- op: replace
+  path: "/data/HYDRA_DISPATCHER_SQL_LOGIN_URL"
+  value: https://ssokustom/auth/sql/login
+- op: replace
+  path: "/data/HYDRA_DISPATCHER_SQL_CONSENT_URL"
+  value: https://ssokustom/auth/sql/consent
+- op: replace
+  path: "/data/HYDRA_DISPATCHER_SQL_LOGOUT_URL"
+  value: https://ssokustom/auth/sql/logout

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

@@ -0,0 +1,24 @@
+- op: replace
+  path: "/data/BASE_URL"
+  value: https://ssokustom/auth/sql
+- op: replace
+  path: "/data/ISSUER_URL"
+  value: https://ssokustom
+- op: replace
+  path: "/data/ISSUER_URL"
+  value: https://ssokustom
+- op: replace
+  path: "/data/HYDRA_ADMIN_BASE_URL"
+  value: http://hydra-dispatcher
+- op: replace
+  path: "/data/DSN_REMOTE_DATABASE"
+  value: pgsql:host='postgres';port=5432;dbname=lasql
+- op: replace
+  path: "/data/REDIS_DSN"
+  value: redis://redis:6379
+- op: replace
+  path: "/data/DB_USER"
+  value: makeMeASecret
+- op: replace
+  path: "/data/DB_PASSWORD"
+  value: rmakeMeASecret

examples/authenticated-app/resources/ingress.yaml

@@ -50,6 +50,30 @@ spec:
 ---
 apiVersion: networking.k8s.io/v1
 kind: Ingress
+metadata:
+  name: auth-sql
+  annotations:
+    cert-manager.io/issuer: "self-signed"
+    nginx.ingress.kubernetes.io/force-ssl-redirect: "true"
+spec:
+  ingressClassName: nginx
+  tls:
+    - hosts:
+        - ssokustom
+      secretName: ssokustom-example-tls
+  rules:
+    - http:
+        paths:
+          - path: /auth/sql(/|$)(.*)
+            pathType: Prefix
+            backend:
+              service:
+                name: hydra-sql
+                port:
+                  name: http
+---
+apiVersion: networking.k8s.io/v1
+kind: Ingress
 metadata:
   name: auth-dispatcher
   annotations:
@@ -124,8 +148,3 @@ spec:
                 name: saml-idp
                 port:
                   name: https
-
-     
-
-      
-          

examples/k8s/kind/cluster/kustomization.yaml

@@ -1,10 +1,11 @@
 apiVersion: kustomize.config.k8s.io/v1beta1
 kind: Kustomization
 resources:
-- https://github.com/jetstack/cert-manager/releases/download/v1.13.2/cert-manager.yaml
-- https://forge.cadoles.com/CadolesKube/c-kustom//base/cloudnative-pg-operator?ref=develop
-- 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
+  - https://github.com/jetstack/cert-manager/releases/download/v1.13.2/cert-manager.yaml
+  - https://forge.cadoles.com/CadolesKube/c-kustom//base/cloudnative-pg-operator?ref=develop
+  - 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
+  - https://raw.githubusercontent.com/ory/k8s/v0.28.2/helm/charts/hydra-maester/crds/crd-oauth2clients.yaml
 
 patchesJson6902:
   - target:

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

@@ -18,7 +18,7 @@ spec:
     spec:
       containers:
         - name: hydra-dispatcher-php-fpm
-        image: reg.cadoles.com/cadoles/hydra-dispatcher-base:2023.12.15-develop.903.b675347
+          image: reg.cadoles.com/cadoles/hydra-dispatcher-base:2024.4.2-develop.1411.74a9f16
           args: ["/usr/sbin/php-fpm81", "-F", "-e"]
           readinessProbe:
             exec:
@@ -48,11 +48,22 @@ spec:
             - mountPath: /app/config/hydra
               name: hydra-dispatcher-apps
           resources: {}
-
-      - image: reg.cadoles.com/cadoles/hydra-dispatcher-base:2023.12.15-develop.903.b675347
+          securityContext:
+            runAsNonRoot: true
+            runAsGroup: 1000
+            runAsUser: 1000
+        - name: hydra-dispatcher-caddy
+          image: reg.cadoles.com/cadoles/hydra-dispatcher-base:2024.4.2-develop.1411.74a9f16
           imagePullPolicy: Always
-        name: hydra-dispatcher-nginx
-        args: ["/usr/sbin/nginx"]
+          args:
+            [
+              "/usr/sbin/caddy",
+              "run",
+              "--adapter",
+              "caddyfile",
+              "--config",
+              "/etc/caddy/Caddyfile",
+            ]
           readinessProbe:
             httpGet:
               path: /health
@@ -71,19 +82,24 @@ spec:
             - configMapRef:
                 name: hydra-dispatcher-env
           env:
-        - name: NGINX_APP_UPSTREAM_BACKEND_SERVER
+            - name: CADDY_APP_UPSTREAM_BACKEND_SERVER
               value: 127.0.0.1:9000
-        - name: NGINX_APP_ROOT
-          value: "/public/"
-        - name: NGINX_APP_PHP_INDEX
-          value: "/index.php"
-        - name: NGINX_ERROR_LOG_LEVEL
-          value: "warn"
-        - name: NGINX_APP_PHP_NON_FILE_PATTERN
-          value: "^/index\\.php(/|$)"
+            - name: CADDY_HTTPS_PORT
+              value: "8443"
+            - name: CADDY_HTTP_PORT
+              value: "8080"
+            - name: CADDY_DATA_FS
+              value: "/tmp/caddy"
+            - name: CADDY_APP_ROOT_PUBLIC
+              value: "/app/public/"
           ports:
             - containerPort: 8080
+              name: http
           resources: {}
+          securityContext:
+            runAsNonRoot: true
+            runAsGroup: 1000
+            runAsUser: 1000
       restartPolicy: Always
       volumes:
         - name: hydra-dispatcher-apps

resources/hydra-dispatcher/resources/hydra-dispatcher-service.yaml

@@ -7,7 +7,8 @@ metadata:
 spec:
   ports:
     - name: http
-      port: 8080
+      port: 80
+      targetPort: http
   selector:
     app.kubernetes.io/name: hydra-dispatcher
 status: