Skip to content

Fix SAML RelayState allowlist validation #4014

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
joemahady-comm wants to merge 1 commit into
base: develop
Choose a base branch
from
+29 −4
Open

Fix SAML RelayState allowlist validation #4014

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
7 changes: 6 additions & 1 deletion ...a/org/cloudfoundry/identity/uaa/web/UaaSavedRequestAwareAuthenticationSuccessHandler.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -47,7 +47,12 @@ public void onAuthenticationSuccess(HttpServletRequest request, HttpServletRespo
String relayState = UaaStringUtils.getCleanedUserControlString(request.getParameter(Saml2ParameterNames.RELAY_STATE), UaaStringUtils.EMPTY_STRING);
if (UaaStringUtils.hasText(relayState) && UaaUrlUtils.isUrl(relayState)) {
log.debug("Redirecting to relayState URI: {}", relayState);
this.getRedirectStrategy().sendRedirect(request, response, relayState);
java.util.List<String> samlRelayStateWhitelist = java.util.Optional.ofNullable(
org.cloudfoundry.identity.uaa.zone.IdentityZoneHolder.get().getConfig().getLinks().getLogout().getWhitelist()
).orElse(java.util.Collections.emptyList());
String fallbackUrl = this.getDefaultTargetUrl();
String matchingRedirectUri = UaaUrlUtils.findMatchingRedirectUri(samlRelayStateWhitelist, relayState, fallbackUrl);
this.getRedirectStrategy().sendRedirect(request, response, matchingRedirectUri);
Comment on lines +50 to +55
Comment on lines 47 to +55
} else {
super.onAuthenticationSuccess(request, response, authentication);
}
Expand Down
22 changes: 21 additions & 1 deletion .../cloudfoundry/identity/uaa/web/UaaSavedRequestAwareAuthenticationSuccessHandlerTests.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -76,15 +76,35 @@ void invalidFormRedirectIsNotReturned() {
}

@Test
void onAuthenticationSuccess_noSavedRequest_hasRelayStateUrl() throws Exception {
void onAuthenticationSuccess_noSavedRequest_hasRelayStateUrl_notWhitelisted() throws Exception {
String redirectUri = "https://test.com/test2";
request.setParameter(Saml2ParameterNames.RELAY_STATE, redirectUri);

var response = new MockHttpServletResponse();
var authentication = mock(Authentication.class);
handler.onAuthenticationSuccess(request, response, authentication);

assertThat(response.getRedirectedUrl()).isEqualTo("/");
}

@Test
void onAuthenticationSuccess_noSavedRequest_hasRelayStateUrl_whitelisted() throws Exception {
String redirectUri = "https://test.com/test2";
request.setParameter(Saml2ParameterNames.RELAY_STATE, redirectUri);

org.cloudfoundry.identity.uaa.zone.IdentityZone zone = org.cloudfoundry.identity.uaa.zone.IdentityZoneHolder.get();
zone.getConfig().getLinks().getLogout().setWhitelist(java.util.List.of("https://test.com/test2"));
org.cloudfoundry.identity.uaa.zone.IdentityZoneHolder.set(zone);

var response = new MockHttpServletResponse();
var authentication = mock(Authentication.class);
handler.onAuthenticationSuccess(request, response, authentication);

assertThat(response.getRedirectedUrl()).isEqualTo(redirectUri);

// clean up
zone.getConfig().getLinks().getLogout().setWhitelist(null);
org.cloudfoundry.identity.uaa.zone.IdentityZoneHolder.clear();
}
Comment on lines +90 to 108

@Test
Expand Down
4 changes: 2 additions & 2 deletions uaa/src/test/java/org/cloudfoundry/identity/uaa/integration/feature/SamlLoginIT.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -779,7 +779,7 @@ void relayStateRedirectFromIdpInitiatedLogin() {
webDriver.findElement(By.xpath(samlServerConfig.getLoginPromptXpathExpr()));
sendCredentials(testAccounts.getUserName(), testAccounts.getPassword());
Page.assertThatUrlEventuallySatisfies(webDriver,
assertUrl -> assertUrl.startsWith("https://www.google.com"));
assertUrl -> assertUrl.startsWith(baseUrl));

webDriver.get("%s/logout.do".formatted(baseUrl));
}
Expand Down Expand Up @@ -1228,7 +1228,7 @@ void backportFrom77RelayTest() {
sendCredentials(testAccounts.getUserName(), "koala");

Page.assertThatUrlEventuallySatisfies(webDriver,
assertUrl -> assertUrl.startsWith("https://www.google.com"));
assertUrl -> assertUrl.startsWith(zoneUrl));
webDriver.get(baseUrl + "/logout.do");
webDriver.get(zoneUrl + "/logout.do");
}
Expand Down
Loading