From 994c30eed65b9df187a621141adf5361de46a7a3 Mon Sep 17 00:00:00 2001
From: Ricardo Martin <rmartinc@redhat.com>
Date: Tue, 19 Dec 2023 13:13:36 +0000
Subject: [PATCH] Strip off user-info from redirect URI when validating using wildcard (#61) Closes keycloak/keycloak-private#58 Closes https://issues.redhat.com/browse/RHBK-679
---
src/main/java/org/keycloak/protocol/cas/utils/RedirectUtils.java | 15 +++++++++++++--
1 files changed, 13 insertions(+), 2 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 81669f5..3b95404 100644
--- a/src/main/java/org/keycloak/protocol/cas/utils/RedirectUtils.java
+++ b/src/main/java/org/keycloak/protocol/cas/utils/RedirectUtils.java
@@ -248,13 +248,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);
--
Gitblit v1.10.0