From 00a8d9d591225dbd239bb4d88ace787109c8c10e Mon Sep 17 00:00:00 2001
From: github-actions <41898282+github-actions[bot]@users.noreply.github.com>
Date: Fri, 15 Dec 2023 08:47:04 +0000
Subject: [PATCH] Update to Keycloak 23.0.2
---
src/main/java/org/keycloak/protocol/cas/endpoints/AuthorizationEndpoint.java | 33 ++++++++++++++++++++++++---------
1 files changed, 24 insertions(+), 9 deletions(-)
diff --git a/src/main/java/org/keycloak/protocol/cas/endpoints/AuthorizationEndpoint.java b/src/main/java/org/keycloak/protocol/cas/endpoints/AuthorizationEndpoint.java
index 2981732..1dc2eef 100644
--- a/src/main/java/org/keycloak/protocol/cas/endpoints/AuthorizationEndpoint.java
+++ b/src/main/java/org/keycloak/protocol/cas/endpoints/AuthorizationEndpoint.java
@@ -1,12 +1,15 @@
package org.keycloak.protocol.cas.endpoints;
+import jakarta.ws.rs.GET;
+import jakarta.ws.rs.core.MultivaluedMap;
+import jakarta.ws.rs.core.Response;
import org.jboss.logging.Logger;
import org.keycloak.events.Details;
import org.keycloak.events.Errors;
import org.keycloak.events.EventBuilder;
import org.keycloak.events.EventType;
import org.keycloak.models.ClientModel;
-import org.keycloak.models.RealmModel;
+import org.keycloak.models.KeycloakSession;
import org.keycloak.protocol.AuthorizationEndpointBase;
import org.keycloak.protocol.cas.CASLoginProtocol;
import org.keycloak.protocol.oidc.utils.RedirectUtils;
@@ -15,10 +18,6 @@
import org.keycloak.services.util.CacheControlUtil;
import org.keycloak.sessions.AuthenticationSessionModel;
-import javax.ws.rs.GET;
-import javax.ws.rs.core.MultivaluedMap;
-import javax.ws.rs.core.Response;
-
public class AuthorizationEndpoint extends AuthorizationEndpointBase {
private static final Logger logger = Logger.getLogger(AuthorizationEndpoint.class);
@@ -26,8 +25,8 @@
private AuthenticationSessionModel authenticationSession;
private String redirectUri;
- public AuthorizationEndpoint(RealmModel realm, EventBuilder event) {
- super(realm, event);
+ public AuthorizationEndpoint(KeycloakSession session, EventBuilder event) {
+ super(session, event);
event.event(EventType.LOGIN);
}
@@ -35,6 +34,13 @@
public Response build() {
MultivaluedMap<String, String> params = session.getContext().getUri().getQueryParameters();
String service = params.getFirst(CASLoginProtocol.SERVICE_PARAM);
+
+ boolean isSaml11Request = false;
+ if (service == null && params.containsKey(CASLoginProtocol.TARGET_PARAM)) {
+ // SAML 1.1 authorization uses the TARGET parameter instead of service
+ service = params.getFirst(CASLoginProtocol.TARGET_PARAM);
+ isSaml11Request = true;
+ }
boolean renew = params.containsKey(CASLoginProtocol.RENEW_PARAM);
boolean gateway = params.containsKey(CASLoginProtocol.GATEWAY_PARAM);
@@ -46,10 +52,17 @@
updateAuthenticationSession();
// So back button doesn't work
- CacheControlUtil.noBackButtonCacheControlHeader();
+ CacheControlUtil.noBackButtonCacheControlHeader(session);
if (renew) {
authenticationSession.setClientNote(CASLoginProtocol.RENEW_PARAM, "true");
+ }
+ if (gateway) {
+ authenticationSession.setClientNote(CASLoginProtocol.GATEWAY_PARAM, "true");
+ }
+ if (isSaml11Request) {
+ // Flag the session so we can return the ticket as "SAMLart" in the response
+ authenticationSession.setClientNote(CASLoginProtocol.TARGET_PARAM, "true");
}
this.event.event(EventType.LOGIN);
@@ -62,7 +75,9 @@
throw new ErrorPageException(session, Response.Status.BAD_REQUEST, Messages.MISSING_PARAMETER, CASLoginProtocol.SERVICE_PARAM);
}
- client = realm.getClients().stream()
+ event.detail(Details.REDIRECT_URI, service);
+
+ client = realm.getClientsStream()
.filter(c -> CASLoginProtocol.LOGIN_PROTOCOL.equals(c.getProtocol()))
.filter(c -> RedirectUtils.verifyRedirectUri(session, service, c) != null)
.findFirst().orElse(null);
--
Gitblit v1.9.1