From 368d47e38f6f5a02150b16b20b8969d001f28171 Mon Sep 17 00:00:00 2001
From: Ricardo Martin <rmartinc@redhat.com>
Date: Wed, 20 May 2026 05:50:38 +0000
Subject: [PATCH] Wildcards should not be allowed if authority cannot be parsed (#607) (#49130)
---
src/main/java/org/keycloak/protocol/cas/utils/RedirectUtils.java | 155 +++++++++++++++++++++++++++++++--------------------
1 files changed, 95 insertions(+), 60 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 de8fd84..d0d64ca 100644
--- a/src/main/java/org/keycloak/protocol/cas/utils/RedirectUtils.java
+++ b/src/main/java/org/keycloak/protocol/cas/utils/RedirectUtils.java
@@ -17,41 +17,36 @@
package org.keycloak.protocol.oidc.utils;
-import org.jboss.logging.Logger;
+import java.net.URI;
+import java.util.Arrays;
+import java.util.Collection;
+import java.util.Collections;
+import java.util.HashSet;
+import java.util.List;
+import java.util.Set;
+import java.util.TreeSet;
+import java.util.regex.Pattern;
+
+import org.keycloak.common.util.KeycloakUriBuilder;
import org.keycloak.common.util.UriUtils;
import org.keycloak.models.ClientModel;
import org.keycloak.models.Constants;
import org.keycloak.models.KeycloakSession;
import org.keycloak.models.KeycloakUriInfo;
import org.keycloak.models.RealmModel;
-import org.keycloak.protocol.oidc.OIDCLoginProtocol;
import org.keycloak.services.Urls;
import org.keycloak.services.util.ResolveRelative;
-import java.net.URI;
-import java.util.Collection;
-import java.util.Set;
-import java.util.TreeSet;
-import java.util.regex.Pattern;
-import java.util.stream.Collectors;
+import org.jboss.logging.Logger;
/**
* @author <a href="mailto:sthorger@redhat.com">Stian Thorgersen</a>
*/
public class RedirectUtils {
- private static final Logger logger = Logger.getLogger(RedirectUtils.class);
+ public static final Set<String> LOOPBACK_INTERFACES = new HashSet<>(Arrays.asList("localhost", "127.0.0.1", "[::1]"));
- /**
- * This method is deprecated for performance and security reasons and it is available just for the
- * backwards compatibility. It is recommended to use some other methods of this class where the client is given as an argument
- * to the method, so we know the client, which redirect-uri we are trying to resolve.
- */
- @Deprecated
- public static String verifyRealmRedirectUri(KeycloakSession session, String redirectUri) {
- Set<String> validRedirects = getValidateRedirectUris(session);
- return verifyRedirectUri(session, null, redirectUri, validRedirects, true);
- }
+ private static final Logger logger = Logger.getLogger(RedirectUtils.class);
public static String verifyRedirectUri(KeycloakSession session, String redirectUri, ClientModel client) {
return verifyRedirectUri(session, redirectUri, client, true);
@@ -77,16 +72,6 @@
return resolveValidRedirects;
}
- @Deprecated
- private static Set<String> getValidateRedirectUris(KeycloakSession session) {
- RealmModel realm = session.getContext().getRealm();
- return session.clients().getAllRedirectUrisOfEnabledClients(realm).entrySet().stream()
- .filter(me -> me.getKey().isEnabled() && OIDCLoginProtocol.LOGIN_PROTOCOL.equals(me.getKey().getProtocol()) && !me.getKey().isBearerOnly() && (me.getKey().isStandardFlowEnabled() || me.getKey().isImplicitFlowEnabled()))
- .map(me -> resolveValidRedirects(session, me.getKey().getRootUrl(), me.getValue()))
- .flatMap(Collection::stream)
- .collect(Collectors.toSet());
- }
-
public static String verifyRedirectUri(KeycloakSession session, String rootUrl, String redirectUri, Set<String> validRedirects, boolean requireRedirectUri) {
KeycloakUriInfo uriInfo = session.getContext().getUri();
RealmModel realm = session.getContext().getRealm();
@@ -118,20 +103,9 @@
String valid = matchesRedirects(resolveValidRedirects, r, allowWildcards);
- if (valid == null && (r.startsWith(Constants.INSTALLED_APP_URL) || r.startsWith(Constants.INSTALLED_APP_LOOPBACK)) && r.indexOf(':', Constants.INSTALLED_APP_URL.length()) >= 0) {
- int i = r.indexOf(':', Constants.INSTALLED_APP_URL.length());
-
- StringBuilder sb = new StringBuilder();
- sb.append(r.substring(0, i));
-
- i = r.indexOf('/', i);
- if (i >= 0) {
- sb.append(r.substring(i));
- }
-
- r = sb.toString();
-
- valid = matchesRedirects(resolveValidRedirects, r, allowWildcards);
+ if (valid == null && "http".equals(originalRedirect.getScheme()) && LOOPBACK_INTERFACES.contains(originalRedirect.getHost())) {
+ String redirectWithDefaultPort = KeycloakUriBuilder.fromUri(originalRedirect).port(80).buildAsString();
+ valid = matchesRedirects(resolveValidRedirects, redirectWithDefaultPort, allowWildcards);
}
if (valid != null && !originalRedirect.isAbsolute()) {
@@ -177,11 +151,12 @@
// any access to parent folder /../ is unsafe with or without encoding
private final static Pattern UNSAFE_PATH_PATTERN = Pattern.compile(
- "(/|%2[fF]|%5[cC]|\\\\)(%2[eE]|\\.){2}(/|%2[fF]|%5[cC]|\\\\)|(/|%2[fF]|%5[cC]|\\\\)(%2[eE]|\\.){2}$");
+ "(/|%2[fF]|%5[cC]|\\\\)(%2[eE]|\\.){2}(/|%2[fF]|%5[cC]|\\\\|;)|(/|%2[fF]|%5[cC]|\\\\)(%2[eE]|\\.){2}$");
private static boolean areWildcardsAllowed(URI redirectUri) {
- // wildcars are only allowed if no user-info and no unsafe pattern in path
+ // wildcars are only allowed if no user-info and no unparsed authority and no unsafe pattern in path
return redirectUri.getRawUserInfo() == null
+ && !(redirectUri.getRawAuthority() != null && redirectUri.getRawUserInfo() == null && redirectUri.getHost() == null && redirectUri.getPort() == -1)
&& (redirectUri.getRawPath() == null || !UNSAFE_PATH_PATTERN.matcher(redirectUri.getRawPath()).find());
}
@@ -206,22 +181,57 @@
if ("*".equals(validRedirect)) {
// the valid redirect * is a full wildcard for http(s) even if the redirect URI does not allow wildcards
return validRedirect;
- } else if (validRedirect.endsWith("*") && !validRedirect.contains("?") && allowWildcards) {
- // strip off the query or fragment components - we don't check them when wildcards are effective
- int idx = redirect.indexOf('?');
- if (idx == -1) {
- idx = redirect.indexOf('#');
+ } else {
+ String validRedirectWildcard = allowWildcards ? checkValidRedirectWildcard(validRedirect) : null;
+ if (validRedirectWildcard != null) {
+ // strip off the query or fragment components - we don't check them when wildcards are effective
+ int idx = redirect.indexOf('?');
+ if (idx == -1) {
+ idx = redirect.indexOf('#');
+ }
+ String r = idx == -1 ? redirect : redirect.substring(0, idx);
+ // strip off *
+ int length = validRedirectWildcard.length() - 1;
+ validRedirectWildcard = validRedirectWildcard.substring(0, length);
+ if (r.startsWith(validRedirectWildcard)) {
+ return validRedirectWildcard;
+ }
+ // strip off trailing '/'
+ if (length - 1 > 0 && validRedirectWildcard.charAt(length - 1) == '/') {
+ length--;
+ }
+ validRedirectWildcard = validRedirectWildcard.substring(0, length);
+ if (validRedirectWildcard.equals(r)) {
+ return validRedirectWildcard;
+ }
+ } else if (validRedirect.equals(redirect)) {
+ return validRedirect;
}
- String r = idx == -1 ? redirect : redirect.substring(0, idx);
- // strip off *
- int length = validRedirect.length() - 1;
- validRedirect = validRedirect.substring(0, length);
- if (r.startsWith(validRedirect)) return validRedirect;
- // strip off trailing '/'
- if (length - 1 > 0 && validRedirect.charAt(length - 1) == '/') length--;
- validRedirect = validRedirect.substring(0, length);
- if (validRedirect.equals(r)) return validRedirect;
- } else if (validRedirect.equals(redirect)) return validRedirect;
+ }
+ }
+ return null;
+ }
+
+ private static String checkValidRedirectWildcard(String validRedirect) {
+ if (!validRedirect.endsWith("*") || validRedirect.contains("?") || validRedirect.contains("#")) {
+ return null; // no wildcard as before
+ }
+ KeycloakUriBuilder uriBuilder = KeycloakUriBuilder.fromUri(validRedirect, false);
+ if (uriBuilder.getPath() != null) {
+ return validRedirect; // wildcard valid on path
+ }
+ if (uriBuilder.getAuthority() != null) {
+ if (uriBuilder.getAuthority().equals("*") || uriBuilder.getAuthority().endsWith(":*")) {
+ return validRedirect; // on authority just full wildcard or on port
+ } else {
+ // treat the wildcard after the authority
+ validRedirect = validRedirect.substring(0, validRedirect.length() - 1);
+ validRedirect = validRedirect + "/*";
+ return validRedirect;
+ }
+ }
+ if (uriBuilder.getSsp() != null) {
+ return validRedirect; // wildcard valid on SSP
}
return null;
}
@@ -242,4 +252,29 @@
}
return redirectUri;
}
+
+ public static Set<String> resolveUrlsWithRedirects(KeycloakSession session, List<String> origUrls,
+ String rootUrl, List<String> redirectUris, boolean returnAsOrigins) {
+
+ Set<String> refactoredUrls = (origUrls != null) ? new HashSet<>(origUrls) : new HashSet<>();
+ if (refactoredUrls.contains(Constants.INCLUDE_REDIRECTS)) {
+ refactoredUrls.remove(Constants.INCLUDE_REDIRECTS);
+
+ Set<String> redirectsToProcess = (redirectUris != null) ? new HashSet<>(redirectUris) : Collections.emptySet();
+ for (String redirectUri : resolveValidRedirects(session, rootUrl, redirectsToProcess)) {
+ if (isValidScheme(redirectUri)) {
+ if (returnAsOrigins) {
+ refactoredUrls.add(UriUtils.getOrigin(redirectUri));
+ } else {
+ refactoredUrls.add(redirectUri);
+ }
+ }
+ }
+ }
+ return refactoredUrls;
+ }
+
+ private static boolean isValidScheme(String url) {
+ return url != null && (url.startsWith("http://") || url.startsWith("https://"));
+ }
}
--
Gitblit v1.10.0