From 6df5dc4ecf039bf222eb0876983c8cc1640cb640 Mon Sep 17 00:00:00 2001 From: Josh Cummings Date: Thu, 21 Jan 2021 09:13:30 -0700 Subject: [PATCH] Migrate SAML 2.0 Samples to PCFOne Closes gh-9362 --- .../security/samples/Saml2LoginIntegrationTests.java | 12 ++++++------ .../saml2login/src/main/resources/application.yml | 4 ++-- .../security/samples/config/SecurityConfig.java | 4 ++-- 3 files changed, 10 insertions(+), 10 deletions(-) diff --git a/samples/boot/saml2login/src/integration-test/java/org/springframework/security/samples/Saml2LoginIntegrationTests.java b/samples/boot/saml2login/src/integration-test/java/org/springframework/security/samples/Saml2LoginIntegrationTests.java index a401ce8a4f..2bb2dbb568 100644 --- a/samples/boot/saml2login/src/integration-test/java/org/springframework/security/samples/Saml2LoginIntegrationTests.java +++ b/samples/boot/saml2login/src/integration-test/java/org/springframework/security/samples/Saml2LoginIntegrationTests.java @@ -124,7 +124,7 @@ public class Saml2LoginIntegrationTests { public void authenticateRequestWhenUnauthenticatedThenRespondsWithRedirectAuthNRequestXML() throws Exception { mockMvc.perform(get("http://localhost:8080/saml2/authenticate/simplesamlphp")) .andExpect(status().is3xxRedirection()) - .andExpect(header().string("Location", startsWith("https://simplesaml-for-spring-saml.cfapps.io/saml2/idp/SSOService.php?SAMLRequest="))); + .andExpect(header().string("Location", startsWith("https://simplesaml-for-spring-saml.apps.pcfone.io/saml2/idp/SSOService.php?SAMLRequest="))); } @Test @@ -134,7 +134,7 @@ public class Saml2LoginIntegrationTests { .param("RelayState", "relay state value with spaces") ) .andExpect(status().is3xxRedirection()) - .andExpect(header().string("Location", startsWith("https://simplesaml-for-spring-saml.cfapps.io/saml2/idp/SSOService.php?SAMLRequest="))) + .andExpect(header().string("Location", startsWith("https://simplesaml-for-spring-saml.apps.pcfone.io/saml2/idp/SSOService.php?SAMLRequest="))) .andExpect(header().string("Location", containsString("RelayState=relay%20state%20value%20with%20spaces"))); } @@ -155,7 +155,7 @@ public class Saml2LoginIntegrationTests { String destination = authnRequest.getDestination(); assertEquals( "Destination must match", - "https://simplesaml-for-spring-saml.cfapps.io/saml2/idp/SSOService.php", + "https://simplesaml-for-spring-saml.apps.pcfone.io/saml2/idp/SSOService.php", destination ); String acsURL = authnRequest.getAssertionConsumerServiceURL(); @@ -317,14 +317,14 @@ public class Saml2LoginIntegrationTests { Response response = OpenSamlActionTestingSupport.buildResponse(); response.setID("_" + UUID.randomUUID().toString()); response.setDestination("http://localhost:8080/login/saml2/sso/simplesamlphp"); - response.setIssuer(buildIssuer("https://simplesaml-for-spring-saml.cfapps.io/saml2/idp/metadata.php")); + response.setIssuer(buildIssuer("https://simplesaml-for-spring-saml.apps.pcfone.io/saml2/idp/metadata.php")); return response; } private Assertion buildAssertion(String username) { Assertion assertion = OpenSamlActionTestingSupport.buildAssertion(); assertion.setIssueInstant(DateTime.now()); - assertion.setIssuer(buildIssuer("https://simplesaml-for-spring-saml.cfapps.io/saml2/idp/metadata.php")); + assertion.setIssuer(buildIssuer("https://simplesaml-for-spring-saml.apps.pcfone.io/saml2/idp/metadata.php")); assertion.setSubject(buildSubject(username)); assertion.setConditions(buildConditions()); @@ -346,7 +346,7 @@ public class Saml2LoginIntegrationTests { final PrivateKey privateKey = KeySupport.decodePrivateKey(key.getBytes(UTF_8), new char[0]); BasicCredential cred = CredentialSupport.getSimpleCredential(publicKey, privateKey); cred.setUsageType(usageType); - cred.setEntityId("https://simplesaml-for-spring-saml.cfapps.io/saml2/idp/metadata.php"); + cred.setEntityId("https://simplesaml-for-spring-saml.apps.pcfone.io/saml2/idp/metadata.php"); return cred; } diff --git a/samples/boot/saml2login/src/main/resources/application.yml b/samples/boot/saml2login/src/main/resources/application.yml index c8cbdd45ce..61de74192c 100644 --- a/samples/boot/saml2login/src/main/resources/application.yml +++ b/samples/boot/saml2login/src/main/resources/application.yml @@ -12,5 +12,5 @@ spring: verification: credentials: - certificate-location: "classpath:credentials/idp-certificate.crt" - entity-id: https://simplesaml-for-spring-saml.cfapps.io/saml2/idp/metadata.php - sso-url: https://simplesaml-for-spring-saml.cfapps.io/saml2/idp/SSOService.php + entity-id: https://simplesaml-for-spring-saml.apps.pcfone.io/saml2/idp/metadata.php + sso-url: https://simplesaml-for-spring-saml.apps.pcfone.io/saml2/idp/SSOService.php diff --git a/samples/javaconfig/saml2login/src/main/java/org/springframework/security/samples/config/SecurityConfig.java b/samples/javaconfig/saml2login/src/main/java/org/springframework/security/samples/config/SecurityConfig.java index 9351902f11..13ff9f674f 100644 --- a/samples/javaconfig/saml2login/src/main/java/org/springframework/security/samples/config/SecurityConfig.java +++ b/samples/javaconfig/saml2login/src/main/java/org/springframework/security/samples/config/SecurityConfig.java @@ -45,9 +45,9 @@ public class SecurityConfig extends WebSecurityConfigurerAdapter { @Bean RelyingPartyRegistrationRepository getSaml2AuthenticationConfiguration() throws Exception { //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 - 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 String registrationId = "simplesamlphp"; //local entity ID - autogenerated based on URL