diff --git a/.github/workflows/scripts/before_install.sh b/.github/workflows/scripts/before_install.sh index 2d8d709cae..cde52b40d5 100755 --- a/.github/workflows/scripts/before_install.sh +++ b/.github/workflows/scripts/before_install.sh @@ -79,6 +79,11 @@ services: image: "docker.io/pulp/pulp-fixtures:latest" env: BASE_URL: "http://pulp-fixtures:8080" + - name: "saml2-idp" + image: "ghcr.io/pfrest/mock-saml2-idp:latest" + env: + SP_ENTITY_ID: "http://pulp" + SP_ACS_LOCATION: "http://pulp/saml/acs/" VARSYAML if [ "$TEST" = "s3" ]; then diff --git a/ci_requirements.txt b/ci_requirements.txt index 8b13789179..268d042d87 100644 --- a/ci_requirements.txt +++ b/ci_requirements.txt @@ -1 +1 @@ - +pulpcore[saml2] diff --git a/pulpcore/app/settings.py b/pulpcore/app/settings.py index a4411f50ea..1dd3eb94f2 100644 --- a/pulpcore/app/settings.py +++ b/pulpcore/app/settings.py @@ -594,6 +594,21 @@ def otel_middleware_hook(settings): return data +def saml2_settings_hook(settings): + data = {"dynaconf_merge": True} + if "LOGIN_URL" not in settings: + data["LOGIN_URL"] = "/saml2/login/" + if "SESSION_COOKIE_SECURE" not in settings: + data["SESSION_COOKIE_SECURE"] = True + if "SESSION_EXPIRE_AT_BROWSER_CLOSE" not in settings: + data["SESSION_EXPIRE_AT_BROWSER_CLOSE"] = True + if "SAML_CONFIG" in settings: + data["INSTALLED_APPS"] = ["djangosaml2"] + data["MIDDLEWARE"] = ["djangosaml2.middleware.SamlSessionMiddleware"] + data["AUTHENTICATION_BACKENDS"] = ["djangosaml2.backends.Saml2Backend"] + return data + + del preload_settings settings = DjangoDynaconf( @@ -618,7 +633,7 @@ def otel_middleware_hook(settings): otel_metrics_dispatch_interval_validator, distributed_publication_retention_period_validator, ], - post_hooks=(otel_middleware_hook,), + post_hooks=(otel_middleware_hook, saml2_settings_hook), ) _logger = getLogger(__name__) diff --git a/pulpcore/app/urls.py b/pulpcore/app/urls.py index 4742339248..1402589cc9 100644 --- a/pulpcore/app/urls.py +++ b/pulpcore/app/urls.py @@ -245,6 +245,9 @@ class NoSchema(p.callback.cls): path("", include("social_django.urls", namespace=settings.SOCIAL_AUTH_URL_NAMESPACE)) ) +if "djangosaml2" in settings.INSTALLED_APPS: + urlpatterns.append(path("saml2/", include("djangosaml2.urls"))) + #: The Pulp Platform v3 API router, which can be used to manually register ViewSets with the API. root_router = PulpDefaultRouter() diff --git a/pyproject.toml b/pyproject.toml index f877214334..9ae66f9790 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -73,6 +73,7 @@ s3 = ["django-storages[boto3]==1.14.6"] google = ["django-storages[google]==1.14.6"] azure = ["django-storages[azure]==1.14.6"] prometheus = ["django-prometheus"] +saml2 = ["djangosaml2>=1.12.0,<1.13"] kafka = [ # Pinned because project warns "things might (and will) break with every update" "cloudevents==1.11.0",