src/main/java/org/keycloak/protocol/cas/endpoints/LogoutEndpoint.java

@@ -4,7 +4,10 @@
import org.jboss.resteasy.annotations.cache.NoCache;
import org.jboss.resteasy.spi.HttpRequest;
import org.keycloak.common.ClientConnection;
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.KeycloakSession;
import org.keycloak.models.RealmModel;
@@ -20,7 +23,7 @@
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(LogoutEndpoint.class);
@@ -37,17 +40,12 @@
    @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) {
    public LogoutEndpoint(RealmModel realm) {
        this.realm = realm;
        this.event = event;
    }

    @GET
@@ -59,13 +57,22 @@
        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);

            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);
            logger.debug("finishing CAS browser logout");
            return response;
        }

        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);
    }

@@ -74,12 +81,12 @@
            return;
        }

        client = realm.getClients().stream()
        client = realm.getClientsStream()
                .filter(c -> CASLoginProtocol.LOGIN_PROTOCOL.equals(c.getProtocol()))
                .filter(c -> RedirectUtils.verifyRedirectUri(uriInfo, service, realm, c) != null)
                .filter(c -> RedirectUtils.verifyRedirectUri(session, service, c) != null)
                .findFirst().orElse(null);
        if (client != null) {
            redirectUri = RedirectUtils.verifyRedirectUri(uriInfo, service, realm, client);
            redirectUri = RedirectUtils.verifyRedirectUri(session, service, client);

            session.getContext().setClient(client);
        }