From 932d15116ff9aafa12000f69a0c52ce37613882e Mon Sep 17 00:00:00 2001 From: strehle Date: Fri, 10 Apr 2026 10:57:00 +0200 Subject: [PATCH] Fix legacy SAML bootstrap with newer OpenSAML --- .../identity/uaa/provider/saml/SamlConfiguration.java | 2 ++ .../saml/SamlRelyingPartyRegistrationRepositoryConfig.java | 2 +- 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/server/src/main/java/org/cloudfoundry/identity/uaa/provider/saml/SamlConfiguration.java b/server/src/main/java/org/cloudfoundry/identity/uaa/provider/saml/SamlConfiguration.java index 3e93f6c3a23..b37c13aff4d 100644 --- a/server/src/main/java/org/cloudfoundry/identity/uaa/provider/saml/SamlConfiguration.java +++ b/server/src/main/java/org/cloudfoundry/identity/uaa/provider/saml/SamlConfiguration.java @@ -13,11 +13,13 @@ import org.springframework.boot.context.properties.EnableConfigurationProperties; import org.springframework.context.annotation.Bean; import org.springframework.context.annotation.Configuration; +import org.springframework.context.annotation.DependsOn; import org.springframework.http.client.ClientHttpRequestFactory; import org.springframework.web.client.RestTemplate; @Slf4j @EnableConfigurationProperties({SamlConfigProps.class}) +@DependsOn({"setUpBouncyCastle", "setupOpenSaml"}) @Configuration @Data public class SamlConfiguration { diff --git a/server/src/main/java/org/cloudfoundry/identity/uaa/provider/saml/SamlRelyingPartyRegistrationRepositoryConfig.java b/server/src/main/java/org/cloudfoundry/identity/uaa/provider/saml/SamlRelyingPartyRegistrationRepositoryConfig.java index 5561356e01c..b736d84c9a4 100644 --- a/server/src/main/java/org/cloudfoundry/identity/uaa/provider/saml/SamlRelyingPartyRegistrationRepositoryConfig.java +++ b/server/src/main/java/org/cloudfoundry/identity/uaa/provider/saml/SamlRelyingPartyRegistrationRepositoryConfig.java @@ -20,6 +20,7 @@ import static org.cloudfoundry.identity.uaa.provider.saml.SamlMetadataEndpoint.DEFAULT_REGISTRATION_ID; +@DependsOn({"setUpBouncyCastle", "setupOpenSaml"}) @Configuration @Slf4j public class SamlRelyingPartyRegistrationRepositoryConfig { @@ -43,7 +44,6 @@ public SamlRelyingPartyRegistrationRepositoryConfig(@Qualifier("samlEntityID") S this.signatureAlgorithms = signatureAlgorithms; } - @DependsOn({"setUpBouncyCastle", "setupOpenSaml"}) @Bean RelyingPartyRegistrationRepository relyingPartyRegistrationRepository(SamlIdentityProviderConfigurator samlIdentityProviderConfigurator) { SamlKeyManagerFactory.SamlConfigPropsSamlKeyManagerImpl samlKeyManager = new SamlKeyManagerFactory.SamlConfigPropsSamlKeyManagerImpl(samlConfigProps);