Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Initialize OpenSAML in OpenSamlAssertingPartyMetadataRepository #16055

Merged
merged 1 commit into from
Nov 11, 2024
+10 −10
Merged

Initialize OpenSAML in OpenSamlAssertingPartyMetadataRepository #16055

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 5 additions & 0 deletions ...curity/saml2/provider/service/registration/OpenSaml4AssertingPartyMetadataRepository.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -50,6 +50,7 @@
import org.springframework.lang.NonNull;
import org.springframework.lang.Nullable;
import org.springframework.security.saml2.Saml2Exception;
import org.springframework.security.saml2.core.OpenSamlInitializationService;
import org.springframework.security.saml2.provider.service.registration.BaseOpenSamlAssertingPartyMetadataRepository.MetadataResolverAdapter;
import org.springframework.util.Assert;

Expand All @@ -68,6 +69,10 @@
*/
public final class OpenSaml4AssertingPartyMetadataRepository implements AssertingPartyMetadataRepository {

static {
OpenSamlInitializationService.initialize();
}

private final BaseOpenSamlAssertingPartyMetadataRepository delegate;

/**
Expand Down
5 changes: 0 additions & 5 deletions ...y/saml2/provider/service/registration/OpenSaml4AssertingPartyMetadataRepositoryTests.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -53,7 +53,6 @@
import org.springframework.core.io.ClassPathResource;
import org.springframework.core.io.ResourceLoader;
import org.springframework.security.saml2.Saml2Exception;
import org.springframework.security.saml2.core.OpenSamlInitializationService;
import org.springframework.security.saml2.core.TestSaml2X509Credentials;
import org.springframework.security.saml2.provider.service.authentication.TestOpenSamlObjects;

Expand All @@ -71,10 +70,6 @@
*/
public class OpenSaml4AssertingPartyMetadataRepositoryTests {

static {
OpenSamlInitializationService.initialize();
}

private static MetadataDispatcher dispatcher = new MetadataDispatcher()
.addResponse("/entity.xml", readFile("test-metadata.xml"))
.addResponse("/entities.xml", readFile("test-entitiesdescriptor.xml"));
Expand Down
5 changes: 5 additions & 0 deletions ...curity/saml2/provider/service/registration/OpenSaml5AssertingPartyMetadataRepository.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -50,6 +50,7 @@
import org.springframework.lang.NonNull;
import org.springframework.lang.Nullable;
import org.springframework.security.saml2.Saml2Exception;
import org.springframework.security.saml2.core.OpenSamlInitializationService;
import org.springframework.security.saml2.provider.service.registration.BaseOpenSamlAssertingPartyMetadataRepository.MetadataResolverAdapter;
import org.springframework.util.Assert;

Expand All @@ -68,6 +69,10 @@
*/
public final class OpenSaml5AssertingPartyMetadataRepository implements AssertingPartyMetadataRepository {

static {
OpenSamlInitializationService.initialize();
}

private final BaseOpenSamlAssertingPartyMetadataRepository delegate;

/**
Expand Down
5 changes: 0 additions & 5 deletions ...y/saml2/provider/service/registration/OpenSaml5AssertingPartyMetadataRepositoryTests.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -53,7 +53,6 @@
import org.springframework.core.io.ClassPathResource;
import org.springframework.core.io.ResourceLoader;
import org.springframework.security.saml2.Saml2Exception;
import org.springframework.security.saml2.core.OpenSamlInitializationService;
import org.springframework.security.saml2.core.TestSaml2X509Credentials;
import org.springframework.security.saml2.provider.service.authentication.TestOpenSamlObjects;

Expand All @@ -71,10 +70,6 @@
*/
public class OpenSaml5AssertingPartyMetadataRepositoryTests {

static {
OpenSamlInitializationService.initialize();
}

private static MetadataDispatcher dispatcher = new MetadataDispatcher()
.addResponse("/entity.xml", readFile("test-metadata.xml"))
.addResponse("/entities.xml", readFile("test-entitiesdescriptor.xml"));
Expand Down