From 5ba0b037031c3b1afc89a419d432c5f1d8748aa2 Mon Sep 17 00:00:00 2001 From: Matthias Piepkorn <mpiepk@gmail.com> Date: Sun, 05 Feb 2017 11:18:26 +0000 Subject: [PATCH] Add test for ContentTypeHelper, fix format parameter handling --- src/main/java/org/keycloak/protocol/cas/CASLoginProtocol.java | 23 +++++++++++++++++++++++ 1 files changed, 23 insertions(+), 0 deletions(-) diff --git a/src/main/java/org/keycloak/protocol/cas/CASLoginProtocol.java b/src/main/java/org/keycloak/protocol/cas/CASLoginProtocol.java index 17e435e..8198a35 100644 --- a/src/main/java/org/keycloak/protocol/cas/CASLoginProtocol.java +++ b/src/main/java/org/keycloak/protocol/cas/CASLoginProtocol.java @@ -1,19 +1,25 @@ package org.keycloak.protocol.cas; +import org.apache.http.HttpEntity; +import org.jboss.logging.Logger; import org.keycloak.common.util.KeycloakUriBuilder; import org.keycloak.events.EventBuilder; import org.keycloak.events.EventType; import org.keycloak.models.*; import org.keycloak.protocol.LoginProtocol; +import org.keycloak.protocol.cas.utils.LogoutHelper; import org.keycloak.services.managers.ClientSessionCode; import org.keycloak.services.managers.ResourceAdminManager; import javax.ws.rs.core.HttpHeaders; import javax.ws.rs.core.Response; import javax.ws.rs.core.UriInfo; +import java.io.IOException; import java.net.URI; public class CASLoginProtocol implements LoginProtocol { + private static final Logger logger = Logger.getLogger(CASLoginProtocol.class); + public static final String LOGIN_PROTOCOL = "cas"; public static final String SERVICE_PARAM = "service"; @@ -25,6 +31,7 @@ public static final String TICKET_RESPONSE_PARAM = "ticket"; public static final String SERVICE_TICKET_PREFIX = "ST-"; + public static final String SESSION_SERVICE_TICKET = "service_ticket"; protected KeycloakSession session; protected RealmModel realm; @@ -96,10 +103,26 @@ @Override public void backchannelLogout(UserSessionModel userSession, ClientSessionModel clientSession) { + String logoutUrl = clientSession.getRedirectUri(); + String serviceTicket = clientSession.getNote(CASLoginProtocol.SESSION_SERVICE_TICKET); + //check if session is fully authenticated (i.e. serviceValidate has been called) + if (serviceTicket != null && !serviceTicket.isEmpty()) { + sendSingleLogoutRequest(logoutUrl, serviceTicket); + } ClientModel client = clientSession.getClient(); new ResourceAdminManager(session).logoutClientSession(uriInfo.getRequestUri(), realm, client, clientSession); } + private void sendSingleLogoutRequest(String logoutUrl, String serviceTicket) { + HttpEntity requestEntity = LogoutHelper.buildSingleLogoutRequest(serviceTicket); + try { + LogoutHelper.postWithRedirect(session, logoutUrl, requestEntity); + logger.debug("Sent CAS single logout for service " + logoutUrl); + } catch (IOException e) { + logger.warn("Failed to call CAS service for logout: " + logoutUrl, e); + } + } + @Override public Response frontchannelLogout(UserSessionModel userSession, ClientSessionModel clientSession) { // todo oidc redirect support -- Gitblit v1.9.1