|
@@ -71,6 +71,7 @@ import org.springframework.security.saml2.provider.service.authentication.Saml2A
|
|
import org.springframework.security.saml2.provider.service.authentication.Saml2Authentication;
|
|
import org.springframework.security.saml2.provider.service.authentication.Saml2Authentication;
|
|
import org.springframework.security.saml2.provider.service.authentication.Saml2AuthenticationException;
|
|
import org.springframework.security.saml2.provider.service.authentication.Saml2AuthenticationException;
|
|
import org.springframework.security.saml2.provider.service.authentication.Saml2AuthenticationToken;
|
|
import org.springframework.security.saml2.provider.service.authentication.Saml2AuthenticationToken;
|
|
|
|
+import org.springframework.security.saml2.provider.service.registration.InMemoryRelyingPartyRegistrationRepository;
|
|
import org.springframework.security.saml2.provider.service.registration.RelyingPartyRegistration;
|
|
import org.springframework.security.saml2.provider.service.registration.RelyingPartyRegistration;
|
|
import org.springframework.security.saml2.provider.service.registration.RelyingPartyRegistrationRepository;
|
|
import org.springframework.security.saml2.provider.service.registration.RelyingPartyRegistrationRepository;
|
|
import org.springframework.security.saml2.provider.service.registration.TestRelyingPartyRegistrations;
|
|
import org.springframework.security.saml2.provider.service.registration.TestRelyingPartyRegistrations;
|
|
@@ -101,9 +102,9 @@ import org.springframework.web.util.UriComponentsBuilder;
|
|
import static org.assertj.core.api.Assertions.assertThat;
|
|
import static org.assertj.core.api.Assertions.assertThat;
|
|
import static org.assertj.core.api.Assertions.assertThatExceptionOfType;
|
|
import static org.assertj.core.api.Assertions.assertThatExceptionOfType;
|
|
import static org.mockito.ArgumentMatchers.any;
|
|
import static org.mockito.ArgumentMatchers.any;
|
|
-import static org.mockito.ArgumentMatchers.anyString;
|
|
|
|
import static org.mockito.BDDMockito.given;
|
|
import static org.mockito.BDDMockito.given;
|
|
import static org.mockito.Mockito.mock;
|
|
import static org.mockito.Mockito.mock;
|
|
|
|
+import static org.mockito.Mockito.spy;
|
|
import static org.mockito.Mockito.verify;
|
|
import static org.mockito.Mockito.verify;
|
|
import static org.springframework.security.config.Customizer.withDefaults;
|
|
import static org.springframework.security.config.Customizer.withDefaults;
|
|
import static org.springframework.test.web.servlet.request.MockMvcRequestBuilders.get;
|
|
import static org.springframework.test.web.servlet.request.MockMvcRequestBuilders.get;
|
|
@@ -367,6 +368,8 @@ public class Saml2LoginConfigurerTests {
|
|
|
|
|
|
private void performSaml2Login(String expected) throws IOException, ServletException {
|
|
private void performSaml2Login(String expected) throws IOException, ServletException {
|
|
// setup authentication parameters
|
|
// setup authentication parameters
|
|
|
|
+ this.request.setRequestURI("/login/saml2/sso/registration-id");
|
|
|
|
+ this.request.setServletPath("/login/saml2/sso/registration-id");
|
|
this.request.setParameter("SAMLResponse",
|
|
this.request.setParameter("SAMLResponse",
|
|
Base64.getEncoder().encodeToString("saml2-xml-response-object".getBytes()));
|
|
Base64.getEncoder().encodeToString("saml2-xml-response-object".getBytes()));
|
|
// perform test
|
|
// perform test
|
|
@@ -693,9 +696,7 @@ public class Saml2LoginConfigurerTests {
|
|
.assertingPartyDetails((party) -> party.verificationX509Credentials(
|
|
.assertingPartyDetails((party) -> party.verificationX509Credentials(
|
|
(c) -> c.add(TestSaml2X509Credentials.relyingPartyVerifyingCredential())))
|
|
(c) -> c.add(TestSaml2X509Credentials.relyingPartyVerifyingCredential())))
|
|
.build();
|
|
.build();
|
|
- RelyingPartyRegistrationRepository repository = mock(RelyingPartyRegistrationRepository.class);
|
|
|
|
- given(repository.findByRegistrationId(anyString())).willReturn(registration);
|
|
|
|
- return repository;
|
|
|
|
|
|
+ return spy(new InMemoryRelyingPartyRegistrationRepository(registration));
|
|
}
|
|
}
|
|
|
|
|
|
}
|
|
}
|