From c9d083717f7bf0b1b64ad5890952ad7bf942c2c3 Mon Sep 17 00:00:00 2001 From: Josh Cummings Date: Fri, 30 Aug 2024 10:21:19 -0600 Subject: [PATCH] Apply OpenSAML Test Fix to Remaining Test There was one test that wasn't converted and now it is. Issue gh-15395 --- ...AssertingPartyMetadataRepositoryTests.java | 19 ++++++------------- ...AssertingPartyMetadataRepositoryTests.java | 19 ++++++------------- 2 files changed, 12 insertions(+), 26 deletions(-) diff --git a/saml2/saml2-service-provider/src/opensaml4Test/java/org/springframework/security/saml2/provider/service/registration/OpenSaml4AssertingPartyMetadataRepositoryTests.java b/saml2/saml2-service-provider/src/opensaml4Test/java/org/springframework/security/saml2/provider/service/registration/OpenSaml4AssertingPartyMetadataRepositoryTests.java index b1cf9369b7..eb00d21745 100644 --- a/saml2/saml2-service-provider/src/opensaml4Test/java/org/springframework/security/saml2/provider/service/registration/OpenSaml4AssertingPartyMetadataRepositoryTests.java +++ b/saml2/saml2-service-provider/src/opensaml4Test/java/org/springframework/security/saml2/provider/service/registration/OpenSaml4AssertingPartyMetadataRepositoryTests.java @@ -261,13 +261,12 @@ public class OpenSaml4AssertingPartyMetadataRepositoryTests { TestOpenSamlObjects.signed(descriptor, TestSaml2X509Credentials.assertingPartySigningCredential(), descriptor.getEntityID()); String serialized = serialize(descriptor); - try (MockWebServer server = new MockWebServer()) { - enqueue(server, serialized, 3); - AssertingPartyMetadataRepository parties = OpenSaml4AssertingPartyMetadataRepository - .withTrustedMetadataLocation(server.url("/").toString()) - .build(); - assertThat(parties.findByEntityId(registration.getAssertingPartyDetails().getEntityId())).isNotNull(); - } + String endpoint = "/" + UUID.randomUUID().toString(); + dispatcher.addResponse(endpoint, serialized); + AssertingPartyMetadataRepository parties = OpenSaml4AssertingPartyMetadataRepository + .withTrustedMetadataLocation(web.url(endpoint).toString()) + .build(); + assertThat(parties.findByEntityId(registration.getAssertingPartyDetails().getEntityId())).isNotNull(); } @Test @@ -362,12 +361,6 @@ public class OpenSaml4AssertingPartyMetadataRepositoryTests { } } - private static void enqueue(MockWebServer web, String body, int times) { - for (int i = 0; i < times; i++) { - web.enqueue(new MockResponse().setBody(body).setResponseCode(200)); - } - } - private static final class MetadataDispatcher extends Dispatcher { private final MockResponse head = new MockResponse(); diff --git a/saml2/saml2-service-provider/src/opensaml5Test/java/org/springframework/security/saml2/provider/service/registration/OpenSaml5AssertingPartyMetadataRepositoryTests.java b/saml2/saml2-service-provider/src/opensaml5Test/java/org/springframework/security/saml2/provider/service/registration/OpenSaml5AssertingPartyMetadataRepositoryTests.java index 9a3132da3b..df0061ead7 100644 --- a/saml2/saml2-service-provider/src/opensaml5Test/java/org/springframework/security/saml2/provider/service/registration/OpenSaml5AssertingPartyMetadataRepositoryTests.java +++ b/saml2/saml2-service-provider/src/opensaml5Test/java/org/springframework/security/saml2/provider/service/registration/OpenSaml5AssertingPartyMetadataRepositoryTests.java @@ -261,13 +261,12 @@ public class OpenSaml5AssertingPartyMetadataRepositoryTests { TestOpenSamlObjects.signed(descriptor, TestSaml2X509Credentials.assertingPartySigningCredential(), descriptor.getEntityID()); String serialized = serialize(descriptor); - try (MockWebServer server = new MockWebServer()) { - enqueue(server, serialized, 3); - AssertingPartyMetadataRepository parties = OpenSaml5AssertingPartyMetadataRepository - .withTrustedMetadataLocation(server.url("/").toString()) - .build(); - assertThat(parties.findByEntityId(registration.getAssertingPartyDetails().getEntityId())).isNotNull(); - } + String endpoint = "/" + UUID.randomUUID().toString(); + dispatcher.addResponse(endpoint, serialized); + AssertingPartyMetadataRepository parties = OpenSaml5AssertingPartyMetadataRepository + .withTrustedMetadataLocation(web.url(endpoint).toString()) + .build(); + assertThat(parties.findByEntityId(registration.getAssertingPartyDetails().getEntityId())).isNotNull(); } @Test @@ -362,12 +361,6 @@ public class OpenSaml5AssertingPartyMetadataRepositoryTests { } } - private static void enqueue(MockWebServer web, String body, int times) { - for (int i = 0; i < times; i++) { - web.enqueue(new MockResponse().setBody(body).setResponseCode(200)); - } - } - private static final class MetadataDispatcher extends Dispatcher { private final MockResponse head = new MockResponse();