From 1fba7a0a60eac476992fd81a00a8248749835601 Mon Sep 17 00:00:00 2001
From: github-actions <41898282+github-actions[bot]@users.noreply.github.com>
Date: Wed, 03 Jun 2020 08:43:40 +0000
Subject: [PATCH] Update to Keycloak 10.0.2
---
src/main/java/org/keycloak/protocol/cas/CASLoginProtocol.java | 71 +++++++++++++++++++++++++++++------
1 files changed, 58 insertions(+), 13 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..4557c7a 100644
--- a/src/main/java/org/keycloak/protocol/cas/CASLoginProtocol.java
+++ b/src/main/java/org/keycloak/protocol/cas/CASLoginProtocol.java
@@ -1,22 +1,34 @@
package org.keycloak.protocol.cas;
+import org.apache.http.HttpEntity;
+import org.jboss.logging.Logger;
import org.keycloak.common.util.KeycloakUriBuilder;
+import org.keycloak.common.util.Time;
import org.keycloak.events.EventBuilder;
import org.keycloak.events.EventType;
+import org.keycloak.forms.login.LoginFormsProvider;
import org.keycloak.models.*;
import org.keycloak.protocol.LoginProtocol;
-import org.keycloak.services.managers.ClientSessionCode;
+import org.keycloak.protocol.cas.utils.LogoutHelper;
+import org.keycloak.protocol.oidc.utils.OAuth2Code;
+import org.keycloak.protocol.oidc.utils.OAuth2CodeParser;
import org.keycloak.services.managers.ResourceAdminManager;
+import org.keycloak.sessions.AuthenticationSessionModel;
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;
+import java.util.UUID;
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";
+ public static final String TARGET_PARAM = "TARGET";
public static final String RENEW_PARAM = "renew";
public static final String GATEWAY_PARAM = "gateway";
public static final String TICKET_PARAM = "ticket";
@@ -25,6 +37,9 @@
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";
+
+ public static final String LOGOUT_REDIRECT_URI = "CAS_LOGOUT_REDIRECT_URI";
protected KeycloakSession session;
protected RealmModel realm;
@@ -74,14 +89,19 @@
}
@Override
- public Response authenticated(UserSessionModel userSession, ClientSessionCode accessCode) {
- ClientSessionModel clientSession = accessCode.getClientSession();
+ public Response authenticated(AuthenticationSessionModel authSession, UserSessionModel userSession, ClientSessionContext clientSessionCtx) {
+ AuthenticatedClientSessionModel clientSession = clientSessionCtx.getClientSession();
- String service = clientSession.getRedirectUri();
+ String service = authSession.getRedirectUri();
//TODO validate service
- accessCode.setAction(ClientSessionModel.Action.CODE_TO_TOKEN.name());
+
+ OAuth2Code codeData = new OAuth2Code(UUID.randomUUID(),
+ Time.currentTime() + userSession.getRealm().getAccessCodeLifespan(),
+ null, null, authSession.getRedirectUri(), null, null);
+ String code = OAuth2CodeParser.persistCode(session, clientSession, codeData);
+
KeycloakUriBuilder uriBuilder = KeycloakUriBuilder.fromUri(service);
- uriBuilder.queryParam(TICKET_RESPONSE_PARAM, SERVICE_TICKET_PREFIX + accessCode.getCode());
+ uriBuilder.queryParam(TICKET_RESPONSE_PARAM, SERVICE_TICKET_PREFIX + code);
URI redirectUri = uriBuilder.build();
@@ -90,32 +110,57 @@
}
@Override
- public Response sendError(ClientSessionModel clientSession, Error error) {
+ public Response sendError(AuthenticationSessionModel authSession, Error error) {
return Response.serverError().entity(error).build();
}
@Override
- public void backchannelLogout(UserSessionModel userSession, ClientSessionModel clientSession) {
+ public void backchannelLogout(UserSessionModel userSession, AuthenticatedClientSessionModel 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);
+ new ResourceAdminManager(session).logoutClientSession(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) {
+ public Response frontchannelLogout(UserSessionModel userSession, AuthenticatedClientSessionModel clientSession) {
// todo oidc redirect support
throw new RuntimeException("NOT IMPLEMENTED");
}
@Override
public Response finishLogout(UserSessionModel userSession) {
+ String redirectUri = userSession.getNote(CASLoginProtocol.LOGOUT_REDIRECT_URI);
+
event.event(EventType.LOGOUT);
event.user(userSession.getUser()).session(userSession).success();
- return Response.ok().build();
+
+ if (redirectUri != null) {
+ return Response.status(302).location(URI.create(redirectUri)).build();
+ } else {
+ LoginFormsProvider infoPage = session.getProvider(LoginFormsProvider.class).setSuccess("Logout successful");
+ infoPage.setAttribute("skipLink", true);
+ return infoPage.createInfoPage();
+ }
}
@Override
- public boolean requireReauthentication(UserSessionModel userSession, ClientSessionModel clientSession) {
- return "true".equals(clientSession.getNote(CASLoginProtocol.RENEW_PARAM));
+ public boolean requireReauthentication(UserSessionModel userSession, AuthenticationSessionModel authSession) {
+ return "true".equals(authSession.getClientNote(CASLoginProtocol.RENEW_PARAM));
}
@Override
--
Gitblit v1.9.1