🔐(secrets) update secrets to current main

2026-03-26 16:36:44 +01:00 · 2026-03-26 16:25:19 +01:00 · 2026-03-26 15:26:17 +01:00 · 2026-03-26 15:10:43 +01:00 · 2026-03-26 14:54:48 +01:00 · 2026-03-26 14:53:06 +01:00
30 changed files with 675 additions and 305 deletions
@@ -17,14 +17,14 @@ jobs:
      packages: write
    steps:
      - name: Checkout repository
-        uses: actions/checkout@v4
+        uses: actions/checkout@de0fac2e4500dabe0009e67214ff5f5447ce83dd # v6

      - name: Set up Docker Buildx
-        uses: docker/setup-buildx-action@v3
+        uses: docker/setup-buildx-action@8d2750c68a42422c14e847fe6c8ac0403b4cbd6f # v3

      - name: Docker meta
        id: meta
-        uses: docker/metadata-action@v5
+        uses: docker/metadata-action@c299e40c65443455700f0fdfc63efafe5b349051 # v5
        with:
          images: ghcr.io/${{ github.repository }}
          tags: |
@@ -36,14 +36,14 @@ jobs:
            type=raw,value=latest,enable={{is_default_branch}}

      - name: Login to Github Container Registry
-        uses: docker/login-action@v3
+        uses: docker/login-action@c94ce9fb468520275223c153574b00df6fe4bcc9 # v3
        with:
          registry: ghcr.io
          username: ${{ github.repository_owner }}
          password: ${{ github.token }}

      - name: Build and push
-        uses: docker/build-push-action@v6
+        uses: docker/build-push-action@10e90e3645eae34f1e60eeb005ba3a3d33f178e8 # v6
        with:
          context: .
          target: production
@@ -59,7 +59,7 @@ jobs:
    needs:
      - build-and-push
    steps:
-      - uses: numerique-gouv/action-argocd-webhook-notification@main
+      - uses: numerique-gouv/action-argocd-webhook-notification@cac2ee67896eb13e84e804f60c4271370424eaa8 # main
        id: notify
        with:
          deployment_repo_path: "${{ github.repository }}"
@@ -16,7 +16,7 @@ jobs:
    if: github.event_name == 'pull_request' # Makes sense only for pull requests
    steps:
      - name: Checkout repository
-        uses: actions/checkout@v4
+        uses: actions/checkout@de0fac2e4500dabe0009e67214ff5f5447ce83dd # v6
        with:
            fetch-depth: 0
      - name: show
@@ -39,7 +39,7 @@ jobs:
      github.event_name == 'pull_request'
    steps:
      - name: Checkout repository
-        uses: actions/checkout@v4
+        uses: actions/checkout@de0fac2e4500dabe0009e67214ff5f5447ce83dd # v6
        with:
            fetch-depth: 0
      - name: Check that the CHANGELOG has been modified in the current branch
@@ -49,7 +49,7 @@ jobs:
    runs-on: ubuntu-latest
    steps:
      - name: Checkout repository
-        uses: actions/checkout@v4
+        uses: actions/checkout@de0fac2e4500dabe0009e67214ff5f5447ce83dd # v6
      - name: Check CHANGELOG max line length
        run: |
          max_line_length=$(cat CHANGELOG.md | grep -Ev "^\[.*\]: https://github.com" | wc -L)
@@ -65,11 +65,11 @@ jobs:
        working-directory: src/satosa
    steps:
      - name: Checkout repository
-        uses: actions/checkout@v4
+        uses: actions/checkout@de0fac2e4500dabe0009e67214ff5f5447ce83dd # v6
      - name: Install Python
-        uses: actions/setup-python@v3
+        uses: actions/setup-python@a309ff8b426b58ec0e2a45f0f869d46889d02405 # v6
        with:
-          python-version: '3.11'
+          python-version: '3.14'
      - name: Install development dependencies
        run: |
          # Python's xmlsec requirement
@@ -89,11 +89,11 @@ jobs:
        working-directory: src/satosa
    steps:
      - name: Checkout repository
-        uses: actions/checkout@v4
+        uses: actions/checkout@de0fac2e4500dabe0009e67214ff5f5447ce83dd # v6
      - name: Install Python
-        uses: actions/setup-python@v3
+        uses: actions/setup-python@a309ff8b426b58ec0e2a45f0f869d46889d02405 # v6
        with:
-          python-version: '3.11'
+          python-version: '3.14'
      - name: Install development dependencies
        run: |
          # Python's xmlsec requirement
@@ -110,7 +110,7 @@ jobs:
      image: ghcr.io/helmfile/helmfile:v1.2.0
    steps:
      -
-        uses: actions/create-github-app-token@v1
+        uses: actions/create-github-app-token@29824e69f54612133e76f7eaac726eef6c875baf # v2
        id: app-token
        with:
          app-id: ${{ secrets.APP_ID }}
@@ -119,10 +119,18 @@ jobs:
          repositories: secrets
      -
        name: Checkout repository
-        uses: actions/checkout@v4
+        uses: actions/checkout@de0fac2e4500dabe0009e67214ff5f5447ce83dd # v6
        with:
          submodules: recursive
          token: ${{ steps.app-token.outputs.token }}
+      -
+        name: Install mkcert
+        run: |
+          apt-get update -y -q && apt-get install -y -q libnss3-tools
+          curl -Ss -L -o mkcert https://github.com/FiloSottile/mkcert/releases/download/v1.4.4/mkcert-v1.4.4-linux-amd64
+          chmod +x mkcert
+          mv mkcert /usr/local/bin/
+          TRUST_STORES=none mkcert -install
      -
        name: Helmfile lint
        env:
