From 226dd13eeed0242b88958ce7ea107831152c68de Mon Sep 17 00:00:00 2001
From: Stian Thorgersen <stianst@gmail.com>
Date: Wed, 14 Dec 2022 06:46:17 +0000
Subject: [PATCH] fixes from release/20 (#15982)
---
src/main/java/org/keycloak/protocol/cas/utils/RedirectUtils.java | 39 +++++++++++++++++++++++++++++++++++++++
1 files changed, 39 insertions(+), 0 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 01d6cc4..9cb314b 100644
--- a/src/main/java/org/keycloak/protocol/cas/utils/RedirectUtils.java
+++ b/src/main/java/org/keycloak/protocol/cas/utils/RedirectUtils.java
@@ -18,6 +18,8 @@
package org.keycloak.protocol.oidc.utils;
import org.jboss.logging.Logger;
+import org.keycloak.common.util.Encode;
+import org.keycloak.common.util.KeycloakUriBuilder;
import org.keycloak.common.util.UriUtils;
import org.keycloak.models.ClientModel;
import org.keycloak.models.Constants;
@@ -91,6 +93,7 @@
KeycloakUriInfo uriInfo = session.getContext().getUri();
RealmModel realm = session.getContext().getRealm();
+ redirectUri = decodeRedirectUri(redirectUri);
if (redirectUri != null) {
try {
URI uri = URI.create(redirectUri);
@@ -152,6 +155,42 @@
}
}
+ // Decode redirectUri. We don't decode query and fragment as those can be encoded in the original URL.
+ // 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);
+ String origQuery = uriBuilder.getQuery();
+ String origFragment = uriBuilder.getFragment();
+ String encodedRedirectUri = uriBuilder
+ .replaceQuery(null)
+ .fragment(null)
+ .buildAsString();
+ String decodedRedirectUri = null;
+
+ 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)
+ .replaceQuery(origQuery)
+ .fragment(origFragment)
+ .buildAsString();
+ } else {
+ // Next attempt
+ encodedRedirectUri = decodedRedirectUri;
+ }
+ }
+ } catch (IllegalArgumentException iae) {
+ logger.debugf("Illegal redirect URI used: %s, Details: %s", redirectUri, iae.getMessage());
+ }
+ logger.debugf("Was not able to decode redirect URI: %s", redirectUri);
+ return null;
+ }
+
private static String lowerCaseHostname(String redirectUri) {
int n = redirectUri.indexOf('/', 7);
if (n == -1) {
--
Gitblit v1.10.0