From d44fdd6cff6cddb609a468c352018fa89d0b4084 Mon Sep 17 00:00:00 2001
From: github-actions <41898282+github-actions[bot]@users.noreply.github.com>
Date: Sun, 23 Aug 2026 21:12:37 +0000
Subject: [PATCH] Update to Keycloak 26.7.2
---
src/main/java/org/keycloak/protocol/cas/utils/RedirectUtils.java | 48 +++++-------------------------------------------
1 files changed, 5 insertions(+), 43 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 d367deb..ee6739c 100644
--- a/src/main/java/org/keycloak/protocol/cas/utils/RedirectUtils.java
+++ b/src/main/java/org/keycloak/protocol/cas/utils/RedirectUtils.java
@@ -15,20 +15,17 @@
* limitations under the License.
*/
-package org.keycloak.protocol.oidc.utils;
+package org.keycloak.protocol.cas.utils;
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.Locale;
import java.util.Set;
import java.util.TreeSet;
import java.util.regex.Pattern;
-import org.keycloak.OAuth2Constants;
import org.keycloak.common.util.KeycloakUriBuilder;
import org.keycloak.common.util.MultivaluedHashMap;
import org.keycloak.common.util.UriUtils;
@@ -37,6 +34,7 @@
import org.keycloak.models.KeycloakSession;
import org.keycloak.models.KeycloakUriInfo;
import org.keycloak.models.RealmModel;
+import org.keycloak.protocol.cas.CASLoginProtocol;
import org.keycloak.services.Urls;
import org.keycloak.services.util.ResolveRelative;
@@ -50,20 +48,9 @@
public static final Set<String> LOOPBACK_INTERFACES = new HashSet<>(Arrays.asList("localhost", "127.0.0.1", "[::1]"));
private static final Set<String> FORBIDDEN_OIDC_PARAMS = Set.of(
- OAuth2Constants.CODE,
- OAuth2Constants.ID_TOKEN,
- OAuth2Constants.ACCESS_TOKEN,
- OAuth2Constants.TOKEN_TYPE,
- OAuth2Constants.EXPIRES_IN,
- OAuth2Constants.STATE,
- OAuth2Constants.ISSUER,
- OAuth2Constants.ERROR,
- OAuth2Constants.ERROR_DESCRIPTION,
- OAuth2Constants.SESSION_STATE,
- OAuth2Constants.RESPONSE,
- Constants.KC_ACTION,
- Constants.KC_ACTION_STATUS
- );
+ CASLoginProtocol.SAMLART_RESPONSE_PARAM.toLowerCase(Locale.ROOT),
+ CASLoginProtocol.TICKET_RESPONSE_PARAM.toLowerCase(Locale.ROOT)
+ );
private static final Logger logger = Logger.getLogger(RedirectUtils.class);
@@ -297,29 +284,4 @@
}
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