@@ -6,6 +6,15 @@ The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0),
 and this project adheres to
 [Semantic Versioning](https://semver.org/spec/v2.0.0.html).

+## [1.0.13] - 2026-03-26 
+- switch to stateless OIDC and remove Redis
+
+## [1.0.12] - 2026-03-02
+- upgrade dependencies: Python 3.14.3, gunicorn 25.1.0…
+
+## [1.0.11] - 2025-11-24
+- remove setuptools, wheel and pip from production Docker image
+
 ## [1.0.10] - 2025-11-21
 - rename helmfile.yaml for compatibility with helmfile 1.x

@@ -1,13 +1,17 @@
 # ---- base image to inherit from ----
-FROM python:3.11.12-slim-bookworm AS common
+FROM python:3.14.3-slim-trixie AS common

 # Install xmlsec1 dependencies required for xmlsec (for SAML)
 # Needs to be kept before the `pip install`
-RUN apt-get update && \
+RUN export DEBIAN_FRONTEND=noninteractive && \
+    apt-get update && \
    apt-get -y upgrade && \
    apt-get install -qy --no-install-recommends xmlsec1 && \
    rm -rf /var/lib/apt/lists/*

+# Silence pip warnings about running as root in a container
+ENV PIP_ROOT_USER_ACTION=ignore
+
 # We want the most up-to-date stable pip release
 RUN pip install --upgrade pip

@@ -37,6 +41,10 @@ CMD ["gunicorn", "-c", "/usr/local/etc/gunicorn/satosa.py"]
 # ---- Development image ----
 FROM common AS development

+# Install curl (for healthchecks)
+RUN export DEBIAN_FRONTEND=noninteractive && \
+    apt-get update && apt-get install -qy curl
+
 # Playwright browsers
 ENV PLAYWRIGHT_BROWSERS_PATH=/pw-browsers
 RUN pip install playwright
@@ -68,7 +76,8 @@ COPY ./src/satosa /app/

 WORKDIR /app

-RUN pip install .
+# Uninstall pip, setuptools and wheel after installation to reduce attack surface
+RUN pip install . && pip uninstall -y setuptools wheel pip

 # Switch to unprivileged user
 USER ${DOCKER_USER}
@@ -13,6 +13,11 @@ docker_build(
    ]
 )

+docker_build(
+    'localhost:5001/oidc-test-client:latest',
+    context='docker/oidc-test-client'
+)
+
 watch_file('src/helm')

 k8s_yaml(local('cd src/helm && helmfile -n oidc2fer -e dev template .'))
@@ -14,7 +14,7 @@ services:
      GUNICORN_CMD_ARGS: --workers=2
      TEST_E2E: 1
      #TEST_E2E_PC: 1
-      OIDC_DB_URI: redis://redis/0
+      OIDC_DB_URI: stateless://:STATE-ENCRYPTION-KEY@localhost
      CLIENT_DB_JSON: |
        {
          "oidc-test-client": {
@@ -30,7 +30,7 @@ services:
          }
        }
      SAML2_DISCOVERY_URL: https://discovery.renater.fr/test/
-      SAML2_METADATA_URL: https://pub.federation.renater.fr/metadata/test/preview/preview-idps-test-metadata.xml
+      SAML2_METADATA_URL: https://pub.federation.renater.fr/metadata/test/idps.xml
      SAML2_ENTITY_ID: https://satosa.traefik.me/Saml2/proxy_saml2_backend.xml
    env_file:
      - env.d/development/common
@@ -38,8 +38,13 @@ services:
    volumes:
      - ./src/satosa:/app
      - ./docker/files/usr/local/etc/gunicorn/satosa.py:/usr/local/etc/gunicorn/satosa.py
-    depends_on:
-      - redis
+    healthcheck:
+      test: ["CMD", "curl", "--fail", "http://localhost:8000/ping"]
+      interval: 60s
+      timeout: 5s
+      retries: 3
+      start_period: 30s
+      start_interval: 1s

  oidc-test-client:
    build: docker/oidc-test-client
@@ -70,9 +75,6 @@ services:
    extra_hosts:
      - "oidc2fer.127.0.0.1.nip.io:host-gateway"

-  redis:
-    image: redis:7.2.4
-
  nginx:
    image: nginx:1.25
    ports:
@@ -39,11 +39,5 @@ printenv SAML2_BACKEND_KEY > /tmp/backend.key
 printenv OIDC_FRONTEND_KEY > /tmp/frontend.key
 printenv CLIENT_DB_JSON > /tmp/client_db.json

-# Redis database number must be specified
-if [[ ! $OIDC_DB_URI =~ /[0-9]+$ ]]; then
-    echo "🐳(entrypoint) adding db id to OIDC_DB_URI"
-    export OIDC_DB_URI=$OIDC_DB_URI/0
-fi
-
 echo "🐳(entrypoint) running your command: ${*}"
 exec "$@"
@@ -1,4 +1,4 @@
-FROM python:3.11
+FROM python:3.14.3-slim-trixie

 COPY . /app

@@ -0,0 +1,22 @@
+image:
+  repository: localhost:5001/oidc-test-client
+  pullPolicy: Always
+  tag: "latest"
+
+ingress:
+  enabled: true
+  host: oidc-test-client.127.0.0.1.nip.io
+
+env:
+  - name: OIDC_ROOT_URL
+    value: https://oidc-test-client.127.0.0.1.nip.io
+  - name: OIDC_PROVIDER
+    value: https://oidc2fer.127.0.0.1.nip.io
+  - name: OIDC_CLIENT_ID
+    value: oidc-test-client
+  - name: OIDC_CLIENT_SECRET
+    value: oidc-test-secret
+  - name: OIDC_SCOPES
+    value: openid,uid,given_name,usual_name,email,siret
+  - name: EXTRA_ROOT_CA
+    value: {{ exec "mkcert" (list "-CAROOT") | trim | printf "%s/rootCA.pem" | readFile | quote }}
@@ -5,41 +5,57 @@ image:

 satosa:
  replicas: 1
-  envVars:
-    BASE_URL: https://oidc2fer.127.0.0.1.nip.io
-    GUNICORN_CMD_ARGS: --workers=3
+  env:
+    - name: BASE_URL
+      value: https://oidc2fer.127.0.0.1.nip.io
+    
+    - name: GUNICORN_CMD_ARGS
+      value: --workers=3

-    LOG_LEVEL: debug
+    - name: LOG_LEVEL
+      value: debug

-    SAML2_DISCOVERY_URL: https://discovery.renater.fr/test/
-    SAML2_METADATA_URL: https://pub.federation.renater.fr/metadata/test/preview/preview-idps-test-metadata.xml
-    SAML2_ENTITY_ID:  https://oidc2fer.127.0.0.1.nip.io/Saml2/proxy_saml2_backend.xml
+    - name: SAML2_DISCOVERY_URL
+      value: https://discovery.renater.fr/test/
+    - name: SAML2_METADATA_URL
+      value: https://pub.federation.renater.fr/metadata/test/idps.xml
+    - name: SAML2_ENTITY_ID
+      value: https://oidc2fer.127.0.0.1.nip.io/Saml2/proxy_saml2_backend.xml

-    STATE_ENCRYPTION_KEY: { secretKeyRef: { name: oidc2fer, key: STATE_ENCRYPTION_KEY } }
-    SAML2_BACKEND_CERT:   { secretKeyRef: { name: oidc2fer, key: SAML2_BACKEND_CERT   } }
-    SAML2_BACKEND_KEY:    { secretKeyRef: { name: oidc2fer, key: SAML2_BACKEND_KEY    } }
-    OIDC_FRONTEND_KEY:    { secretKeyRef: { name: oidc2fer, key: OIDC_FRONTEND_KEY    } }
+    - name: STATE_ENCRYPTION_KEY
+      valueFrom: { secretKeyRef: { name: oidc2fer, key: STATE_ENCRYPTION_KEY } }
+    - name: SAML2_BACKEND_CERT
+      valueFrom: { secretKeyRef: { name: oidc2fer, key: SAML2_BACKEND_CERT   } }
+    - name: SAML2_BACKEND_KEY
+      valueFrom: { secretKeyRef: { name: oidc2fer, key: SAML2_BACKEND_KEY    } }
+    - name: OIDC_FRONTEND_KEY
+      valueFrom: { secretKeyRef: { name: oidc2fer, key: OIDC_FRONTEND_KEY    } }

-    OIDC_DB_URI: "redis://:pass@redis-master:6379"
-    CLIENT_DB_JSON: |-
-      {
-        "oidc-test-client": {
-          "response_types": [
-            "id_token",
-            "code"
-          ],
-          "redirect_uris": [
-            "https://oidc-test-client.traefik.me/redirect_uri",
-            "https://oidc-test-client.traefik.me:8443/redirect_uri"
-          ],
-          "client_secret": "oidc-test-secret",
-          "token_endpoint_auth_method": "client_secret_post"
+    - name: OIDC_DB_URI
+      value: "stateless://:$(STATE_ENCRYPTION_KEY)@localhost"
+
+    - name: CLIENT_DB_JSON
+      value: |-
+        {
+          "oidc-test-client": {
+            "response_types": [
+              "id_token",
+              "code"
+            ],
+            "redirect_uris": [
+              "https://oidc-test-client.traefik.me/redirect_uri",
+              "https://oidc-test-client.traefik.me:8443/redirect_uri",
+              "https://oidc-test-client.127.0.0.1.nip.io/redirect_uri"
+            ],
+            "client_secret": "oidc-test-secret",
+            "token_endpoint_auth_method": "client_secret_post"
+          }
+        }
+    - name: SIRET_MAP
+      value: |-
+        {
+            "https://test-idp.federation.renater.fr/idp/shibboleth": "12345678200010"
        }
-      }
-    SIRET_MAP: |-
-      {
-          "https://test-idp.federation.renater.fr/idp/shibboleth": "12345678200010"
-      }

 ingress:
  enabled: true
@@ -1,116 +1,172 @@
 image:
  repository: ghcr.io/proconnect-gouv/oidc2fer
  pullPolicy: Always
-  tag: "v1.0.10"
+  tag: "v1.0.13"

 satosa:
  replicas: 2
-  envVars:
-    BASE_URL: https://renater.agentconnect.gouv.fr
-    GUNICORN_CMD_ARGS: --workers=3
+  env:
+    - name: BASE_URL
+      value: https://renater.agentconnect.gouv.fr
+    - name: GUNICORN_CMD_ARGS
+      value: --workers=3

-    LOG_LEVEL: INFO
-    LOG_LEVELS: '{ "satosa.backends.saml2": "DEBUG" }'
+    - name: LOG_LEVEL
+      value: INFO
+    - name: LOG_LEVELS
+      value: '{ "satosa.backends.saml2": "DEBUG" }'

-    SAML2_DISCOVERY_URL: https://discovery.renater.fr/agentconnect/
-    SAML2_METADATA_URL: https://pub.federation.renater.fr/metadata/renater/main/main-idps-renater-metadata.xml
-    SAML2_ENTITY_ID:  https://renater.agentconnect.gouv.fr/Saml2/proxy_saml2_backend.xml
+    - name: SAML2_DISCOVERY_URL
+      value: https://discovery.renater.fr/agentconnect/
+    - name: SAML2_METADATA_URL
+      value: https://pub.federation.renater.fr/metadata/fer/idps.xml
+    - name: SAML2_ENTITY_ID
+      value: https://renater.agentconnect.gouv.fr/Saml2/proxy_saml2_backend.xml

-    STATE_ENCRYPTION_KEY: { secretKeyRef: { name: oidc2fer, key: STATE_ENCRYPTION_KEY } }
-    SAML2_BACKEND_CERT:   { secretKeyRef: { name: oidc2fer, key: SAML2_BACKEND_CERT   } }
-    SAML2_BACKEND_KEY:    { secretKeyRef: { name: oidc2fer, key: SAML2_BACKEND_KEY    } }
-    OIDC_FRONTEND_KEY:    { secretKeyRef: { name: oidc2fer, key: OIDC_FRONTEND_KEY    } }
-    CLIENT_DB_JSON:       { secretKeyRef: { name: oidc2fer, key: CLIENT_DB_JSON       } }
+    - name: STATE_ENCRYPTION_KEY
+      valueFrom: { secretKeyRef: { name: oidc2fer, key: STATE_ENCRYPTION_KEY } }
+    - name: SAML2_BACKEND_CERT
+      valueFrom: { secretKeyRef: { name: oidc2fer, key: SAML2_BACKEND_CERT   } }
+    - name: SAML2_BACKEND_KEY
+      valueFrom: { secretKeyRef: { name: oidc2fer, key: SAML2_BACKEND_KEY    } }
+    - name: OIDC_FRONTEND_KEY
+      valueFrom: { secretKeyRef: { name: oidc2fer, key: OIDC_FRONTEND_KEY    } }
+    - name: CLIENT_DB_JSON
+      valueFrom: { secretKeyRef: { name: oidc2fer, key: CLIENT_DB_JSON       } }

-    OIDC_DB_URI: { secretKeyRef: { name: redis.redis.libre.sh, key: url } }
+    - name: OIDC_DB_URI
+      value: "stateless://:$(STATE_ENCRYPTION_KEY)@localhost"

-    # As provided by RENATER on 2025-09-19
-    SIRET_MAP: |-
-      {
-        "https://shibboleth.grenoble-inp.fr/idp/shibboleth": "19381912500017",
-        "https://identites.ensea.fr/idp/shibboleth": "19951376300011",
-        "https://idp.ent.dauphine.fr/idp/shibboleth": "19754692200018",
-        "https://idp.univ-lyon2.fr/idp/shibboleth": "19691775100014",
-        "https://shibboleth.insa-rouen.fr/idp/shibboleth": "19760165100023",
-        "https://idp1.univ-fcomte.fr/idp/shibboleth": "93810656400017",
-        "https://idp.univ-tours.fr/idp/shibboleth": "19370800500478",
-        "https://apps.univ-lr.fr/idp/shibboleth": "19170032700015",
-        "https://shib.mines-albi.fr/idp/shibboleth": "18009202500097",
-        "https://federation.upf.pf/idp/shibboleth": "19987001500013",
-        "https://federation.utbm.fr/idp/shibboleth": "19900356700013",
-        "urn:mace:cru.fr:federation:univ-paris1.fr": "19751717000019",
-        "https://idp.sciencespobordeaux.fr/idp/shibboleth": "19330192600039",
-        "https://vip.espci.fr/saml2/idp/metadata.php": "20000068500012",
-        "urn:mace:cru.fr:federation:univ-nantes.fr": "13002974700016",
-        "https://shibboleth.univ-corse.fr/idp/shibboleth": "19202664900264",
-        "https://srv-fii.insa-toulouse.fr/idp/shibboleth": "19310152400018",
-        "urn:mace:cru.fr:federation:univ-rouen.fr": "19761904200017",
-        "https://ident-shib.ensc-rennes.fr/idp/shibboleth": "19350077400016",
-        "urn:mace:cru.fr:federation:unilim.fr": "19870669900321",
-        "https://idp.inha.fr/idp/shibboleth": "19754688000018",
-        "https://federation.unimes.fr/idp/shibboleth": "93249157400012",
-        "urn:mace:cru.fr:federation:univ-rennes1.fr": "13003051300019",
-        "urn:mace:cru.fr:federation:univ-ubs.fr": "19561718800600",
-        "https://idp.univ-orleans.fr/idp/shibboleth": "19450855200016",
-        "https://shibboleth.univ-savoie.fr/idp/shibboleth": "19730858800015",
-        "https://idp.cirad.fr/idp/shibboleth": "33159627000016",
-        "https://sso.ird.fr/idp/shibboleth": "18000602500159",
-        "https://idp.ensma.fr/idp/shibboleth": "19860073600021",
-        "https://idp.renater.fr/idp/shibboleth": "18008947600055",
-        "https://idp.inp-toulouse.fr/idp/shibboleth": "19311381800127",
-        "https://idp.unistra.fr/idp/shibboleth": "13000545700010",
-        "https://idp1.agroparistech.fr/idp/shibboleth": "13000285000134",
-        "https://janus.cnrs.fr/idp": "18008901303720",
-        "https://federation.umontpellier.fr/idp/shibboleth": "13002979600013",
-        "https://idp.sciencespo-lyon.fr/idp/shibboleth": "19690173000024",
-        "https://shibboleth.univ-grenoble-alpes.fr/idp/shibboleth": "13002608100013",
-        "https://idp.bnu.fr/idp/shibboleth": "18004406700015",
-        "https://ruhnu.univ-tlse2.fr/idp/shibboleth": "19311383400017",
-        "https://idp2.amue.fr/idp/shibboleth": "18004312700091",
-        "https://idpv3.univ-amu.fr/idp/shibboleth": "13001533200013",
-        "https://idp-ng.univ-st-etienne.fr/idp/shibboleth": "93850168100010",
-        "https://identities.univ-jfc.fr/idp/prod": "19811201300018",
-        "https://idp3.univ-lorraine.fr/idp/shibboleth": "13001550600012",
-        "https://idp.univ-lemans.fr/idp/shibboleth": "19720916600010",
-        "https://idp.univ-lille.fr/idp/shibboleth": "13002975400012",
-        "https://idp.univ-tln.fr/idp/shibboleth": "19830766200017",
-        "https://idp.uca.fr/idp/shibboleth": "13002806100013",
-        "https://shibboleth3.utt.fr/idp/shibboleth": "19101060200032",
-        "https://idp3.ut-capitole.fr/idp/shibboleth": "13003061200019",
-        "https://idp.imt-atlantique.fr/idp/shibboleth": "18009202500121",
-        "https://shib.univ-lehavre.fr/idp/shibboleth": "19762762300097",
-        "https://idp2.univ-paris8.fr/idp/shibboleth": "19931827000014",
-        "https://shib2.unc.nc/idp/shibboleth": "13000322100012",
-        "https://upnidp2.parisnanterre.fr/idp/shibboleth": "19921204400010",
-        "https://idp.ensfea.fr/idp/shibboleth": "19310143300012",
-        "https://idp.univ-eiffel.fr/idp/shibboleth": "13002612300013",
-        "https://idp.insa-rennes.fr/idp/shibboleth": "19350097200016",
-        "https://idp.univ-tlse3.fr/idp/shibboleth": "93827139200012",
-        "https://idp.universite-paris-saclay.fr/idp": "13002602400054",
-        "https://shibboleth.ens2m.fr/idp/shibboleth": "19250082500026",
-        "https://sso-ciation-saclay.centralesupelec.fr/idp/shibboleth": "13002076100016",
-        "https://federation.ens.psl.eu/idp/shibboleth": "19753459700012",
-        "https://authentification.inrae.fr/saml/metadata/idp": "18007003901803",
-        "https://idp.ensam.eu/idp/shibboleth": "19753472000010",
-        "https://idp1.ens-paris-saclay.fr/idp/shibboleth": "19940607500036",
-        "https://idp2.emse.fr/idp/shibboleth": "18009202500105",
-        "https://idp-septa.onisep.fr/idp/shibboleth": "18004302800653",
-        "https://papangue.vetagro-sup.fr/idp/shibboleth": "13000858400018",
-        "https://multipass.imt-nord-europe.fr/idp/shibboleth": "18009202500139",
-        "https://idp4.unicaen.fr/idp/shibboleth": "19141408500016",
-        "https://sso.bordeaux-inp.fr/idp/shibboleth": "13000635600013",
-        "https://auth.uttop.fr/saml/metadata": "19650048200019",
-        "https://idp.univ-cotedazur.fr/idp/shibboleth": "13002566100013",
-        "https://idp2.brgm.fr/idp/shibboleth": "58205614900120",
-        "https://idp.crous-reims.fr/idp/shibboleth": "18510200100327",
-        "https://idp.univ-avignon.fr/idp/shibboleth": "19840685200204",
-        "https://idp-genci.renater.fr/idp/shibboleth": "49468697500041",
-        "https://auth.sso.vet-alfort.fr/saml/metadata": "19940608300014",
-        "https://idp.univ-perp.fr/idp/shibboleth": "19660437500010",
-        "https://idp.institut-agro.fr/idp": "13002622200013",
-        "https://prod-idp.inria.fr": "18008904700013",
-        "https://idp.ec-nantes.fr/idp/shibboleth": "19440100600011"
-      }
+    # As provided by RENATER
+    - name: SIRET_MAP
+      value: |-
+        {
+          "http://idp.univ-poitiers.fr": "19860856400375",
+          "https://apps.univ-lr.fr/idp/shibboleth": "19170032700015",
+          "https://auth.sso.vet-alfort.fr/saml/metadata": "19940608300014",
+          "https://auth.uttop.fr/saml/metadata": "19650048200019",
+          "https://authentification.inrae.fr/saml/metadata/idp": "18007003901803",
+          "https://federation.ens.psl.eu/idp/shibboleth": "19753459700012",
+          "https://federation.umontpellier.fr/idp/shibboleth": "13002979600013",
+          "https://federation.unimes.fr/idp/shibboleth": "93249157400012",
+          "https://federation.upf.pf/idp/shibboleth": "19987001500013",
+          "https://federation.utbm.fr/idp/shibboleth": "19900356700013",
+          "https://federation3.univ-brest.fr/idp/shibboleth": "94129831700012",
+          "https://idauthproxy.insa-lyon.fr/Saml2IDP/metadata": "19690192000013",
+          "https://ident-shib.ensc-rennes.fr/idp/shibboleth": "19350077400016",
+          "https://identification.univ-toulouse.fr": "13002132200016",
+          "https://identites.ec-lyon.fr/idp/shibboleth": "19690187000010",
+          "https://identites.ensea.fr/idp/shibboleth": "19951376300011",
+          "https://identities.univ-jfc.fr/idp/prod": "19811201300018",
+          "https://idp-genci.renater.fr/idp/shibboleth": "49468697500041",
+          "https://idp-ng.univ-st-etienne.fr/idp/shibboleth": "93850168100010",
+          "https://idp-septa.onisep.fr/idp/shibboleth": "18004302800653",
+          "https://idp-v4.univ-montp3.fr/idp/shibboleth": "93249089900014",
+          "https://idp.bnu.fr/idp/shibboleth": "18004406700015",
+          "https://idp.cirad.fr/idp/shibboleth": "33159627000016",
+          "https://idp.crous-reims.fr/idp/shibboleth": "18510200100327",
+          "https://idp.ec-nantes.fr/idp/shibboleth": "19440100600011",
+          "https://idp.ehesp.fr/idp/shibboleth": "13000362700010",
+          "https://idp.ens-lyon.fr/idp/shibboleth": "13000812100019",
+          "https://idp.ensam.eu/idp/shibboleth": "19753472000010",
+          "https://idp.ensfea.fr/idp/shibboleth": "19310143300012",
+          "https://idp.ensma.fr/idp/shibboleth": "19860073600021",
+          "https://idp.ent.dauphine.fr/idp/shibboleth": "19754692200018",
+          "https://idp.imt-atlantique.fr/idp/shibboleth": "18009202500121",
+          "https://idp.inha.fr/idp/shibboleth": "19754688000018",
+          "https://idp.inp-toulouse.fr/idp/shibboleth": "19311381800127",
+          "https://idp.insa-rennes.fr/idp/shibboleth": "19350097200016",
+          "https://idp.institut-agro.fr/idp": "13002622200013",
+          "https://idp.isae.fr/idp/shibboleth": "13000427800011",
+          "https://idp.lyon.archi.fr/idp/shibboleth": "19690184700018",
+          "https://idp.renater.fr/idp/shibboleth": "18008947600055",
+          "https://idp.rennes.archi.fr/idp/shibboleth": "19350089900029",
+          "https://idp.sciencespo-lyon.fr/idp/shibboleth": "19690173000024",
+          "https://idp.sciencespobordeaux.fr/idp/shibboleth": "19330192600039",
+          "https://idp.uca.fr/idp/shibboleth": "13002806100013",
+          "https://idp.uha.fr/idp/shibboleth": "19681166500013",
+          "https://idp.unistra.fr/idp/shibboleth": "13000545700010",
+          "https://idp.univ-avignon.fr/idp/shibboleth": "19840685200204",
+          "https://idp.univ-cotedazur.fr/idp/shibboleth": "13002566100013",
+          "https://idp.univ-eiffel.fr/idp/shibboleth": "13002612300013",
+          "https://idp.univ-lemans.fr/idp/shibboleth": "19720916600010",
+          "https://idp.univ-lille.fr/idp/shibboleth": "13002975400012",
+          "https://idp.univ-lyon2.fr/idp/shibboleth": "19691775100014",
+          "https://idp.univ-lyon3.fr/idp/shibboleth": "19692437700282",
+          "https://idp.univ-orleans.fr/idp/shibboleth": "19450855200016",
+          "https://idp.univ-perp.fr/idp/shibboleth": "19660437500010",
+          "https://idp.univ-tln.fr/idp/shibboleth": "19830766200017",
+          "https://idp.univ-tlse3.fr/idp/shibboleth": "93827139200012",
+          "https://idp.univ-tours.fr/idp/shibboleth": "19370800500478",
+          "https://idp.universite-paris-saclay.fr/idp": "13002602400054",
+          "https://idp1.agroparistech.fr/idp/shibboleth": "13000285000134",
+          "https://idp1.ens-paris-saclay.fr/idp/shibboleth": "19940607500036",
+          "https://idp1.univ-fcomte.fr/idp/shibboleth": "93810656400017",
+          "https://idp2.amue.fr/idp/shibboleth": "18004312700091",
+          "https://idp2.brgm.fr/idp/shibboleth": "58205614900120",
+          "https://idp2.emse.fr/idp/shibboleth": "18009202500105",
+          "https://idp2.univ-paris8.fr/idp/shibboleth": "19931827000014",
+          "https://idp3.univ-lorraine.fr/idp/shibboleth": "13001550600012",
+          "https://idp3.ut-capitole.fr/idp/shibboleth": "13003061200019",
+          "https://idp4.unicaen.fr/idp/shibboleth": "19141408500016",
+          "https://idpv3.univ-amu.fr/idp/shibboleth": "13001533200013",
+          "https://janus.cnrs.fr/idp": "18008901303720",
+          "https://multipass.imt-nord-europe.fr/idp/shibboleth": "18009202500139",
+          "https://papangue.vetagro-sup.fr/idp/shibboleth": "13000858400018",
+          "https://prod-idp.inria.fr": "18008904700013",
+          "https://ruhnu.univ-tlse2.fr/idp/shibboleth": "19311383400017",
+          "https://shib.mines-albi.fr/idp/shibboleth": "18009202500097",
+          "https://shib.univ-lehavre.fr/idp/shibboleth": "19762762300097",
+          "https://identite.univ-reims.fr/idp/shibboleth": "19511296600799",
+          "https://shib2.unc.nc/idp/shibboleth": "13000322100012",
+          "https://shibboleth.ens2m.fr/idp/shibboleth": "19250082500026",
+          "https://shibboleth.grenoble-inp.fr/idp/shibboleth": "19381912500017",
+          "https://shibboleth.insa-rouen.fr/idp/shibboleth": "19760165100023",
+          "https://shibboleth.ube.fr/idp/shibboleth": "93823061200013",
+          "https://shibboleth.univ-corse.fr/idp/shibboleth": "19202664900264",
+          "https://shibboleth.univ-evry.fr/idp/shibboleth": "19911975100014",
+          "https://shibboleth.univ-grenoble-alpes.fr/idp/shibboleth": "13002608100013",
+          "https://shibboleth.univ-savoie.fr/idp/shibboleth": "19730858800015",
+          "https://shibboleth03.chartes.psl.eu/idp/shibboleth": "19753478700043",
+          "https://shibboleth3.utt.fr/idp/shibboleth": "19101060200032",
+          "https://srv-fii.insa-toulouse.fr/idp/shibboleth": "19310152400018",
+          "https://sso-ciation-saclay.centralesupelec.fr/idp/shibboleth": "13002076100016",
+          "https://sso.bordeaux-inp.fr/idp/shibboleth": "13000635600013",
+          "https://sso.ird.fr/idp/shibboleth": "18000602500159",
+          "https://upnidp2.parisnanterre.fr/idp/shibboleth": "19921204400010",
+          "https://vip.espci.fr/saml2/idp/metadata.php": "20000068500012",
+          "urn:mace:cru.fr:federation:uhb.fr": "19350937900015",
+          "urn:mace:cru.fr:federation:unilim.fr": "19870669900321",
+          "urn:mace:cru.fr:federation:univ-nantes.fr": "13002974700016",
+          "urn:mace:cru.fr:federation:univ-paris1.fr": "19751717000019",
+          "urn:mace:cru.fr:federation:univ-rennes1.fr": "13003051300019",
+          "urn:mace:cru.fr:federation:univ-rouen.fr": "19761904200017",
+          "urn:mace:cru.fr:federation:univ-ubs.fr": "19561718800600",
+          "https://idp.marseille.archi.fr/idp/shibboleth": "19130236300020",
+          "https://idp.inalco.fr/idp/shibboleth": "19753488600092",
+          "https://idp.sigma-clermont.fr/idp/shibboleth": "13002191800011",
+          "https://idp.univ-artois.fr/idp/shibboleth": "19624401600016",
+          "https://idp2.ensai.fr/idp/shibboleth": "13001422800055",
+          "urn:mace:cru.fr:federation:univ-lyon1.fr": "19691774400019",
+          "https://idp.enitab.fr/idp/shibboleth": "19330203100011",
+          "https://idp.oca.eu/idp/shibboleth": "19061563300012",
+          "https://idp.univ-paris13.fr/idp/shibboleth": "19931238000017",
+          "https://idp.ens-rennes.fr/idp/shibboleth": "13001848400019",
+          "https://idp.uphf.fr/idp/shibboleth": "13002574500014",
+          "https://idp.college-de-france.fr/idp/shibboleth": "19753480300014",
+          "https://shibboleth.csi.uvsq.fr/idp/shibboleth": "19781944400013",
+          "https://idp.esaip.org/idp/shibboleth": "37920438100014",
+          "https://idp.eskn.fr/idp/shibboleth": "13002617200010",
+          "https://auth.centrale-marseille.fr/idp/shibboleth": "19133340000015",
+          "https://idp-insa-cvl.renater.fr/idp/shibboleth": "13001833600011",
+          "https://shibboleth3.obspm.fr/idp/shibboleth": "19753496900013",
+          "https://idp-ecole-air.renater.fr/idp/shibboleth": "13002454000010",
+          "https://idp.enpc.fr/saml/metadata": "19753501600020",
+          "https://idp.paris-malaquais.archi.fr/idp/shibboleth": "18009221500011",
+          "https://idp.univ-pau.fr/idp/shibboleth": "19640251500270",
+          "https://idp4.cereq.fr/idp/shibboleth": "18004303600037",
+          "urn:mace:cru.fr:federation:univ-angers.fr": "19490970100303"
+        }

 ingress:
  enabled: true
@@ -5,29 +5,43 @@ image:

 satosa:
  replicas: 2
-  envVars:
-    BASE_URL: https://oidc2fer-staging.beta.numerique.gouv.fr
-    GUNICORN_CMD_ARGS: --workers=3
+  env:
+    - name: BASE_URL
+      value: https://oidc2fer-staging.beta.numerique.gouv.fr
+    - name: GUNICORN_CMD_ARGS
+      value: --workers=3

-    LOG_LEVEL: DEBUG
-    LOG_LEVELS: '{ "satosa.backends.saml2": "DEBUG" }'
+    - name: LOG_LEVEL
+      value: DEBUG
+    - name: LOG_LEVELS
+      value: '{ "satosa.backends.saml2": "DEBUG" }'

-    SAML2_DISCOVERY_URL: https://discovery.renater.fr/test/
-    SAML2_METADATA_URL: https://pub.federation.renater.fr/metadata/test/preview/preview-idps-test-metadata.xml
-    SAML2_ENTITY_ID:  https://oidc2fer-staging.beta.numerique.gouv.fr/Saml2/proxy_saml2_backend.xml-test
+    - name: SAML2_DISCOVERY_URL
+      value: https://discovery.renater.fr/test/
+    - name: SAML2_METADATA_URL
+      value: https://pub.federation.renater.fr/metadata/test/idps.xml
+    - name: SAML2_ENTITY_ID
+      value: https://oidc2fer-staging.beta.numerique.gouv.fr/Saml2/proxy_saml2_backend.xml-test

-    STATE_ENCRYPTION_KEY: { secretKeyRef: { name: oidc2fer, key: STATE_ENCRYPTION_KEY } }
-    SAML2_BACKEND_CERT:   { secretKeyRef: { name: oidc2fer, key: SAML2_BACKEND_CERT   } }
-    SAML2_BACKEND_KEY:    { secretKeyRef: { name: oidc2fer, key: SAML2_BACKEND_KEY    } }
-    OIDC_FRONTEND_KEY:    { secretKeyRef: { name: oidc2fer, key: OIDC_FRONTEND_KEY    } }
-    CLIENT_DB_JSON:       { secretKeyRef: { name: oidc2fer, key: CLIENT_DB_JSON       } }
+    - name: STATE_ENCRYPTION_KEY
+      valueFrom: { secretKeyRef: { name: oidc2fer, key: STATE_ENCRYPTION_KEY } }
+    - name: SAML2_BACKEND_CERT
+      valueFrom: { secretKeyRef: { name: oidc2fer, key: SAML2_BACKEND_CERT   } }
+    - name: SAML2_BACKEND_KEY
+      valueFrom: { secretKeyRef: { name: oidc2fer, key: SAML2_BACKEND_KEY    } }
+    - name: OIDC_FRONTEND_KEY
+      valueFrom: { secretKeyRef: { name: oidc2fer, key: OIDC_FRONTEND_KEY    } }
+    - name: CLIENT_DB_JSON
+      valueFrom: { secretKeyRef: { name: oidc2fer, key: CLIENT_DB_JSON       } }

-    OIDC_DB_URI: { secretKeyRef: { name: redis.redis.libre.sh, key: url } }
+    - name: OIDC_DB_URI
+      value: "stateless://:$(STATE_ENCRYPTION_KEY)@localhost"

-    SIRET_MAP: |-
-      {
-          "https://test-idp.federation.renater.fr/idp/shibboleth": "12345678200010"
-      }
+    - name: SIRET_MAP
+      value: |-
+        {
+            "https://test-idp.federation.renater.fr/idp/shibboleth": "12345678200010"
+        }

 ingress:
  enabled: true
@@ -1,5 +0,0 @@
-apiVersion: v2
-name: extra
-description: A Helm chart to add some manifests to oidc2fer
-type: application
-version: 0.1.0
@@ -1,7 +0,0 @@
-apiVersion: core.libre.sh/v1alpha1
-kind: Redis
-metadata:
-  name: redis
-  namespace: {{ .Release.Namespace | quote }}
-spec:
-  disableAuth: false
@@ -21,23 +21,6 @@ repositories:
  oci: true

 releases:
-  - name: redis
-    installed: {{ eq .Environment.Name "dev" | toYaml }}
-    namespace: {{ .Namespace }}
-    chart: bitnami/redis
-    version: 18.19.2
-    values:
-      - auth:
-          password: pass
-        architecture: standalone
-
-  - name: extra
-    installed: {{ ne .Environment.Name "dev" | toYaml }}
-    namespace: {{ .Namespace }}
-    chart: ./extra
-    secrets:
-      - env.d/{{ .Environment.Name }}/secrets.enc.yaml
-
  - name: oidc2fer
    version: {{ .Values.version }}
    namespace: {{ .Namespace }}
@@ -46,3 +29,11 @@ releases:
      - env.d/{{ .Environment.Name }}/values.oidc2fer.yaml.gotmpl
    secrets:
      - env.d/{{ .Environment.Name }}/secrets.enc.yaml
+
+  - name: oidc-test-client
+    installed: {{ eq .Environment.Name "dev" }}
+    version: {{ .Values.version }}
+    namespace: {{ .Namespace }}
+    chart: ./oidc-test-client
+    values:
+      - env.d/{{ .Environment.Name }}/values.oidc-test-client.yaml.gotmpl
@@ -0,0 +1,24 @@
+apiVersion: v2
+name: oidc-test-client
+description: Test OIDC client
+
+# A chart can be either an 'application' or a 'library' chart.
+#
+# Application charts are a collection of templates that can be packaged into versioned archives
+# to be deployed.
+#
+# Library charts provide useful utilities or functions for the chart developer. They're included as
+# a dependency of application charts to inject those utilities and functions into the rendering
+# pipeline. Library charts do not define any templates and therefore cannot be deployed.
+type: application
+
+# This is the chart version. This version number should be incremented each time you make changes
+# to the chart and its templates, including the app version.
+# Versions are expected to follow Semantic Versioning (https://semver.org/)
+version: 0.1.0
+
+# This is the version number of the application being deployed. This version number should be
+# incremented each time you make changes to the application. Versions are not expected to
+# follow Semantic Versioning. They should reflect the version the application is using.
+# It is recommended to use it with quotes.
+appVersion: "1.0.0"
@@ -0,0 +1,51 @@
+{{/*
+Expand the name of the chart.
+*/}}
+{{- define "oidc-test-client.name" -}}
+{{- default .Chart.Name .Values.nameOverride | trunc 63 | trimSuffix "-" }}
+{{- end }}
+
+{{/*
+Create a default fully qualified app name.
+We truncate at 63 chars because some Kubernetes name fields are limited to this (by the DNS naming spec).
+If release name contains chart name it will be used as a full name.
+*/}}
+{{- define "oidc-test-client.fullname" -}}
+{{- if .Values.fullnameOverride }}
+{{- .Values.fullnameOverride | trunc 63 | trimSuffix "-" }}
+{{- else }}
+{{- $name := default .Chart.Name .Values.nameOverride }}
+{{- if contains $name .Release.Name }}
+{{- .Release.Name | trunc 63 | trimSuffix "-" }}
+{{- else }}
+{{- printf "%s-%s" .Release.Name $name | trunc 63 | trimSuffix "-" }}
+{{- end }}
+{{- end }}
+{{- end }}
+
+{{/*
+Create chart name and version as used by the chart label.
+*/}}
+{{- define "oidc-test-client.chart" -}}
+{{- printf "%s-%s" .Chart.Name .Chart.Version | replace "+" "_" | trunc 63 | trimSuffix "-" }}
+{{- end }}
+
+{{/*
+Common labels
+*/}}
+{{- define "oidc-test-client.labels" -}}
+helm.sh/chart: {{ include "oidc-test-client.chart" . }}
+{{ include "oidc-test-client.selectorLabels" . }}
+{{- if .Chart.AppVersion }}
+app.kubernetes.io/version: {{ .Chart.AppVersion | quote }}
+{{- end }}
+app.kubernetes.io/managed-by: {{ .Release.Service }}
+{{- end }}
+
+{{/*
+Selector labels
+*/}}
+{{- define "oidc-test-client.selectorLabels" -}}
+app.kubernetes.io/name: {{ include "oidc-test-client.name" . }}
+app.kubernetes.io/instance: {{ .Release.Name }}
+{{- end }}
@@ -0,0 +1,71 @@
+apiVersion: apps/v1
+kind: Deployment
+metadata:
+  name: {{ include "oidc-test-client.fullname" . }}
+  namespace: {{ .Release.Namespace | quote }}
+  labels:
+    {{- include "oidc-test-client.labels" . | nindent 4 }}
+spec:
+  replicas: {{ .Values.replicaCount }}
+  selector:
+    matchLabels:
+      {{- include "oidc-test-client.selectorLabels" . | nindent 6 }}
+  template:
+    metadata:
+      {{- with .Values.podAnnotations }}
+      annotations:
+        {{- toYaml . | nindent 8 }}
+      {{- end }}
+      labels:
+        {{- include "oidc-test-client.labels" . | nindent 8 }}
+        {{- with .Values.podLabels }}
+        {{- toYaml . | nindent 8 }}
+        {{- end }}
+    spec:
+      {{- with .Values.imagePullSecrets }}
+      imagePullSecrets:
+        {{- toYaml . | nindent 8 }}
+      {{- end }}
+      securityContext:
+        {{- toYaml .Values.podSecurityContext | nindent 8 }}
+      containers:
+        - name: {{ .Chart.Name }}
+          securityContext:
+            {{- toYaml .Values.securityContext | nindent 12 }}
+          image: "{{ .Values.image.repository }}:{{ .Values.image.tag | default .Chart.AppVersion }}"
+          imagePullPolicy: {{ .Values.image.pullPolicy }}
+          ports:
+            - name: http
+              containerPort: {{ .Values.service.port }}
+              protocol: TCP
+          {{ with .Values.livenessProbe }}
+          livenessProbe: {{ toJson . }}
+          {{- end }}
+          {{ with .Values.readinessProbe }}
+          readinessProbe: {{ toJson . }}
+          {{- end }}
+          resources:
+            {{- toYaml .Values.resources | nindent 12 }}
+          {{- with .Values.env }}
+          env:
+            {{- toYaml . | nindent 12 }}
+          {{- end }}
+          command:
+            - sh
+            - -ec
+            - |-
+              printenv EXTRA_ROOT_CA >> $(python -m certifi)
+              exec python app.py
+
+      {{- with .Values.nodeSelector }}
+      nodeSelector:
+        {{- toYaml . | nindent 8 }}
+      {{- end }}
+      {{- with .Values.affinity }}
+      affinity:
+        {{- toYaml . | nindent 8 }}
+      {{- end }}
+      {{- with .Values.tolerations }}
+      tolerations:
+        {{- toYaml . | nindent 8 }}
+      {{- end }}
@@ -0,0 +1,38 @@
+{{- if .Values.ingress.enabled -}}
+{{- $fullName := include "oidc-test-client.fullname" . -}}
+{{- $svcPort := .Values.service.port -}}
+apiVersion: networking.k8s.io/v1
+kind: Ingress
+metadata:
+  name: {{ $fullName }}
+  namespace: {{ .Release.Namespace | quote }}
+  labels:
+    {{- include "oidc-test-client.labels" . | nindent 4 }}
+  {{- with .Values.ingress.annotations }}
+  annotations:
+    {{- toYaml . | nindent 4 }}
+  {{- end }}
+spec:
+  ingressClassName: {{ .Values.ingress.className }}
+  {{- if .Values.ingress.tls.enabled }}
+  tls:
+    {{- if .Values.ingress.host }}
+    - secretName: {{ $fullName }}-tls
+      hosts:
+        - {{ .Values.ingress.host | quote }}
+    {{- end }}
+  {{- end }}
+  rules:
+    {{- if .Values.ingress.host }}
+    - host: {{ .Values.ingress.host | quote }}
+      http:
+        paths:
+          - path: /
+            pathType: Prefix
+            backend:
+              service:
+                name: {{ $fullName }}
+                port:
+                  number: {{ $svcPort }}
+    {{- end }}
+{{- end }}
@@ -0,0 +1,16 @@
+apiVersion: v1
+kind: Service
+metadata:
+  name: {{ include "oidc-test-client.fullname" . }}
+  namespace: {{ .Release.Namespace | quote }}
+  labels:
+    {{- include "oidc-test-client.labels" . | nindent 4 }}
+spec:
+  type: {{ .Values.service.type }}
+  ports:
+    - port: {{ .Values.service.port }}
+      targetPort: http
+      protocol: TCP
+      name: http
+  selector:
+    {{- include "oidc-test-client.selectorLabels" . | nindent 4 }}
@@ -0,0 +1,71 @@
+# Default values for oidc-test-client.
+# This is a YAML-formatted file.
+# Declare variables to be passed into your templates.
+
+replicaCount: 1
+
+image:
+  repository: oidc-test-client
+  pullPolicy: Always
+  # Overrides the image tag whose default is the chart appVersion.
+  tag: ""
+
+imagePullSecrets: []
+nameOverride: ""
+fullnameOverride: ""
+
+podAnnotations: {}
+podLabels: {}
+
+podSecurityContext: {}
+  # fsGroup: 2000
+
+securityContext: {}
+  # capabilities:
+  #   drop:
+  #   - ALL
+  # readOnlyRootFilesystem: true
+  # runAsNonRoot: true
+  # runAsUser: 1000
+
+service:
+  type: ClusterIP
+  port: 5000
+
+ingress:
+  enabled: true
+  className: ""
+  annotations: {}
+    # kubernetes.io/ingress.class: nginx
+    # kubernetes.io/tls-acme: "true"
+  hosts: []
+  tls:
+    enabled: true
+    
+resources: {}
+  # We usually recommend not to specify default resources and to leave this as a conscious
+  # choice for the user. This also increases chances charts run on environments with little
+  # resources, such as Minikube. If you do want to specify resources, uncomment the following
+  # lines, adjust them as necessary, and remove the curly braces after 'resources:'.
+  # limits:
+  #   cpu: 100m
+  #   memory: 128Mi
+  # requests:
+  #   cpu: 100m
+  #   memory: 128Mi
+
+livenessProbe:
+  httpGet:
+    path: /healthz
+    port: http
+  periodSeconds: 30
+
+readinessProbe: null
+
+nodeSelector: {}
+
+tolerations: []
+
+affinity: {}
+
+env: []
@@ -50,46 +50,6 @@ app.kubernetes.io/name: {{ include "oidc2fer.name" . }}
 app.kubernetes.io/instance: {{ .Release.Name }}
 {{- end }}

