From ae178a028746dcbcbf2bf65e9dd3ac5d982465ce Mon Sep 17 00:00:00 2001 From: Ruben Fiszel Date: Wed, 18 Nov 2026 23:13:32 +0100 Subject: [PATCH] fix: disable SAML instead of crashing when its metadata cannot be loaded (#12528) * fix: disable SAML instead of crashing when its metadata cannot be loaded Co-Authored-By: Claude Opus 5.5 * fix: retry a SAML metadata URL and raise a critical alert when SAML is disabled Co-Authored-By: Claude Opus 5.5 * fix: bound the SAML metadata fetch with connect and request timeouts Co-Authored-By: Claude Opus 5.5 * chore: update ee-repo-ref to 000a83d34767b44c041612df31e2a3e7e305d63a This commit updates the EE repository reference after PR #995 was merged in windmill-ee-private. Previous ee-repo-ref: 532321fdc399096402e5bfce38f3d5dcd7621404 New ee-repo-ref: 000a83d34767b44c041612df31e2a3e7e305d63a Automated by sync-ee-ref workflow. --------- Co-authored-by: Claude Opus 5.5 Co-authored-by: windmill-internal-app[bot] --- backend/ee-repo-ref.txt | 2 +- backend/windmill-api/src/lib.rs | 2 +- backend/windmill-api/src/saml_oss.rs | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/backend/ee-repo-ref.txt b/backend/ee-repo-ref.txt index 335bc3cf07..ffba720167 100644 --- a/backend/ee-repo-ref.txt +++ b/backend/ee-repo-ref.txt @@ -1 +1 @@ -2d094f0018c2474cbc47f2e6e81f7d53e158f87d +000a83d34767b44c041612df31e2a3e7e305d63a diff --git a/backend/windmill-api/src/lib.rs b/backend/windmill-api/src/lib.rs index 0a59323412..83df75f5ca 100644 --- a/backend/windmill-api/src/lib.rs +++ b/backend/windmill-api/src/lib.rs @@ -489,7 +489,7 @@ pub async fn run_server( .expose_headers([http::header::WWW_AUTHENTICATE]) .allow_origin(Any); - let sp_extension = Arc::new(saml_oss::build_sp_extension().await?); + let sp_extension = Arc::new(saml_oss::build_sp_extension(&db).await?); if server_mode { #[cfg(feature = "embedding")] diff --git a/backend/windmill-api/src/saml_oss.rs b/backend/windmill-api/src/saml_oss.rs index 2747f9ef96..c8e9071624 100644 --- a/backend/windmill-api/src/saml_oss.rs +++ b/backend/windmill-api/src/saml_oss.rs @@ -18,7 +18,7 @@ use axum::{routing::post, Router}; pub struct ServiceProviderExt(); #[cfg(not(feature = "private"))] -pub async fn build_sp_extension() -> anyhow::Result { +pub async fn build_sp_extension(_db: &crate::db::DB) -> anyhow::Result { return Ok(ServiceProviderExt()); }