From cce82e7ae0340200405a9d842ccac430caceb0db Mon Sep 17 00:00:00 2001 From: Adrien P Date: Fri, 28 Feb 2025 18:06:07 +0100 Subject: [PATCH 1/2] Added the OIDC key directly to the config file for the dev config --- test_project/test_project/settings.py | 18 +++++++++++++++++- 1 file changed, 17 insertions(+), 1 deletion(-) diff --git a/test_project/test_project/settings.py b/test_project/test_project/settings.py index fcb302006..2094a6976 100644 --- a/test_project/test_project/settings.py +++ b/test_project/test_project/settings.py @@ -200,11 +200,27 @@ MEDIA_ROOT = os.path.join(BASE_DIR, "media") # oAuth2 settings +OIDC_RSA_PRIVATE_KEY = """-----BEGIN RSA PRIVATE KEY----- +MIICXQIBAAKBgQCbCYh5h2NmQuBqVO6G+/CO+cHm9VBzsb0MeA6bbQfDnbhstVOT +j0hcnZJzDjYc6ajBZZf6gxVP9xrdm9Uh599VI3X5PFXLbMHrmzTAMzCGIyg+/fnP +0gocYxmCX2+XKyj/Zvt1pUX8VAN2AhrJSfxNDKUHERTVEV9bRBJg4F0C3wIDAQAB +AoGAP+i4nNw+Ec/8oWh8YSFm4xE6qKG0NdTtSMAOyWwy+KTB+vHuT1QPsLn1vj77 ++IQrX/moogg6F1oV9YdA3vat3U7rwt1sBGsRrLhA+Spp9WEQtglguNo4+QfVo2ju +YBa2rG+h75qjiA3xnU//F3rvwnAsOWv0NUVdVeguyR+u6okCQQDBUmgWeH2WHmUn +2nLNCz+9wj28rqhfOr9Ptem2gqk+ywJmuIr4Y5S1OdavOr2UZxOcEwncJ/MLVYQq +MH+x4V5HAkEAzU2GMR5OdVLcxfVTjzuIC76paoHVWnLibd1cdANpPmE6SM+pf5el +fVSwuH9Fmlizu8GiPCxbJUoXB/J1tGEKqQJBALhClEU+qOzpoZ6/voYi/6kdN3zc +uEy0EN6n09AKb8gS9QH1STgAqh+ltjMkeMe3C2DKYK5/QU9/Pc58lWl1FkcCQG67 +ZamQgxjcvJ85FvymS1aqW45KwNysIlzHjFo2jMlMf7dN6kobbPMQftDENLJvLWIT +qoFyGycdsxZiPAIyZSECQQCZFn3Dl6hnJxWZH8Fsa9hj79kZ/WVkIXGmtdgt0fNr +dTnvCVtA59ne4LEVie/PMH/odQWY0SxVm/76uBZv/1vY +-----END RSA PRIVATE KEY-----""" # DEV ONLY + OAUTH2_PROVIDER = { "OIDC_ENABLED": True, "OIDC_RP_INITIATED_LOGOUT_ENABLED": True, "OIDC_RP_INITIATED_LOGOUT_ALWAYS_PROMPT": True, - "OIDC_RSA_PRIVATE_KEY": os.environ.get("OIDC_RSA_PRIVATE_KEY"), + "OIDC_RSA_PRIVATE_KEY": OIDC_RSA_PRIVATE_KEY, # PROD : os.environ.get("OIDC_RSA_PRIVATE_KEY"), "SCOPES": { "openid": "OpenID Connect scope", "read": "Read scope", From 9d6ff188bd0bb5c96931e9921d3d022face73189 Mon Sep 17 00:00:00 2001 From: Adrien P Date: Fri, 28 Feb 2025 18:19:07 +0100 Subject: [PATCH 2/2] removed old test mechanic for OIDC --- .github/workflows/modoboa.yml | 2 -- 1 file changed, 2 deletions(-) diff --git a/.github/workflows/modoboa.yml b/.github/workflows/modoboa.yml index e70890919..c7c3c4c7d 100644 --- a/.github/workflows/modoboa.yml +++ b/.github/workflows/modoboa.yml @@ -120,7 +120,6 @@ jobs: REDIS_HOST: localhost REDIS_PORT: ${{ job.services.redis.ports[6379] }} LDAP_SERVER_PORT: ${{ job.services.openldap.ports[389] }} - OIDC_RSA_PRIVATE_KEY: ${{ vars.OIDC_RSA_PRIVATE_KEY }} - name: Test with pytest and coverage if: ${{ matrix.python-version == '3.12' && matrix.database == 'postgres' }} @@ -141,7 +140,6 @@ jobs: REDIS_HOST: localhost REDIS_PORT: ${{ job.services.redis.ports[6379] }} LDAP_SERVER_PORT: ${{ job.services.openldap.ports[389] }} - OIDC_RSA_PRIVATE_KEY: ${{ vars.OIDC_RSA_PRIVATE_KEY }} - name: Upload coverage result if: ${{ matrix.python-version == '3.12' && matrix.database == 'postgres' }}