From 4e3effb47cfd3c2b07a98df57e773cf3a991fd8d Mon Sep 17 00:00:00 2001
From: github-actions <41898282+github-actions[bot]@users.noreply.github.com>
Date: Tue, 09 Jan 2024 08:47:05 +0000
Subject: [PATCH] Update to Keycloak 23.0.4
---
src/main/java/org/keycloak/protocol/cas/endpoints/LogoutEndpoint.java | 70 +++++++++++++++++++++--------------
1 files changed, 42 insertions(+), 28 deletions(-)
diff --git a/src/main/java/org/keycloak/protocol/cas/endpoints/LogoutEndpoint.java b/src/main/java/org/keycloak/protocol/cas/endpoints/LogoutEndpoint.java
index c40da69..48a7934 100644
--- a/src/main/java/org/keycloak/protocol/cas/endpoints/LogoutEndpoint.java
+++ b/src/main/java/org/keycloak/protocol/cas/endpoints/LogoutEndpoint.java
@@ -1,62 +1,76 @@
package org.keycloak.protocol.cas.endpoints;
+import jakarta.ws.rs.GET;
+import jakarta.ws.rs.QueryParam;
+import jakarta.ws.rs.core.Response;
import org.jboss.logging.Logger;
import org.jboss.resteasy.annotations.cache.NoCache;
-import org.jboss.resteasy.spi.HttpRequest;
-import org.keycloak.common.ClientConnection;
-import org.keycloak.events.EventBuilder;
+import org.keycloak.models.ClientModel;
import org.keycloak.models.KeycloakSession;
import org.keycloak.models.RealmModel;
import org.keycloak.models.UserSessionModel;
import org.keycloak.protocol.cas.CASLoginProtocol;
+import org.keycloak.protocol.oidc.utils.RedirectUtils;
+import org.keycloak.services.ErrorPage;
import org.keycloak.services.managers.AuthenticationManager;
+import org.keycloak.services.messages.Messages;
-import javax.ws.rs.GET;
-import javax.ws.rs.core.Context;
-import javax.ws.rs.core.HttpHeaders;
-import javax.ws.rs.core.Response;
-import javax.ws.rs.core.UriInfo;
+import java.net.URI;
public class LogoutEndpoint {
- private static final Logger logger = Logger.getLogger(org.keycloak.protocol.oidc.endpoints.LogoutEndpoint.class);
+ private static final Logger logger = Logger.getLogger(LogoutEndpoint.class);
- @Context
private KeycloakSession session;
- @Context
- private ClientConnection clientConnection;
-
- @Context
- private HttpRequest request;
-
- @Context
- private HttpHeaders headers;
-
- @Context
- private UriInfo uriInfo;
-
private RealmModel realm;
- private EventBuilder event;
+ private String redirectUri;
- public LogoutEndpoint(RealmModel realm, EventBuilder event) {
+ public LogoutEndpoint(KeycloakSession session, RealmModel realm) {
+ this.session = session;
this.realm = realm;
- this.event = event;
}
@GET
@NoCache
- public Response logout() {
+ public Response logout(@QueryParam(CASLoginProtocol.SERVICE_PARAM) String service) {
+ checkClient(service);
AuthenticationManager.AuthResult authResult = AuthenticationManager.authenticateIdentityCookie(session, realm, false);
if (authResult != null) {
UserSessionModel userSession = authResult.getSession();
userSession.setNote(AuthenticationManager.KEYCLOAK_LOGOUT_PROTOCOL, CASLoginProtocol.LOGIN_PROTOCOL);
+ if (redirectUri != null) {
+ userSession.setNote(CASLoginProtocol.LOGOUT_REDIRECT_URI, redirectUri);
+ }
+
logger.debug("Initiating CAS browser logout");
- Response response = AuthenticationManager.browserLogout(session, realm, authResult.getSession(), uriInfo, clientConnection, headers);
+ Response response = AuthenticationManager.browserLogout(session, realm, authResult.getSession(), session.getContext().getUri(), session.getContext().getConnection(), session.getContext().getRequestHeaders());
logger.debug("finishing CAS browser logout");
return response;
}
- return Response.ok().build();
+
+ if (redirectUri != null) {
+ logger.debugv("no active session, redirecting to {0}", redirectUri);
+ return Response.status(302).location(URI.create(redirectUri)).build();
+ }
+
+ return ErrorPage.error(session, null, Response.Status.BAD_REQUEST, Messages.FAILED_LOGOUT);
+ }
+
+ private void checkClient(String service) {
+ if (service == null) {
+ return;
+ }
+
+ ClientModel client = realm.getClientsStream()
+ .filter(c -> CASLoginProtocol.LOGIN_PROTOCOL.equals(c.getProtocol()))
+ .filter(c -> RedirectUtils.verifyRedirectUri(session, service, c) != null)
+ .findFirst().orElse(null);
+ if (client != null) {
+ redirectUri = RedirectUtils.verifyRedirectUri(session, service, client);
+
+ session.getContext().setClient(client);
+ }
}
}
--
Gitblit v1.9.1