Skip to content

Commit e974c93

Browse files
committed
Migrate SAML 2.0 Samples to PCFOne
Closes gh-9362
1 parent 7aeda7c commit e974c93

File tree

3 files changed

+10
-10
lines changed

3 files changed

+10
-10
lines changed

samples/boot/saml2login/src/integration-test/java/org/springframework/security/saml2/provider/service/authentication/Saml2LoginIntegrationTests.java

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -124,7 +124,7 @@ public void applicationAccessWhenSingleProviderAndUnauthenticatedThenRedirectsTo
124124
public void authenticateRequestWhenUnauthenticatedThenRespondsWithRedirectAuthNRequestXML() throws Exception {
125125
mockMvc.perform(get("http://localhost:8080/saml2/authenticate/simplesamlphp"))
126126
.andExpect(status().is3xxRedirection())
127-
.andExpect(header().string("Location", startsWith("https://simplesaml-for-spring-saml.cfapps.io/saml2/idp/SSOService.php?SAMLRequest=")));
127+
.andExpect(header().string("Location", startsWith("https://simplesaml-for-spring-saml.apps.pcfone.io/saml2/idp/SSOService.php?SAMLRequest=")));
128128
}
129129

130130
@Test
@@ -136,7 +136,7 @@ public void authenticateRequestWhenRelayStateThenRespondsWithRedirectAndEncodedR
136136
.param("OtherParam2", "OtherParamValue2")
137137
)
138138
.andExpect(status().is3xxRedirection())
139-
.andExpect(header().string("Location", startsWith("https://simplesaml-for-spring-saml.cfapps.io/saml2/idp/SSOService.php?SAMLRequest=")))
139+
.andExpect(header().string("Location", startsWith("https://simplesaml-for-spring-saml.apps.pcfone.io/saml2/idp/SSOService.php?SAMLRequest=")))
140140
.andExpect(header().string("Location", containsString("RelayState=relay%20state%20value%20with%20spaces")))
141141
//check order of parameters
142142
.andExpect(header().string("Location", matchesRegex(".*\\?SAMLRequest\\=.*\\&RelayState\\=.*\\&SigAlg\\=.*\\&Signature\\=.*")));
@@ -160,7 +160,7 @@ public void authenticateRequestWhenWorkingThenDestinationAttributeIsSet() throws
160160
String destination = authnRequest.getDestination();
161161
assertEquals(
162162
"Destination must match",
163-
"https://simplesaml-for-spring-saml.cfapps.io/saml2/idp/SSOService.php",
163+
"https://simplesaml-for-spring-saml.apps.pcfone.io/saml2/idp/SSOService.php",
164164
destination
165165
);
166166
String acsURL = authnRequest.getAssertionConsumerServiceURL();
@@ -322,14 +322,14 @@ private Response buildResponse() {
322322
Response response = OpenSamlActionTestingSupport.buildResponse();
323323
response.setID("_" + UUID.randomUUID().toString());
324324
response.setDestination("http://localhost:8080/login/saml2/sso/simplesamlphp");
325-
response.setIssuer(buildIssuer("https://simplesaml-for-spring-saml.cfapps.io/saml2/idp/metadata.php"));
325+
response.setIssuer(buildIssuer("https://simplesaml-for-spring-saml.apps.pcfone.io/saml2/idp/metadata.php"));
326326
return response;
327327
}
328328

329329
private Assertion buildAssertion(String username) {
330330
Assertion assertion = OpenSamlActionTestingSupport.buildAssertion();
331331
assertion.setIssueInstant(DateTime.now());
332-
assertion.setIssuer(buildIssuer("https://simplesaml-for-spring-saml.cfapps.io/saml2/idp/metadata.php"));
332+
assertion.setIssuer(buildIssuer("https://simplesaml-for-spring-saml.apps.pcfone.io/saml2/idp/metadata.php"));
333333
assertion.setSubject(buildSubject(username));
334334
assertion.setConditions(buildConditions());
335335

@@ -351,7 +351,7 @@ protected Credential getSigningCredential(String certificate, String key, UsageT
351351
final PrivateKey privateKey = KeySupport.decodePrivateKey(key.getBytes(UTF_8), new char[0]);
352352
BasicCredential cred = CredentialSupport.getSimpleCredential(publicKey, privateKey);
353353
cred.setUsageType(usageType);
354-
cred.setEntityId("https://simplesaml-for-spring-saml.cfapps.io/saml2/idp/metadata.php");
354+
cred.setEntityId("https://simplesaml-for-spring-saml.apps.pcfone.io/saml2/idp/metadata.php");
355355
return cred;
356356
}
357357

samples/boot/saml2login/src/main/resources/application.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ spring:
88
- private-key-location: "classpath:credentials/rp-private.key"
99
certificate-location: "classpath:credentials/rp-certificate.crt"
1010
identityprovider:
11-
entity-id: https://simplesaml-for-spring-saml.cfapps.io/saml2/idp/metadata.php
11+
entity-id: https://simplesaml-for-spring-saml.apps.pcfone.io/saml2/idp/metadata.php
1212
verification.credentials:
1313
- certificate-location: "classpath:credentials/idp-certificate.crt"
14-
sso-url: https://simplesaml-for-spring-saml.cfapps.io/saml2/idp/SSOService.php
14+
sso-url: https://simplesaml-for-spring-saml.apps.pcfone.io/saml2/idp/SSOService.php

samples/javaconfig/saml2login/src/main/java/org/springframework/security/samples/config/SecurityConfig.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -45,9 +45,9 @@ public class SecurityConfig extends WebSecurityConfigurerAdapter {
4545
@Bean
4646
RelyingPartyRegistrationRepository getSaml2AuthenticationConfiguration() throws Exception {
4747
//remote IDP entity ID
48-
String idpEntityId = "https://simplesaml-for-spring-saml.cfapps.io/saml2/idp/metadata.php";
48+
String idpEntityId = "https://simplesaml-for-spring-saml.apps.pcfone.io/saml2/idp/metadata.php";
4949
//remote WebSSO Endpoint - Where to Send AuthNRequests to
50-
String webSsoEndpoint = "https://simplesaml-for-spring-saml.cfapps.io/saml2/idp/SSOService.php";
50+
String webSsoEndpoint = "https://simplesaml-for-spring-saml.apps.pcfone.io/saml2/idp/SSOService.php";
5151
//local registration ID
5252
String registrationId = "simplesamlphp";
5353
//local entity ID - autogenerated based on URL

0 commit comments

Comments
 (0)