From b8b4e25d5f1197f3a5af8cbcc1fee291fd3b7af2 Mon Sep 17 00:00:00 2001
From: github-actions <41898282+github-actions[bot]@users.noreply.github.com>
Date: Sat, 19 Dec 2020 08:55:25 +0000
Subject: [PATCH] Update to Keycloak 12.0.1
---
src/main/java/org/keycloak/protocol/cas/CASLoginProtocol.java | 34 ++++++++++++++++++++++++----------
1 files changed, 24 insertions(+), 10 deletions(-)
diff --git a/src/main/java/org/keycloak/protocol/cas/CASLoginProtocol.java b/src/main/java/org/keycloak/protocol/cas/CASLoginProtocol.java
index a1afb9d..53f0a32 100644
--- a/src/main/java/org/keycloak/protocol/cas/CASLoginProtocol.java
+++ b/src/main/java/org/keycloak/protocol/cas/CASLoginProtocol.java
@@ -3,13 +3,16 @@
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.protocol.cas.utils.LogoutHelper;
-import org.keycloak.services.managers.ClientSessionCode;
+import org.keycloak.protocol.oidc.utils.OAuth2Code;
+import org.keycloak.protocol.oidc.utils.OAuth2CodeParser;
+import org.keycloak.services.ErrorPage;
import org.keycloak.services.managers.ResourceAdminManager;
import org.keycloak.sessions.AuthenticationSessionModel;
@@ -18,6 +21,7 @@
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);
@@ -25,6 +29,7 @@
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";
@@ -85,14 +90,17 @@
}
@Override
- public Response authenticated(UserSessionModel userSession, ClientSessionContext clientSessionCtx) {
+ public Response authenticated(AuthenticationSessionModel authSession, UserSessionModel userSession, ClientSessionContext clientSessionCtx) {
AuthenticatedClientSessionModel clientSession = clientSessionCtx.getClientSession();
- ClientSessionCode<AuthenticatedClientSessionModel> accessCode = new ClientSessionCode<>(session, realm, clientSession);
- String service = clientSession.getRedirectUri();
+ String service = authSession.getRedirectUri();
//TODO validate service
- String code = accessCode.getOrGenerateCode();
+ 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 + code);
@@ -104,7 +112,12 @@
@Override
public Response sendError(AuthenticationSessionModel authSession, Error error) {
- return Response.serverError().entity(error).build();
+ if (authSession.getClientNotes().containsKey(CASLoginProtocol.GATEWAY_PARAM)) {
+ if (error == Error.PASSIVE_INTERACTION_REQUIRED || error == Error.PASSIVE_LOGIN_REQUIRED) {
+ return Response.status(302).location(URI.create(authSession.getRedirectUri())).build();
+ }
+ }
+ return ErrorPage.error(session, authSession, Response.Status.INTERNAL_SERVER_ERROR, error.name());
}
@Override
@@ -116,7 +129,7 @@
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) {
@@ -141,13 +154,14 @@
event.event(EventType.LOGOUT);
event.user(userSession.getUser()).session(userSession).success();
- LoginFormsProvider infoPage = session.getProvider(LoginFormsProvider.class).setSuccess("Logout successful");
+
if (redirectUri != null) {
- infoPage.setAttribute("pageRedirectUri", redirectUri);
+ 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();
}
- return infoPage.createInfoPage();
}
@Override
--
Gitblit v1.9.1