From 1cf376b3768c36548320e52b0d08391d75833af0 Mon Sep 17 00:00:00 2001
From: Matthias Piepkorn <mpiepk@gmail.com>
Date: Tue, 14 Nov 2017 19:53:17 +0000
Subject: [PATCH] prepare next development version

---
 src/main/java/org/keycloak/protocol/cas/endpoints/LogoutEndpoint.java |   29 +++++++++++++++++++++++++++--
 1 files changed, 27 insertions(+), 2 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..b29588f 100644
--- a/src/main/java/org/keycloak/protocol/cas/endpoints/LogoutEndpoint.java
+++ b/src/main/java/org/keycloak/protocol/cas/endpoints/LogoutEndpoint.java
@@ -5,13 +5,18 @@
 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;
@@ -37,6 +42,8 @@
 
     private RealmModel realm;
     private EventBuilder event;
+    private ClientModel client;
+    private String redirectUri;
 
     public LogoutEndpoint(RealmModel realm, EventBuilder event) {
         this.realm = realm;
@@ -45,18 +52,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);
             logger.debug("finishing CAS browser logout");
             return response;
         }
-        return Response.ok().build();
+        return ErrorPage.error(session, 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(uriInfo, service, realm, c) != null)
+                .findFirst().orElse(null);
+        if (client != null) {
+            redirectUri = RedirectUtils.verifyRedirectUri(uriInfo, service, realm, client);
+
+            session.getContext().setClient(client);
+        }
     }
 }

--
Gitblit v1.9.1