Skip to content

Commit 76229cf

Browse files
committed
Migrate SAML 2.0 Tests and Docs to PCFOne
Issue gh-9362
1 parent cde728e commit 76229cf

File tree

5 files changed

+11
-11
lines changed

5 files changed

+11
-11
lines changed

config/src/main/java/org/springframework/security/config/annotation/web/builders/HttpSecurity.java

+4-4
Original file line numberDiff line numberDiff line change
@@ -1997,9 +1997,9 @@ public HttpSecurity formLogin(Customizer<FormLoginConfigurer<HttpSecurity>> form
19971997
*
19981998
* private RelyingPartyRegistration getSaml2RelyingPartyRegistration() {
19991999
* //remote IDP entity ID
2000-
* String idpEntityId = "https://simplesaml-for-spring-saml.cfapps.io/saml2/idp/metadata.php";
2000+
* String idpEntityId = "https://simplesaml-for-spring-saml.apps.pcfone.io/saml2/idp/metadata.php";
20012001
* //remote WebSSO Endpoint - Where to Send AuthNRequests to
2002-
* String webSsoEndpoint = "https://simplesaml-for-spring-saml.cfapps.io/saml2/idp/SSOService.php";
2002+
* String webSsoEndpoint = "https://simplesaml-for-spring-saml.apps.pcfone.io/saml2/idp/SSOService.php";
20032003
* //local registration ID
20042004
* String registrationId = "simplesamlphp";
20052005
* //local entity ID - autogenerated based on URL
@@ -2086,9 +2086,9 @@ public Saml2LoginConfigurer<HttpSecurity> saml2Login() throws Exception {
20862086
*
20872087
* private RelyingPartyRegistration getSaml2RelyingPartyRegistration() {
20882088
* //remote IDP entity ID
2089-
* String idpEntityId = "https://simplesaml-for-spring-saml.cfapps.io/saml2/idp/metadata.php";
2089+
* String idpEntityId = "https://simplesaml-for-spring-saml.apps.pcfone.io/saml2/idp/metadata.php";
20902090
* //remote WebSSO Endpoint - Where to Send AuthNRequests to
2091-
* String webSsoEndpoint = "https://simplesaml-for-spring-saml.cfapps.io/saml2/idp/SSOService.php";
2091+
* String webSsoEndpoint = "https://simplesaml-for-spring-saml.apps.pcfone.io/saml2/idp/SSOService.php";
20922092
* //local registration ID
20932093
* String registrationId = "simplesamlphp";
20942094
* //local entity ID - autogenerated based on URL

saml2/saml2-service-provider/src/main/java/org/springframework/security/saml2/provider/service/registration/RelyingPartyRegistration.java

+2-2
Original file line numberDiff line numberDiff line change
@@ -51,8 +51,8 @@
5151
* String assertionConsumerServiceLocation = "{baseUrl}/login/saml2/sso/{registrationId}";
5252
* Saml2X509Credential relyingPartySigningCredential = ...;
5353
*
54-
* String assertingPartyEntityId = "https://simplesaml-for-spring-saml.cfapps.io/saml2/idp/metadata.php";
55-
* String singleSignOnServiceLocation = "https://simplesaml-for-spring-saml.cfapps.io/saml2/idp/SSOService.php";
54+
* String assertingPartyEntityId = "https://simplesaml-for-spring-saml.apps.pcfone.io/saml2/idp/metadata.php";
55+
* String singleSignOnServiceLocation = "https://simplesaml-for-spring-saml.apps.pcfone.io/saml2/idp/SSOService.php";
5656
* Saml2X509Credential assertingPartyVerificationCredential = ...;
5757
*
5858
*

saml2/saml2-service-provider/src/test/java/org/springframework/security/saml2/provider/service/registration/RelyingPartyRegistrationTests.java

+2-2
Original file line numberDiff line numberDiff line change
@@ -41,7 +41,7 @@ private void compareRegistrations(RelyingPartyRegistration registration, Relying
4141
assertThat(copy.getProviderDetails().getEntityId()).isEqualTo(registration.getProviderDetails().getEntityId())
4242
.isEqualTo(copy.getAssertingPartyDetails().getEntityId())
4343
.isEqualTo(registration.getAssertingPartyDetails().getEntityId())
44-
.isEqualTo("https://simplesaml-for-spring-saml.cfapps.io/saml2/idp/metadata.php");
44+
.isEqualTo("https://simplesaml-for-spring-saml.apps.pcfone.io/saml2/idp/metadata.php");
4545
assertThat(copy.getAssertionConsumerServiceUrlTemplate())
4646
.isEqualTo(registration.getAssertionConsumerServiceUrlTemplate())
4747
.isEqualTo(copy.getAssertionConsumerServiceLocation())
@@ -55,7 +55,7 @@ private void compareRegistrations(RelyingPartyRegistration registration, Relying
5555
assertThat(copy.getProviderDetails().getWebSsoUrl()).isEqualTo(registration.getProviderDetails().getWebSsoUrl())
5656
.isEqualTo(copy.getAssertingPartyDetails().getSingleSignOnServiceLocation())
5757
.isEqualTo(registration.getAssertingPartyDetails().getSingleSignOnServiceLocation())
58-
.isEqualTo("https://simplesaml-for-spring-saml.cfapps.io/saml2/idp/SSOService.php");
58+
.isEqualTo("https://simplesaml-for-spring-saml.apps.pcfone.io/saml2/idp/SSOService.php");
5959
assertThat(copy.getProviderDetails().getBinding()).isEqualTo(registration.getProviderDetails().getBinding())
6060
.isEqualTo(copy.getAssertingPartyDetails().getSingleSignOnServiceBinding())
6161
.isEqualTo(registration.getAssertingPartyDetails().getSingleSignOnServiceBinding())

saml2/saml2-service-provider/src/test/java/org/springframework/security/saml2/provider/service/registration/TestRelyingPartyRegistrations.java

+2-2
Original file line numberDiff line numberDiff line change
@@ -34,9 +34,9 @@ public static RelyingPartyRegistration.Builder relyingPartyRegistration() {
3434
Saml2X509Credential signingCredential = TestSaml2X509Credentials.relyingPartySigningCredential();
3535
String assertionConsumerServiceLocation = "{baseUrl}"
3636
+ Saml2WebSsoAuthenticationFilter.DEFAULT_FILTER_PROCESSES_URI;
37-
String apEntityId = "https://simplesaml-for-spring-saml.cfapps.io/saml2/idp/metadata.php";
37+
String apEntityId = "https://simplesaml-for-spring-saml.apps.pcfone.io/saml2/idp/metadata.php";
3838
Saml2X509Credential verificationCertificate = TestSaml2X509Credentials.relyingPartyVerifyingCredential();
39-
String singleSignOnServiceLocation = "https://simplesaml-for-spring-saml.cfapps.io/saml2/idp/SSOService.php";
39+
String singleSignOnServiceLocation = "https://simplesaml-for-spring-saml.apps.pcfone.io/saml2/idp/SSOService.php";
4040
return RelyingPartyRegistration.withRegistrationId(registrationId).entityId(rpEntityId)
4141
.assertionConsumerServiceLocation(assertionConsumerServiceLocation)
4242
.credentials((c) -> c.add(signingCredential))

samples/boot/saml2login/src/main/resources/templates/index.html

+1-1
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,7 @@
3030
<form th:action="@{/logout}" method="post">
3131
<input type="submit" value="Logout" />
3232
</form>
33-
<a href="https://simplesaml-for-spring-saml.cfapps.io/module.php/core/authenticate.php?as=example-userpass&logout">
33+
<a href="https://simplesaml-for-spring-saml.apps.pcfone.io/module.php/core/authenticate.php?as=example-userpass&logout">
3434
Log out of SimpleSAMLphp
3535
</a>
3636
</div>

0 commit comments

Comments
 (0)