From 88dcf94750e3e8bd0ce93c77a91d78f80277c935 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=C3=89loi=20Rivard?= Date: Sun, 1 Oct 2023 15:42:16 +0200 Subject: [PATCH] Revert "tests: domain is localhost.local" This reverts commit 44aed277195cfaacc88274d76cd93af7a8ba3613. --- canaille/app/__init__.py | 2 +- tests/app/test_mails.py | 8 +----- tests/conftest.py | 1 - ..._dynamic_client_registration_management.py | 4 +-- tests/oidc/test_well_known.py | 26 +++++++++---------- 5 files changed, 17 insertions(+), 24 deletions(-) diff --git a/canaille/app/__init__.py b/canaille/app/__init__.py index 43352f09..5c5182b8 100644 --- a/canaille/app/__init__.py +++ b/canaille/app/__init__.py @@ -44,7 +44,7 @@ def get_current_mail_domain(): if current_app.config["SMTP"].get("FROM_ADDR"): return current_app.config["SMTP"]["FROM_ADDR"].split("@")[-1] - return get_current_domain().split(":")[0] + return get_current_domain() def validate_uri(value): diff --git a/tests/app/test_mails.py b/tests/app/test_mails.py index 8cf8cc3c..22ea32ab 100644 --- a/tests/app/test_mails.py +++ b/tests/app/test_mails.py @@ -2,17 +2,10 @@ import warnings from unittest import mock -import pytest from canaille import create_app from flask_webtest import TestApp -@pytest.fixture -def configuration(configuration, httpserver): - configuration["SERVER_NAME"] = f"{httpserver.host}:{httpserver.port}" - return configuration - - def test_send_test_email(testclient, logged_admin, smtpd): assert len(smtpd.messages) == 0 @@ -120,6 +113,7 @@ def test_mail_with_default_logo(testclient, logged_admin, smtpd, httpserver): raw_logo = fd.read() httpserver.expect_request(logo_path).respond_with_data(raw_logo) + testclient.app.config["SERVER_NAME"] = f"{httpserver.host}:{httpserver.port}" assert len(smtpd.messages) == 0 res = testclient.get(f"http://{httpserver.host}:{httpserver.port}/admin/mail") diff --git a/tests/conftest.py b/tests/conftest.py index 9018281b..02c30c53 100644 --- a/tests/conftest.py +++ b/tests/conftest.py @@ -62,7 +62,6 @@ def configuration(smtpd): smtpd.config.use_starttls = True conf = { "SECRET_KEY": gen_salt(24), - "SERVER_NAME": "localhost.local", "JAVASCRIPT": False, "LOGO": "/static/img/canaille-head.png", "TIMEZONE": "UTC", diff --git a/tests/oidc/test_dynamic_client_registration_management.py b/tests/oidc/test_dynamic_client_registration_management.py index 96d43f3c..78da1ba2 100644 --- a/tests/oidc/test_dynamic_client_registration_management.py +++ b/tests/oidc/test_dynamic_client_registration_management.py @@ -26,7 +26,7 @@ def test_get(testclient, backend, client, user): "https://mydomain.tld/redirect2", ], "registration_access_token": "static-token", - "registration_client_uri": f"http://localhost.local/oauth/register/{client.client_id}", + "registration_client_uri": f"http://localhost/oauth/register/{client.client_id}", "token_endpoint_auth_method": "client_secret_basic", "grant_types": [ "password", @@ -104,7 +104,7 @@ def test_update(testclient, backend, client, user): "client_secret_expires_at": None, "redirect_uris": ["https://newname.example.org/callback"], "registration_access_token": "static-token", - "registration_client_uri": f"http://localhost.local/oauth/register/{client.client_id}", + "registration_client_uri": f"http://localhost/oauth/register/{client.client_id}", "token_endpoint_auth_method": "none", "grant_types": ["refresh_token"], "response_types": ["code", "token"], diff --git a/tests/oidc/test_well_known.py b/tests/oidc/test_well_known.py index 7462a028..5dd50872 100644 --- a/tests/oidc/test_well_known.py +++ b/tests/oidc/test_well_known.py @@ -5,12 +5,12 @@ def test_oauth_authorization_server(testclient): res = testclient.get("/.well-known/oauth-authorization-server", status=200).json assert "https://auth.mydomain.tld" == res["issuer"] assert res == { - "authorization_endpoint": "http://localhost.local/oauth/authorize", + "authorization_endpoint": "http://localhost/oauth/authorize", "code_challenge_methods_supported": ["plain", "S256"], - "introspection_endpoint": "http://localhost.local/oauth/introspect", + "introspection_endpoint": "http://localhost/oauth/introspect", "issuer": "https://auth.mydomain.tld", - "jwks_uri": "http://localhost.local/oauth/jwks.json", - "registration_endpoint": "http://localhost.local/oauth/register", + "jwks_uri": "http://localhost/oauth/jwks.json", + "registration_endpoint": "http://localhost/oauth/register", "response_types_supported": [ "code", "token", @@ -27,7 +27,7 @@ def test_oauth_authorization_server(testclient): "phone", "groups", ], - "token_endpoint": "http://localhost.local/oauth/token", + "token_endpoint": "http://localhost/oauth/token", "token_endpoint_auth_methods_supported": [ "client_secret_basic", "private_key_jwt", @@ -36,7 +36,7 @@ def test_oauth_authorization_server(testclient): ], "token_endpoint_auth_signing_alg_values_supported": ["RS256", "ES256"], "ui_locales_supported": g.available_language_codes, - "userinfo_endpoint": "http://localhost.local/oauth/userinfo", + "userinfo_endpoint": "http://localhost/oauth/userinfo", } @@ -44,7 +44,7 @@ def test_openid_configuration(testclient): res = testclient.get("/.well-known/openid-configuration", status=200).json assert "https://auth.mydomain.tld" == res["issuer"] assert res == { - "authorization_endpoint": "http://localhost.local/oauth/authorize", + "authorization_endpoint": "http://localhost/oauth/authorize", "claims_supported": [ "sub", "iss", @@ -65,12 +65,12 @@ def test_openid_configuration(testclient): "nonce", ], "code_challenge_methods_supported": ["plain", "S256"], - "end_session_endpoint": "http://localhost.local/oauth/end_session", + "end_session_endpoint": "http://localhost/oauth/end_session", "id_token_signing_alg_values_supported": ["RS256", "ES256", "HS256"], - "introspection_endpoint": "http://localhost.local/oauth/introspect", + "introspection_endpoint": "http://localhost/oauth/introspect", "issuer": "https://auth.mydomain.tld", - "jwks_uri": "http://localhost.local/oauth/jwks.json", - "registration_endpoint": "http://localhost.local/oauth/register", + "jwks_uri": "http://localhost/oauth/jwks.json", + "registration_endpoint": "http://localhost/oauth/register", "response_types_supported": [ "code", "token", @@ -88,7 +88,7 @@ def test_openid_configuration(testclient): "groups", ], "subject_types_supported": ["pairwise", "public"], - "token_endpoint": "http://localhost.local/oauth/token", + "token_endpoint": "http://localhost/oauth/token", "token_endpoint_auth_methods_supported": [ "client_secret_basic", "private_key_jwt", @@ -97,5 +97,5 @@ def test_openid_configuration(testclient): ], "token_endpoint_auth_signing_alg_values_supported": ["RS256", "ES256"], "ui_locales_supported": g.available_language_codes, - "userinfo_endpoint": "http://localhost.local/oauth/userinfo", + "userinfo_endpoint": "http://localhost/oauth/userinfo", }