From 758ec09cc170c769c8fcc7960aa65671ea159add Mon Sep 17 00:00:00 2001
From: Marek Posolda <mposolda@gmail.com>
Date: Fri, 16 Feb 2024 17:13:27 +0000
Subject: [PATCH] Remove random redirect after password reset (#27076)
---
src/main/java/org/keycloak/protocol/cas/utils/RedirectUtils.java | 84 +++++++++++++++++++----------------------
1 files changed, 39 insertions(+), 45 deletions(-)
diff --git a/src/main/java/org/keycloak/protocol/cas/utils/RedirectUtils.java b/src/main/java/org/keycloak/protocol/cas/utils/RedirectUtils.java
index 447685e..e171d8d 100644
--- a/src/main/java/org/keycloak/protocol/cas/utils/RedirectUtils.java
+++ b/src/main/java/org/keycloak/protocol/cas/utils/RedirectUtils.java
@@ -72,10 +72,8 @@
if (validRedirect.startsWith("/")) {
validRedirect = relativeToAbsoluteURI(session, rootUrl, validRedirect);
logger.debugv("replacing relative valid redirect with: {0}", validRedirect);
- resolveValidRedirects.add(validRedirect);
- } else {
- resolveValidRedirects.add(validRedirect);
}
+ resolveValidRedirects.add(validRedirect);
}
return resolveValidRedirects;
}
@@ -107,6 +105,12 @@
logger.debug("No Redirect URIs supplied");
redirectUri = null;
} else {
+ URI originalRedirect = toUri(redirectUri);
+ if (originalRedirect == null) {
+ // invalid URI passed as redirectUri
+ return null;
+ }
+
// Make the validations against fully decoded and normalized redirect-url. This also allows wildcards (case when client configured "Valid redirect-urls" contain wildcards)
String decodedRedirectUri = decodeRedirectUri(redirectUri);
URI decodedRedirect = toUri(decodedRedirectUri);
@@ -135,15 +139,18 @@
}
// Return the original redirectUri, which can be partially encoded - for example http://localhost:8280/foo/bar%20bar%2092%2F72/3 . Just make sure it is normalized
- URI redirect = toUri(redirectUri);
- redirectUri = getNormalizedRedirectUri(redirect);
+ redirectUri = getNormalizedRedirectUri(originalRedirect);
// We try to check validity also for original (encoded) redirectUrl, but just in case it exactly matches some "Valid Redirect URL" specified for client (not wildcards allowed)
if (valid == null) {
valid = matchesRedirects(resolveValidRedirects, redirectUri, false);
}
- if (valid != null && redirectUri.startsWith("/")) {
+ if (valid != null && !originalRedirect.isAbsolute()) {
+ // return absolute if the original URI is relative
+ if (!redirectUri.startsWith("/")) {
+ redirectUri = "/" + redirectUri;
+ }
redirectUri = relativeToAbsoluteURI(session, rootUrl, redirectUri);
}
@@ -169,7 +176,7 @@
private static URI toUri(String redirectUri) {
URI uri = null;
if (redirectUri != null) {
- try {
+ try {
uri = URI.create(redirectUri);
} catch (IllegalArgumentException cause) {
logger.debug("Invalid redirect uri", cause);
@@ -184,38 +191,32 @@
String redirectUri = null;
if (uri != null) {
redirectUri = uri.normalize().toString();
- redirectUri = lowerCaseHostname(redirectUri);
}
return redirectUri;
}
- // Decode redirectUri. We don't decode query and fragment as those can be encoded in the original URL.
+ // Decode redirectUri. Only path is decoded as other elements can be encoded in the original URL or cannot be encoded at all.
// URL can be decoded multiple times (in case it was encoded multiple times, or some of it's parts were encoded multiple times)
private static String decodeRedirectUri(String redirectUri) {
if (redirectUri == null) return null;
int MAX_DECODING_COUNT = 5; // Max count of attempts for decoding URL (in case it was encoded multiple times)
try {
- KeycloakUriBuilder uriBuilder = KeycloakUriBuilder.fromUri(redirectUri).preserveDefaultPort();
- String origQuery = uriBuilder.getQuery();
- String origFragment = uriBuilder.getFragment();
- String encodedRedirectUri = uriBuilder
- .replaceQuery(null)
- .fragment(null)
- .buildAsString();
- String decodedRedirectUri = null;
+ KeycloakUriBuilder uriBuilder = KeycloakUriBuilder.fromUri(redirectUri, false).preserveDefaultPort();
+ if (uriBuilder.getPath() == null) {
+ return redirectUri;
+ }
+ String encodedPath = uriBuilder.getPath();
+ String decodedPath;
for (int i = 0; i < MAX_DECODING_COUNT; i++) {
- decodedRedirectUri = Encode.decode(encodedRedirectUri);
- if (decodedRedirectUri.equals(encodedRedirectUri)) {
- // URL is decoded. We can return it (after attach original query and fragment)
- return KeycloakUriBuilder.fromUri(decodedRedirectUri).preserveDefaultPort()
- .replaceQuery(origQuery)
- .fragment(origFragment)
- .buildAsString();
+ decodedPath = Encode.decode(encodedPath);
+ if (decodedPath.equals(encodedPath)) {
+ // URL path is decoded. We can return it in the original redirect URI
+ return uriBuilder.replacePath(decodedPath, false).buildAsString();
} else {
// Next attempt
- encodedRedirectUri = decodedRedirectUri;
+ encodedPath = decodedPath;
}
}
} catch (IllegalArgumentException iae) {
@@ -225,15 +226,6 @@
return null;
}
- private static String lowerCaseHostname(String redirectUri) {
- int n = redirectUri.indexOf('/', 7);
- if (n == -1) {
- return redirectUri.toLowerCase();
- } else {
- return redirectUri.substring(0, n).toLowerCase() + redirectUri.substring(n);
- }
- }
-
private static String relativeToAbsoluteURI(KeycloakSession session, String rootUrl, String relative) {
if (rootUrl != null) {
rootUrl = ResolveRelative.resolveRootUrl(session, rootUrl);
@@ -248,13 +240,24 @@
return sb.toString();
}
+ // removes the queryString, fragment and userInfo from the redirect
+ // to avoid comparing this when wildcards are used
+ private static String stripOffRedirectForWildcard(String redirect) {
+ return KeycloakUriBuilder.fromUri(redirect, false)
+ .preserveDefaultPort()
+ .userInfo(null)
+ .replaceQuery(null)
+ .fragment(null)
+ .buildAsString();
+ }
+
// return the String that matched the redirect or null if not matched
private static String matchesRedirects(Set<String> validRedirects, String redirect, boolean allowWildcards) {
logger.tracef("matchesRedirects: redirect URL to check: %s, allow wildcards: %b, Configured valid redirect URLs: %s", redirect, allowWildcards, validRedirects);
for (String validRedirect : validRedirects) {
if (validRedirect.endsWith("*") && !validRedirect.contains("?") && allowWildcards) {
- // strip off the query component - we don't check them when wildcards are effective
- String r = redirect.contains("?") ? redirect.substring(0, redirect.indexOf("?")) : redirect;
+ // strip off the userInfo, query or fragment components - we don't check them when wildcards are effective
+ String r = stripOffRedirectForWildcard(redirect);
// strip off *
int length = validRedirect.length() - 1;
validRedirect = validRedirect.substring(0, length);
@@ -284,13 +287,4 @@
}
return redirectUri;
}
-
- private static String getFirstValidRedirectUri(Collection<String> validRedirects) {
- final String redirectUri = validRedirects.stream().findFirst().orElse(null);
- return (redirectUri != null) ? validateRedirectUriWildcard(redirectUri) : null;
- }
-
- public static String getFirstValidRedirectUri(KeycloakSession session, String rootUrl, Set<String> validRedirects) {
- return getFirstValidRedirectUri(resolveValidRedirects(session, rootUrl, validRedirects));
- }
}
--
Gitblit v1.10.0