-{{/*
-transform dictionnary of environment variables
-Usage : {{ include "oidc2fer.env.transformDict" .Values.envVars }}
-
-Example:
-envVars:
-  # Using simple strings as env vars
-  ENV_VAR_NAME: "envVar value"
-  # Using a value from a configMap
-  ENV_VAR_FROM_CM:
-    configMapKeyRef:
-      name: cm-name
-      key: "key_in_cm"
-  # Using a value from a secret
-  ENV_VAR_FROM_SECRET:
-    secretKeyRef:
-      name: secret-name
-      key: "key_in_secret"
-*/}}
-{{- define "oidc2fer.env.transformDict" -}}
-{{- range $key, $value := . }}
- name: {{ $key | quote }}
-{{- if $value | kindIs "map" }}
-  valueFrom: {{ $value | toYaml | nindent 4 }}
-{{- else }}
-  value: {{ $value | quote }}
-{{- end }}
-{{- end }}
-{{- end }}
-
-
-{{/*
-oidc2fer env vars
-*/}}
-{{- define "oidc2fer.common.env" -}}
-{{- $topLevelScope := index . 0 -}}
-{{- $workerScope := index . 1 -}}
-{{- include "oidc2fer.env.transformDict" $workerScope.envVars -}}
-{{- end }}
-
 {{/*
 Common labels

@@ -1,4 +1,3 @@
-{{- $envVars := include "oidc2fer.common.env" (list . .Values.satosa) -}}
 {{- $fullName := include "oidc2fer.satosa.fullname" . -}}
 {{- $component := "satosa" -}}
 apiVersion: apps/v1
@@ -42,10 +41,9 @@ spec:
          args:
            {{- toYaml . | nindent 12 }}
          {{- end }}
-          env:
-            {{- if $envVars}}
-            {{- $envVars | indent 12 }}
-            {{- end }}
+          {{- with .Values.satosa.env }}
+          env: {{ toJson . }}
+          {{- end }}
          {{- with .Values.satosa.securityContext }}
          securityContext:
            {{- toYaml . | nindent 12 }}
@@ -1,4 +1,3 @@
-{{- $envVars := include "oidc2fer.common.env" (list . .Values.satosa) -}}
 {{- $fullName := include "oidc2fer.satosa.fullname" . -}}
 {{- $component := "satosa" -}}
 apiVersion: v1
@@ -21,10 +21,6 @@ image:
 nameOverride: ""
 fullnameOverride: ""

-## @skip commonEnvVars
-commonEnvVars: &commonEnvVars
-  <<: []
-
 ## @param ingress.enabled whether to enable the Ingress or not
 ## @param ingress.className IngressClass to use for the Ingress
 ## @param ingress.host Host for the Ingress
@@ -79,15 +75,8 @@ satosa:
  ## @param satosa.securityContext Configure satosa Pod security context
  securityContext: null

-  ## @param satosa.envVars Configure satosa container environment variables
-  ## @extra satosa.envVars.BY_VALUE Example environment variable by setting value directly
-  ## @extra satosa.envVars.FROM_CONFIGMAP.configMapKeyRef.name Name of a ConfigMap when configuring env vars from a ConfigMap
-  ## @extra satosa.envVars.FROM_CONFIGMAP.configMapKeyRef.key Key within a ConfigMap when configuring env vars from a ConfigMap
-  ## @extra satosa.envVars.FROM_SECRET.secretKeyRef.name Name of a Secret when configuring env vars from a Secret
-  ## @extra satosa.envVars.FROM_SECRET.secretKeyRef.key Key within a Secret when configuring env vars from a Secret
-  ## @skip satosa.envVars
-  envVars:
-    <<: *commonEnvVars
+  ## @param satosa.env Configure satosa container environment variables
+  env: []

  ## @param satosa.podAnnotations Annotations to add to the satosa Pod
  podAnnotations: {}
@@ -11,23 +11,23 @@ version = "0.1.0"
 authors = [{ "name" = "DINUM", "email" = "dev@mail.numerique.gouv.fr" }]
 classifiers = [
    "Development Status :: 5 - Production/Stable",
-    "Intended Audience :: Developers",
+    "Intended Audience :: End Users/Desktop",
+    "Intended Audience :: System Administrators",
    "License :: OSI Approved :: MIT License",
    "Natural Language :: English",
    "Programming Language :: Python :: 3",
-    "Programming Language :: Python :: 3.11",
+    "Programming Language :: Python :: 3.14",
 ]
-description = "An application to handle contacts and teams."
+description = "A gateway from RENATER's FER to ProConnect's OIDC provider, built on top of SATOSA."
 keywords = ["OIDC", "SAML", "Shibboleth", "FER", "RENATER"]
 license = { file = "LICENSE" }
 readme = "README.md"
-requires-python = ">=3.11"
+requires-python = ">=3.14"
 dependencies = [
    "SATOSA==8.5.1",
-    "gunicorn==23.0.0",
-    "redis==5.0.4",
-    "JSON-log-formatter==1.0",
-    "WhiteNoise==6.7.0",
+    "gunicorn==25.1.0",
+    "JSON-log-formatter==1.1.1",
+    "WhiteNoise==6.12.0",
 ]

 [project.urls]
@@ -40,18 +40,15 @@ dependencies = [
 dev = [
    "pylint==3.1.0",
    "pytest-cov==4.1.0",
-    "pytest==8.0.2",
-    "ruff==0.2.2",
-    "pytest-playwright==0.4.4",
+    "pytest==9.0.2",
+    "ruff==0.15.4",
+    "pytest-playwright==0.7.2",
 ]

 [tool.setuptools]
 packages = { find = { where = ["."], exclude = ["tests"] } }
 zip-safe = true

-[tool.distutils.bdist_wheel]
-universal = true
-
 [tool.ruff]
 exclude = [
    ".git",
@@ -1,7 +0,0 @@
-#!/usr/bin/env python
-"""Setup file for the oidc2fer module. All configuration stands in the setup.cfg file."""
-# coding: utf-8
-
-from setuptools import setup
-
-setup()
@@ -1,5 +1,9 @@
+import concurrent.futures
 import json
+import logging
 import os
+import time
+import urllib.request

 import pytest
 from playwright.sync_api import Browser, Page, expect
@@ -32,7 +36,7 @@ def oidc_to_renater(
    expected_given_name="Georges",
    expected_usual_name="Grospieds",
 ):
-    page.goto("https://oidc-test-client.traefik.me")
+    page.goto("https://oidc-test-client.127.0.0.1.nip.io")
    renater_wayf(page)
    renater_test_idp(page, login=login)

@@ -41,6 +45,7 @@ def oidc_to_renater(
    result = json.loads(text)

    id_token = result["access_token_response"]["id_token"]
+    access_token = result["access_token_response"]["access_token"]
    assert {"acr": "eidas1"}.items() <= id_token.items()
    userinfo = result["userinfo"]
    assert {
@@ -51,7 +56,7 @@ def oidc_to_renater(
        "usual_name": expected_usual_name,
        "siret": "12345678200010",
    }.items() <= userinfo.items()
-    return id_token
+    return id_token, access_token


@pytest.mark.skipif(
@@ -59,18 +64,53 @@ def oidc_to_renater(
 )
 def test_oidc_to_renater_keeps_sub(browser: Browser):
    with browser.new_context().new_page() as page:
-        id_token1 = oidc_to_renater(page)
+        id_token1, _ = oidc_to_renater(page)
    with browser.new_context().new_page() as page:
-        id_token2 = oidc_to_renater(page)
+        id_token2, _ = oidc_to_renater(page)

    assert id_token1["sub"] == id_token2["sub"]


+@pytest.mark.skipif(
+    "BENCH_E2E" not in os.environ, reason="Benchmark runs only if requested"
+)
+def test_benchmark_userinfo(browser: Browser):
+    with browser.new_context().new_page() as page:
+        _, access_token = oidc_to_renater(page)
+
+    request_count = int(os.environ.get("BENCH_E2E_N", "100"))
+    client_count = int(os.environ.get("BENCH_E2E_P", "2"))
+    start = time.time()
+
+    def make_request():
+        return urllib.request.urlopen(
+            urllib.request.Request(
+                "https://oidc2fer.127.0.0.1.nip.io/OIDC/userinfo",
+                headers={"Authorization": f"Bearer {access_token}"},
+            )
+        )
+
+    with concurrent.futures.ThreadPoolExecutor(max_workers=client_count) as executor:
+        futures = []
+        for _ in range(request_count):
+            futures.append(executor.submit(make_request))
+        for future in concurrent.futures.as_completed(futures):
+            with future.result() as resp:
+                assert resp.status == 200
+    end = time.time()
+    logging.info(
+        "Average userinfo request time with %d parallel requests: \
+            %.2f seconds",
+        client_count,
+        (end - start) / request_count,
+    )
+
+
@pytest.mark.skipif(
    "TEST_E2E" not in os.environ, reason="Depends on app running locally"
 )
 def test_oidc_to_renater_student_not_allowed(page: Page):
-    page.goto("https://oidc-test-client.traefik.me")
+    page.goto("https://oidc-test-client.127.0.0.1.nip.io")
    renater_wayf(page)
    renater_test_idp(page, login="etudiant1")

@@ -135,5 +175,5 @@ def test_pro_connect_to_renater_student_not_allowed(page: Page):
    "TEST_E2E" not in os.environ, reason="Depends on app running locally"
 )
 def test_serve_static_assets(page: Page):
-    page.goto("https://satosa.traefik.me/images/logo.svg")
+    page.goto("https://oidc2fer.127.0.0.1.nip.io/images/logo.svg")
    expect(page.locator("svg")).to_be_visible()
@@ -26,7 +26,8 @@ fi
 # https://github.com/kubernetes-sigs/kind/issues/2875
 # https://github.com/containerd/containerd/blob/main/docs/cri/config.md#registry-configuration
 # See: https://github.com/containerd/containerd/blob/main/docs/hosts.md
-cat <<EOF | kind create cluster --config=-
+kind --name=oidc2fer delete cluster || true
+cat <<EOF | kind --name=oidc2fer create cluster --config=-
 kind: Cluster
 apiVersion: kind.x-k8s.io/v1alpha4
 containerdConfigPatches:
@@ -35,7 +36,6 @@ containerdConfigPatches:
    config_path = "/etc/containerd/certs.d"
 nodes:
 - role: control-plane
-  image: kindest/node:v1.27.3
  kubeadmConfigPatches:
  - |
    kind: InitConfiguration
@@ -50,9 +50,7 @@ nodes:
    hostPort: 443
    protocol: TCP
 - role: worker
-  image: kindest/node:v1.27.3
 - role: worker
-  image: kindest/node:v1.27.3
 EOF

 # 3. Add the registry config to the nodes
@@ -64,7 +62,7 @@ EOF
 # We want a consistent name that works from both ends, so we tell containerd to
 # alias localhost:${reg_port} to the registry container when pulling images
 REGISTRY_DIR="/etc/containerd/certs.d/localhost:${reg_port}"
-for node in $(kind get nodes); do
+for node in $(kind --name=oidc2fer get nodes); do
 	docker exec "${node}" mkdir -p "${REGISTRY_DIR}"
 	cat <<EOF | docker exec -i "${node}" cp /dev/stdin "${REGISTRY_DIR}/hosts.toml"
 [host."http://${reg_name}:5000"]
@@ -91,6 +89,17 @@ data:
    help: "https://kind.sigs.k8s.io/docs/user/local-registry/"
 EOF

+# Patch the CoreDNS configmap to rewrite requests for *.127.0.0.1.nip.io to the Ingress Controller service
+kubectl -n kube-system get configmap coredns -o yaml |
+  yq '.data.Corefile |= (
+        trim
+        | split("\n")
+        | .[-1] = "    rewrite name regex .*\\.127\\.0\\.0\\.1\\.nip\\.io ingress-nginx-controller.ingress-nginx.svc.cluster.local answer auto\n"
+          + .[-1]
+        | join("\n")
+      )' |
+  kubectl replace -f -
+
 kubectl apply -f https://raw.githubusercontent.com/kubernetes/ingress-nginx/main/deploy/static/provider/kind/deploy.yaml
 kubectl -n ingress-nginx create secret tls mkcert --key /tmp/127.0.0.1.nip.io+1-key.pem --cert /tmp/127.0.0.1.nip.io+1.pem
 kubectl -n ingress-nginx patch deployments.apps ingress-nginx-controller --type 'json' -p '[{"op": "add", "path": "/spec/template/spec/containers/0/args/-", "value":"--default-ssl-certificate=ingress-nginx/mkcert"}]'
Author	SHA1	Message	Date
Jonathan Perret	bea0203c0e	🔐(secrets) update secrets to current main	2026-03-26 16:36:44 +01:00
Jonathan Perret	cfec0eead1	🔐(secrets) update secrets to current main	2026-03-26 16:25:19 +01:00
Jonathan Perret	5932135ec5	🔐(secrets) update secrets to current main	2026-03-26 15:26:17 +01:00
Jonathan Perret	0a43908ac3	Deploy release v1.0.13 to production	2026-03-26 15:10:43 +01:00
Jonathan Perret	435e2e20a9	v1.0.13 release	2026-03-26 14:54:48 +01:00
Jonathan Perret	5dcfcf213d	Merge pull request #40 from proconnect-gouv/stateless-oidc Utiliser le mode stateless de SATOSA pour ne plus avoir besoin de Redis	2026-03-26 14:53:06 +01:00
Jonathan Perret	00b048d94d	🗃️(redis) remove Redis support We switched to stateless OIDC.	2026-03-26 14:34:58 +01:00
Jonathan Perret	bda7a44bc8	🔧(helm) use stateless OIDC in production Getting rid of Redis should help with performance.	2026-03-26 13:41:53 +01:00
Jonathan Perret	9db60451aa	🔧(helm) use stateless OIDC in dev and staging Getting rid of Redis should help with performance.	2026-03-25 10:37:00 +01:00
Jonathan Perret	018b9e8726	🔧(helm) use lists for env vars Moving back to the Kubernetes-native syntax of lists makes it possible to use dependent environment variables.	2026-03-25 10:04:28 +01:00
Jonathan Perret	ea4199de91	Merge pull request #39 from proconnect-gouv/tilt-oidc-test-client 🔨 Configuration Tilt pour le client test OIDC	2026-03-20 15:44:31 +01:00
Jonathan Perret	4d1a9c56d2	🔨(e2e) add benchmark e2e test This can help diagnose performance issues.	2026-03-20 15:32:09 +01:00
Jonathan Perret	14f9d42889	⬆️ (oidc-test-client) create Helm chart for test client This helps running tests with the app running in a Kubernetes cluster.	2026-03-20 15:32:08 +01:00
Jonathan Perret	3a0a0564d7	🔧(siret) fix SIRET for univ-angers.fr As provided by RENATER.	2026-03-06 17:24:28 +01:00
Jonathan Perret	9a82204f69	🔧(siret) add new entities to SIRET map As provided by RENATER.	2026-03-05 15:22:10 +01:00
Jonathan Perret	fd4a2b665f	🔧(siret) add new entities to SIRET map As provided by RENATER.	2026-03-05 14:11:14 +01:00
Jonathan Perret	645bbaca74	Deploy release v1.0.12 to production	2026-03-02 19:43:36 +01:00
Jonathan Perret	1ef50896ec	v1.0.12 release	2026-03-02 19:41:37 +01:00
Jonathan Perret	f8661c76d5	Merge pull request #38 from proconnect-gouv/deps-update Update dependencies	2026-03-02 19:38:16 +01:00
Jonathan Perret	ecfa38f11e	⬆️ (actions) upgrade and pin GitHub actions To latest stable versions.	2026-02-27 19:08:46 +01:00
Jonathan Perret	159d992783	🔧(config) add healthcheck to docker-compose This makes docker-compose up --wait work.	2026-02-27 19:05:31 +01:00
Jonathan Perret	2efaaa8281	🔨(kind) improve local cluster start script Taking some cues from what's done in other projects.	2026-02-27 19:05:30 +01:00
Jonathan Perret	f0b1c4cbc3	⬆️ (python) upgrade Python dependencies To latest stable versions.	2026-02-27 19:05:29 +01:00
Jonathan Perret	2e9dd01907	🔨(redis) fix bitnami image reference Bitnami images have moved.	2026-02-27 19:05:28 +01:00
Jonathan Perret	5f7b7ab8a8	🔥(pyproject) remove setup.py This file is not needed with a modern project structure, and since `setuptools` is no longer included in recent Python versions it causes a `pylint` failure.	2026-02-27 19:05:19 +01:00
Jonathan Perret	9994eb84b0	⬆️ (python) upgrade to Python 3.14.3 Bumping base image to avoid reported vulnerabilities.	2026-02-27 19:04:37 +01:00
Jonathan Perret	f9efafd574	🔧 (metadata) update Renater metadata URL The old URLs were decommissionned on feb. 26.	2026-02-27 14:45:11 +01:00
Jonathan Perret	208c4467df	🔐(secrets) update secrets to current main	2026-02-11 10:35:53 +01:00
Jonathan Perret	0e82e8b771	🔧(siret) fix stray space in SIRET map This was preventing EHESP users from connecting since their IdP's entity ID was not matched.	2025-12-03 23:14:01 +01:00
Jonathan Perret	798afdf2a9	Deploy release v1.0.11 to production	2025-11-24 18:06:22 +01:00
Jonathan Perret	7cf9fda7d8	v1.0.11 release	2025-11-24 18:05:40 +01:00
Jonathan Perret	1816d2a8de	Merge pull request #36 from proconnect-gouv/update-setuptools ⬆️(setuptools) remove setuptools from production Docker image	2025-11-24 18:04:18 +01:00
Jonathan Perret	c89b9b7ada	⬆️(setuptools) remove setuptools from production Docker image To fix a CVE reported by Cyberwatch. These tools are not required at runtime so there's no need to keep them around.	2025-11-24 17:51:02 +01:00
Jonathan Perret	c0d252f390	🔧(siret) fix entity ID for two entities As provided by RENATER.	2025-11-24 11:47:36 +01:00
Jonathan Perret	fa39964a64	🔧(siret) add new entities to SIRET map As provided by RENATER.	2025-11-24 09:42:00 +01:00