Skip to content

Commit 7b51eab

Browse files
opensourcejzheaux
opensource
authored andcommitted
Initialize OpenSAML in OpenSamlAssertingPartyMetadataRepository
Closes gh-16042 This commit adds a static initializer block to both OpenSaml4AssertingPartyMetadataRepository and OpenSaml5AssertingPartyMetadataRepository. This ensures OpenSAML is initialized upon class loading, preventing failures when methods like withMetadataLocation are invoked without prior initialization.
1 parent 5a95952 commit 7b51eab

File tree

4 files changed

+10
-10
lines changed

4 files changed

+10
-10
lines changed

saml2/saml2-service-provider/src/opensaml4Main/java/org/springframework/security/saml2/provider/service/registration/OpenSaml4AssertingPartyMetadataRepository.java

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -50,6 +50,7 @@
5050
import org.springframework.lang.NonNull;
5151
import org.springframework.lang.Nullable;
5252
import org.springframework.security.saml2.Saml2Exception;
53+
import org.springframework.security.saml2.core.OpenSamlInitializationService;
5354
import org.springframework.security.saml2.provider.service.registration.BaseOpenSamlAssertingPartyMetadataRepository.MetadataResolverAdapter;
5455
import org.springframework.util.Assert;
5556

@@ -68,6 +69,10 @@
6869
*/
6970
public final class OpenSaml4AssertingPartyMetadataRepository implements AssertingPartyMetadataRepository {
7071

72+
static {
73+
OpenSamlInitializationService.initialize();
74+
}
75+
7176
private final BaseOpenSamlAssertingPartyMetadataRepository delegate;
7277

7378
/**

saml2/saml2-service-provider/src/opensaml4Test/java/org/springframework/security/saml2/provider/service/registration/OpenSaml4AssertingPartyMetadataRepositoryTests.java

Lines changed: 0 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -53,7 +53,6 @@
5353
import org.springframework.core.io.ClassPathResource;
5454
import org.springframework.core.io.ResourceLoader;
5555
import org.springframework.security.saml2.Saml2Exception;
56-
import org.springframework.security.saml2.core.OpenSamlInitializationService;
5756
import org.springframework.security.saml2.core.TestSaml2X509Credentials;
5857
import org.springframework.security.saml2.provider.service.authentication.TestOpenSamlObjects;
5958

@@ -71,10 +70,6 @@
7170
*/
7271
public class OpenSaml4AssertingPartyMetadataRepositoryTests {
7372

74-
static {
75-
OpenSamlInitializationService.initialize();
76-
}
77-
7873
private static MetadataDispatcher dispatcher = new MetadataDispatcher()
7974
.addResponse("/entity.xml", readFile("test-metadata.xml"))
8075
.addResponse("/entities.xml", readFile("test-entitiesdescriptor.xml"));

saml2/saml2-service-provider/src/opensaml5Main/java/org/springframework/security/saml2/provider/service/registration/OpenSaml5AssertingPartyMetadataRepository.java

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -50,6 +50,7 @@
5050
import org.springframework.lang.NonNull;
5151
import org.springframework.lang.Nullable;
5252
import org.springframework.security.saml2.Saml2Exception;
53+
import org.springframework.security.saml2.core.OpenSamlInitializationService;
5354
import org.springframework.security.saml2.provider.service.registration.BaseOpenSamlAssertingPartyMetadataRepository.MetadataResolverAdapter;
5455
import org.springframework.util.Assert;
5556

@@ -68,6 +69,10 @@
6869
*/
6970
public final class OpenSaml5AssertingPartyMetadataRepository implements AssertingPartyMetadataRepository {
7071

72+
static {
73+
OpenSamlInitializationService.initialize();
74+
}
75+
7176
private final BaseOpenSamlAssertingPartyMetadataRepository delegate;
7277

7378
/**

saml2/saml2-service-provider/src/opensaml5Test/java/org/springframework/security/saml2/provider/service/registration/OpenSaml5AssertingPartyMetadataRepositoryTests.java

Lines changed: 0 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -53,7 +53,6 @@
5353
import org.springframework.core.io.ClassPathResource;
5454
import org.springframework.core.io.ResourceLoader;
5555
import org.springframework.security.saml2.Saml2Exception;
56-
import org.springframework.security.saml2.core.OpenSamlInitializationService;
5756
import org.springframework.security.saml2.core.TestSaml2X509Credentials;
5857
import org.springframework.security.saml2.provider.service.authentication.TestOpenSamlObjects;
5958

@@ -71,10 +70,6 @@
7170
*/
7271
public class OpenSaml5AssertingPartyMetadataRepositoryTests {
7372

74-
static {
75-
OpenSamlInitializationService.initialize();
76-
}
77-
7873
private static MetadataDispatcher dispatcher = new MetadataDispatcher()
7974
.addResponse("/entity.xml", readFile("test-metadata.xml"))
8075
.addResponse("/entities.xml", readFile("test-entitiesdescriptor.xml"));

0 commit comments

Comments
 (0)