From b9d66b05ba1b10148a36e08d52853012f54526d9 Mon Sep 17 00:00:00 2001
From: github-actions <41898282+github-actions[bot]@users.noreply.github.com>
Date: Sat, 23 Apr 2022 08:49:54 +0000
Subject: [PATCH] Update to Keycloak 18.0.0
---
src/main/java/org/keycloak/protocol/cas/endpoints/LogoutEndpoint.java | 35 ++++++++++++++++++++++++++++-------
1 files changed, 28 insertions(+), 7 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 b5e011c..ce2ac6b 100644
--- a/src/main/java/org/keycloak/protocol/cas/endpoints/LogoutEndpoint.java
+++ b/src/main/java/org/keycloak/protocol/cas/endpoints/LogoutEndpoint.java
@@ -5,17 +5,21 @@
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.QueryParam;
import javax.ws.rs.core.Context;
import javax.ws.rs.core.HttpHeaders;
import javax.ws.rs.core.Response;
-import javax.ws.rs.core.UriInfo;
public class LogoutEndpoint {
private static final Logger logger = Logger.getLogger(LogoutEndpoint.class);
@@ -32,11 +36,10 @@
@Context
private HttpHeaders headers;
- @Context
- private UriInfo uriInfo;
-
private RealmModel realm;
private EventBuilder event;
+ private ClientModel client;
+ private String redirectUri;
public LogoutEndpoint(RealmModel realm, EventBuilder event) {
this.realm = realm;
@@ -45,18 +48,36 @@
@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(), clientConnection, headers, null);
logger.debug("finishing CAS browser logout");
return response;
}
- return Response.ok().build();
+ return ErrorPage.error(session, null, Response.Status.BAD_REQUEST, Messages.FAILED_LOGOUT);
+ }
+
+ private void checkClient(String service) {
+ if (service == null) {
+ return;
+ }
+
+ client = realm.getClients().stream()
+ .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