Skip to content

Commit 6df5dc4

Browse files
committed
Migrate SAML 2.0 Samples to PCFOne
Closes gh-9362
1 parent 32acb04 commit 6df5dc4

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/samples/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
@@ -134,7 +134,7 @@ public void authenticateRequestWhenRelayStateThenRespondsWithRedirectAndEncodedR
134134
.param("RelayState", "relay state value with spaces")
135135
)
136136
.andExpect(status().is3xxRedirection())
137-
.andExpect(header().string("Location", startsWith("https://simplesaml-for-spring-saml.cfapps.io/saml2/idp/SSOService.php?SAMLRequest=")))
137+
.andExpect(header().string("Location", startsWith("https://simplesaml-for-spring-saml.apps.pcfone.io/saml2/idp/SSOService.php?SAMLRequest=")))
138138
.andExpect(header().string("Location", containsString("RelayState=relay%20state%20value%20with%20spaces")));
139139
}
140140

@@ -155,7 +155,7 @@ public void authenticateRequestWhenWorkingThenDestinationAttributeIsSet() throws
155155
String destination = authnRequest.getDestination();
156156
assertEquals(
157157
"Destination must match",
158-
"https://simplesaml-for-spring-saml.cfapps.io/saml2/idp/SSOService.php",
158+
"https://simplesaml-for-spring-saml.apps.pcfone.io/saml2/idp/SSOService.php",
159159
destination
160160
);
161161
String acsURL = authnRequest.getAssertionConsumerServiceURL();
@@ -317,14 +317,14 @@ private Response buildResponse() {
317317
Response response = OpenSamlActionTestingSupport.buildResponse();
318318
response.setID("_" + UUID.randomUUID().toString());
319319
response.setDestination("http://localhost:8080/login/saml2/sso/simplesamlphp");
320-
response.setIssuer(buildIssuer("https://simplesaml-for-spring-saml.cfapps.io/saml2/idp/metadata.php"));
320+
response.setIssuer(buildIssuer("https://simplesaml-for-spring-saml.apps.pcfone.io/saml2/idp/metadata.php"));
321321
return response;
322322
}
323323

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

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

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -12,5 +12,5 @@ spring:
1212
verification:
1313
credentials:
1414
- certificate-location: "classpath:credentials/idp-certificate.crt"
15-
entity-id: https://simplesaml-for-spring-saml.cfapps.io/saml2/idp/metadata.php
16-
sso-url: https://simplesaml-for-spring-saml.cfapps.io/saml2/idp/SSOService.php
15+
entity-id: https://simplesaml-for-spring-saml.apps.pcfone.io/saml2/idp/metadata.php
16+
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)