Skip to content

Commit 2985d80

Browse files
jzheauxjzheaux
committed
Migrate SAML 2.0 Test and Docs to PCFOne
Issue gh-9362
1 parent e974c93 commit 2985d80

6 files changed

Lines changed: 15 additions & 15 deletions

File tree

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

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1933,9 +1933,9 @@ public HttpSecurity formLogin(Customizer<FormLoginConfigurer<HttpSecurity>> form
19331933
*
19341934
* private RelyingPartyRegistration getSaml2RelyingPartyRegistration() {
19351935
* //remote IDP entity ID
1936-
* String idpEntityId = "https://simplesaml-for-spring-saml.cfapps.io/saml2/idp/metadata.php";
1936+
* String idpEntityId = "https://simplesaml-for-spring-saml.apps.pcfone.io/saml2/idp/metadata.php";
19371937
* //remote WebSSO Endpoint - Where to Send AuthNRequests to
1938-
* String webSsoEndpoint = "https://simplesaml-for-spring-saml.cfapps.io/saml2/idp/SSOService.php";
1938+
* String webSsoEndpoint = "https://simplesaml-for-spring-saml.apps.pcfone.io/saml2/idp/SSOService.php";
19391939
* //local registration ID
19401940
* String registrationId = "simplesamlphp";
19411941
* //local entity ID - autogenerated based on URL
@@ -2024,9 +2024,9 @@ public Saml2LoginConfigurer<HttpSecurity> saml2Login() throws Exception {
20242024
*
20252025
* private RelyingPartyRegistration getSaml2RelyingPartyRegistration() {
20262026
* //remote IDP entity ID
2027-
* String idpEntityId = "https://simplesaml-for-spring-saml.cfapps.io/saml2/idp/metadata.php";
2027+
* String idpEntityId = "https://simplesaml-for-spring-saml.apps.pcfone.io/saml2/idp/metadata.php";
20282028
* //remote WebSSO Endpoint - Where to Send AuthNRequests to
2029-
* String webSsoEndpoint = "https://simplesaml-for-spring-saml.cfapps.io/saml2/idp/SSOService.php";
2029+
* String webSsoEndpoint = "https://simplesaml-for-spring-saml.apps.pcfone.io/saml2/idp/SSOService.php";
20302030
* //local registration ID
20312031
* String registrationId = "simplesamlphp";
20322032
* //local entity ID - autogenerated based on URL

‎config/src/test/java/org/springframework/security/config/annotation/web/configurers/saml2/TestRelyingPartyRegistrations.java‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -30,9 +30,9 @@ public class TestRelyingPartyRegistrations {
3030

3131
static RelyingPartyRegistration saml2AuthenticationConfiguration() {
3232
//remote IDP entity ID
33-
String idpEntityId = "https://simplesaml-for-spring-saml.cfapps.io/saml2/idp/metadata.php";
33+
String idpEntityId = "https://simplesaml-for-spring-saml.apps.pcfone.io/saml2/idp/metadata.php";
3434
//remote WebSSO Endpoint - Where to Send AuthNRequests to
35-
String webSsoEndpoint = "https://simplesaml-for-spring-saml.cfapps.io/saml2/idp/SSOService.php";
35+
String webSsoEndpoint = "https://simplesaml-for-spring-saml.apps.pcfone.io/saml2/idp/SSOService.php";
3636
//local registration ID
3737
String registrationId = "simplesamlphp";
3838
//local entity ID - autogenerated based on URL

‎docs/manual/src/docs/asciidoc/_includes/servlet/saml2/saml2-login.adoc‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -431,9 +431,9 @@ spring:
431431
saml2:
432432
login:
433433
relying-parties:
434-
- entity-id: &idp-entity-id https://simplesaml-for-spring-saml.cfapps.io/saml2/idp/metadata.php
434+
- entity-id: &idp-entity-id https://simplesaml-for-spring-saml.apps.pcfone.io/saml2/idp/metadata.php
435435
registration-id: simplesamlphp
436-
web-sso-url: &idp-sso-url https://simplesaml-for-spring-saml.cfapps.io/saml2/idp/SSOService.php
436+
web-sso-url: &idp-sso-url https://simplesaml-for-spring-saml.apps.pcfone.io/saml2/idp/SSOService.php
437437
signing-credentials: &service-provider-credentials
438438
- private-key: |
439439
-----BEGIN PRIVATE KEY-----

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -37,9 +37,9 @@
3737
* A fully configured registration may look like
3838
* <pre>
3939
* //remote IDP entity ID
40-
* String idpEntityId = "https://simplesaml-for-spring-saml.cfapps.io/saml2/idp/metadata.php";
40+
* String idpEntityId = "https://simplesaml-for-spring-saml.apps.pcfone.io/saml2/idp/metadata.php";
4141
* //remote WebSSO Endpoint - Where to Send AuthNRequests to
42-
* String webSsoEndpoint = "https://simplesaml-for-spring-saml.cfapps.io/saml2/idp/SSOService.php";
42+
* String webSsoEndpoint = "https://simplesaml-for-spring-saml.apps.pcfone.io/saml2/idp/SSOService.php";
4343
* //local registration ID
4444
* String registrationId = "simplesamlphp";
4545
* //local entity ID - autogenerated based on URL

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

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -37,7 +37,7 @@ private void compareRegistrations(RelyingPartyRegistration registration, Relying
3737
.isEqualTo("simplesamlphp");
3838
assertThat(copy.getProviderDetails().getEntityId())
3939
.isEqualTo(registration.getProviderDetails().getEntityId())
40-
.isEqualTo("https://simplesaml-for-spring-saml.cfapps.io/saml2/idp/metadata.php");
40+
.isEqualTo("https://simplesaml-for-spring-saml.apps.pcfone.io/saml2/idp/metadata.php");
4141
assertThat(copy.getAssertionConsumerServiceUrlTemplate())
4242
.isEqualTo(registration.getAssertionConsumerServiceUrlTemplate())
4343
.isEqualTo("{baseUrl}" + Saml2WebSsoAuthenticationFilter.DEFAULT_FILTER_PROCESSES_URI);
@@ -52,7 +52,7 @@ private void compareRegistrations(RelyingPartyRegistration registration, Relying
5252
.isEqualTo("{baseUrl}/saml2/service-provider-metadata/{registrationId}");
5353
assertThat(copy.getProviderDetails().getWebSsoUrl())
5454
.isEqualTo(registration.getProviderDetails().getWebSsoUrl())
55-
.isEqualTo("https://simplesaml-for-spring-saml.cfapps.io/saml2/idp/SSOService.php");
55+
.isEqualTo("https://simplesaml-for-spring-saml.apps.pcfone.io/saml2/idp/SSOService.php");
5656
assertThat(copy.getProviderDetails().getBinding())
5757
.isEqualTo(registration.getProviderDetails().getBinding())
5858
.isEqualTo(Saml2MessageBinding.POST);
@@ -64,9 +64,9 @@ private void compareRegistrations(RelyingPartyRegistration registration, Relying
6464

6565
private RelyingPartyRegistration relyingPartyRegistration() {
6666
//remote IDP entity ID
67-
String idpEntityId = "https://simplesaml-for-spring-saml.cfapps.io/saml2/idp/metadata.php";
67+
String idpEntityId = "https://simplesaml-for-spring-saml.apps.pcfone.io/saml2/idp/metadata.php";
6868
//remote WebSSO Endpoint - Where to Send AuthNRequests to
69-
String webSsoEndpoint = "https://simplesaml-for-spring-saml.cfapps.io/saml2/idp/SSOService.php";
69+
String webSsoEndpoint = "https://simplesaml-for-spring-saml.apps.pcfone.io/saml2/idp/SSOService.php";
7070
//local registration ID
7171
String registrationId = "simplesamlphp";
7272
//local entity ID - autogenerated based on URL

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,7 @@
2525
<form th:action="@{/logout}" method="post">
2626
<input type="submit" value="Logout" />
2727
</form>
28-
<a href="https://simplesaml-for-spring-saml.cfapps.io/module.php/core/authenticate.php?as=example-userpass&logout">
28+
<a href="https://simplesaml-for-spring-saml.apps.pcfone.io/module.php/core/authenticate.php?as=example-userpass&logout">
2929
Log out of SimpleSAMLphp
3030
</a>
3131
</div>

0 commit comments

Comments
 (0)