Cwikius-Spring
/
spring-security
mirror of https://github.com/spring-projects/spring-security.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Migrate SAML 2.0 Test and Docs to PCFOne 

Issue gh-9362
This commit is contained in:
Josh Cummings 2021-01-22 15:12:31 -07:00
parent e974c93f72
commit 2985d805b0
No known key found for this signature in database
GPG Key ID: 49EF60DD7FF83443
6 changed files with 15 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -1933,9 +1933,9 @@ public final class HttpSecurity extends
* *
* private RelyingPartyRegistration getSaml2RelyingPartyRegistration() { * private RelyingPartyRegistration getSaml2RelyingPartyRegistration() {
* //remote IDP entity ID * //remote IDP entity ID
* String idpEntityId = "https://simplesaml-for-spring-saml.cfapps.io/saml2/idp/metadata.php"; * String idpEntityId = "https://simplesaml-for-spring-saml.apps.pcfone.io/saml2/idp/metadata.php";
* //remote WebSSO Endpoint - Where to Send AuthNRequests to * //remote WebSSO Endpoint - Where to Send AuthNRequests to
* String webSsoEndpoint = "https://simplesaml-for-spring-saml.cfapps.io/saml2/idp/SSOService.php"; * String webSsoEndpoint = "https://simplesaml-for-spring-saml.apps.pcfone.io/saml2/idp/SSOService.php";
* //local registration ID * //local registration ID
* String registrationId = "simplesamlphp"; * String registrationId = "simplesamlphp";
* //local entity ID - autogenerated based on URL * //local entity ID - autogenerated based on URL
@ -2024,9 +2024,9 @@ public final class HttpSecurity extends
* *
* private RelyingPartyRegistration getSaml2RelyingPartyRegistration() { * private RelyingPartyRegistration getSaml2RelyingPartyRegistration() {
* //remote IDP entity ID * //remote IDP entity ID
* String idpEntityId = "https://simplesaml-for-spring-saml.cfapps.io/saml2/idp/metadata.php"; * String idpEntityId = "https://simplesaml-for-spring-saml.apps.pcfone.io/saml2/idp/metadata.php";
* //remote WebSSO Endpoint - Where to Send AuthNRequests to * //remote WebSSO Endpoint - Where to Send AuthNRequests to
* String webSsoEndpoint = "https://simplesaml-for-spring-saml.cfapps.io/saml2/idp/SSOService.php"; * String webSsoEndpoint = "https://simplesaml-for-spring-saml.apps.pcfone.io/saml2/idp/SSOService.php";
* //local registration ID * //local registration ID
* String registrationId = "simplesamlphp"; * String registrationId = "simplesamlphp";
* //local entity ID - autogenerated based on URL * //local entity ID - autogenerated based on URL

4
config/src/test/java/org/springframework/security/config/annotation/web/configurers/saml2/TestRelyingPartyRegistrations.java
View File

@ -30,9 +30,9 @@ public class TestRelyingPartyRegistrations {
static RelyingPartyRegistration saml2AuthenticationConfiguration() { static RelyingPartyRegistration saml2AuthenticationConfiguration() {
//remote IDP entity ID //remote IDP entity ID
String idpEntityId = "https://simplesaml-for-spring-saml.cfapps.io/saml2/idp/metadata.php"; String idpEntityId = "https://simplesaml-for-spring-saml.apps.pcfone.io/saml2/idp/metadata.php";
//remote WebSSO Endpoint - Where to Send AuthNRequests to //remote WebSSO Endpoint - Where to Send AuthNRequests to
String webSsoEndpoint = "https://simplesaml-for-spring-saml.cfapps.io/saml2/idp/SSOService.php"; String webSsoEndpoint = "https://simplesaml-for-spring-saml.apps.pcfone.io/saml2/idp/SSOService.php";
//local registration ID //local registration ID
String registrationId = "simplesamlphp"; String registrationId = "simplesamlphp";
//local entity ID - autogenerated based on URL //local entity ID - autogenerated based on URL

4
docs/manual/src/docs/asciidoc/_includes/servlet/saml2/saml2-login.adoc
View File

@ -431,9 +431,9 @@ spring:
saml2: saml2:
login: login:
relying-parties: relying-parties:
- entity-id: &idp-entity-id https://simplesaml-for-spring-saml.cfapps.io/saml2/idp/metadata.php - entity-id: &idp-entity-id https://simplesaml-for-spring-saml.apps.pcfone.io/saml2/idp/metadata.php
registration-id: simplesamlphp registration-id: simplesamlphp
web-sso-url: &idp-sso-url https://simplesaml-for-spring-saml.cfapps.io/saml2/idp/SSOService.php web-sso-url: &idp-sso-url https://simplesaml-for-spring-saml.apps.pcfone.io/saml2/idp/SSOService.php
signing-credentials: &service-provider-credentials signing-credentials: &service-provider-credentials
- private-key: | - private-key: |
-----BEGIN PRIVATE KEY----- -----BEGIN PRIVATE KEY-----

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

@ -37,9 +37,9 @@ import static org.springframework.util.Assert.notNull;
* A fully configured registration may look like * A fully configured registration may look like
* <pre> * <pre>
* //remote IDP entity ID * //remote IDP entity ID
* String idpEntityId = "https://simplesaml-for-spring-saml.cfapps.io/saml2/idp/metadata.php"; * String idpEntityId = "https://simplesaml-for-spring-saml.apps.pcfone.io/saml2/idp/metadata.php";
* //remote WebSSO Endpoint - Where to Send AuthNRequests to * //remote WebSSO Endpoint - Where to Send AuthNRequests to
* String webSsoEndpoint = "https://simplesaml-for-spring-saml.cfapps.io/saml2/idp/SSOService.php"; * String webSsoEndpoint = "https://simplesaml-for-spring-saml.apps.pcfone.io/saml2/idp/SSOService.php";
* //local registration ID * //local registration ID
* String registrationId = "simplesamlphp"; * String registrationId = "simplesamlphp";
* //local entity ID - autogenerated based on URL * //local entity ID - autogenerated based on URL

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

@ -37,7 +37,7 @@ public class RelyingPartyRegistrationTests {
.isEqualTo("simplesamlphp"); .isEqualTo("simplesamlphp");
assertThat(copy.getProviderDetails().getEntityId()) assertThat(copy.getProviderDetails().getEntityId())
.isEqualTo(registration.getProviderDetails().getEntityId()) .isEqualTo(registration.getProviderDetails().getEntityId())
.isEqualTo("https://simplesaml-for-spring-saml.cfapps.io/saml2/idp/metadata.php"); .isEqualTo("https://simplesaml-for-spring-saml.apps.pcfone.io/saml2/idp/metadata.php");
assertThat(copy.getAssertionConsumerServiceUrlTemplate()) assertThat(copy.getAssertionConsumerServiceUrlTemplate())
.isEqualTo(registration.getAssertionConsumerServiceUrlTemplate()) .isEqualTo(registration.getAssertionConsumerServiceUrlTemplate())
.isEqualTo("{baseUrl}" + Saml2WebSsoAuthenticationFilter.DEFAULT_FILTER_PROCESSES_URI); .isEqualTo("{baseUrl}" + Saml2WebSsoAuthenticationFilter.DEFAULT_FILTER_PROCESSES_URI);
@ -52,7 +52,7 @@ public class RelyingPartyRegistrationTests {
.isEqualTo("{baseUrl}/saml2/service-provider-metadata/{registrationId}"); .isEqualTo("{baseUrl}/saml2/service-provider-metadata/{registrationId}");
assertThat(copy.getProviderDetails().getWebSsoUrl()) assertThat(copy.getProviderDetails().getWebSsoUrl())
.isEqualTo(registration.getProviderDetails().getWebSsoUrl()) .isEqualTo(registration.getProviderDetails().getWebSsoUrl())
.isEqualTo("https://simplesaml-for-spring-saml.cfapps.io/saml2/idp/SSOService.php"); .isEqualTo("https://simplesaml-for-spring-saml.apps.pcfone.io/saml2/idp/SSOService.php");
assertThat(copy.getProviderDetails().getBinding()) assertThat(copy.getProviderDetails().getBinding())
.isEqualTo(registration.getProviderDetails().getBinding()) .isEqualTo(registration.getProviderDetails().getBinding())
.isEqualTo(Saml2MessageBinding.POST); .isEqualTo(Saml2MessageBinding.POST);
@ -64,9 +64,9 @@ public class RelyingPartyRegistrationTests {
private RelyingPartyRegistration relyingPartyRegistration() { private RelyingPartyRegistration relyingPartyRegistration() {
//remote IDP entity ID //remote IDP entity ID
String idpEntityId = "https://simplesaml-for-spring-saml.cfapps.io/saml2/idp/metadata.php"; String idpEntityId = "https://simplesaml-for-spring-saml.apps.pcfone.io/saml2/idp/metadata.php";
//remote WebSSO Endpoint - Where to Send AuthNRequests to //remote WebSSO Endpoint - Where to Send AuthNRequests to
String webSsoEndpoint = "https://simplesaml-for-spring-saml.cfapps.io/saml2/idp/SSOService.php"; String webSsoEndpoint = "https://simplesaml-for-spring-saml.apps.pcfone.io/saml2/idp/SSOService.php";
//local registration ID //local registration ID
String registrationId = "simplesamlphp"; String registrationId = "simplesamlphp";
//local entity ID - autogenerated based on URL //local entity ID - autogenerated based on URL

2
samples/boot/saml2login/src/main/resources/templates/index.html
View File

@ -25,7 +25,7 @@
<form th:action="@{/logout}" method="post"> <form th:action="@{/logout}" method="post">
<input type="submit" value="Logout" /> <input type="submit" value="Logout" />
</form> </form>
<a href="https://simplesaml-for-spring-saml.cfapps.io/module.php/core/authenticate.php?as=example-userpass&logout"> <a href="https://simplesaml-for-spring-saml.apps.pcfone.io/module.php/core/authenticate.php?as=example-userpass&logout">
Log out of SimpleSAMLphp Log out of SimpleSAMLphp
</a> </a>
</div> </div>