From bba8bfec21d26bc06fe25a3b2ecb827b80fc0fb1 Mon Sep 17 00:00:00 2001
From: Jacek Kowalski <Jacek@jacekk.info>
Date: Wed, 28 Jun 2023 10:55:12 +0000
Subject: [PATCH] GitHub Actions: add "contents: write" permission for update-deps job
---
src/main/java/org/keycloak/protocol/cas/CASLoginProtocol.java | 52 ++++++++++++++++++++++++++++++++++++++--------------
1 files changed, 38 insertions(+), 14 deletions(-)
diff --git a/src/main/java/org/keycloak/protocol/cas/CASLoginProtocol.java b/src/main/java/org/keycloak/protocol/cas/CASLoginProtocol.java
index c79ddc8..0317f0d 100644
--- a/src/main/java/org/keycloak/protocol/cas/CASLoginProtocol.java
+++ b/src/main/java/org/keycloak/protocol/cas/CASLoginProtocol.java
@@ -4,6 +4,7 @@
import org.jboss.logging.Logger;
import org.keycloak.common.util.KeycloakUriBuilder;
import org.keycloak.common.util.Time;
+import org.keycloak.events.Details;
import org.keycloak.events.EventBuilder;
import org.keycloak.events.EventType;
import org.keycloak.forms.login.LoginFormsProvider;
@@ -12,6 +13,7 @@
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.ErrorPage;
import org.keycloak.services.managers.ResourceAdminManager;
import org.keycloak.sessions.AuthenticationSessionModel;
@@ -35,6 +37,7 @@
public static final String FORMAT_PARAM = "format";
public static final String TICKET_RESPONSE_PARAM = "ticket";
+ public static final String SAMLART_RESPONSE_PARAM = "SAMLart";
public static final String SERVICE_TICKET_PREFIX = "ST-";
public static final String SESSION_SERVICE_TICKET = "service_ticket";
@@ -95,13 +98,22 @@
String service = authSession.getRedirectUri();
//TODO validate service
- OAuth2Code codeData = new OAuth2Code(UUID.randomUUID(),
+ OAuth2Code codeData = new OAuth2Code(UUID.randomUUID().toString(),
Time.currentTime() + userSession.getRealm().getAccessCodeLifespan(),
- null, null, authSession.getRedirectUri(), null, null);
+ null, null, authSession.getRedirectUri(), null, null,
+ userSession.getId());
String code = OAuth2CodeParser.persistCode(session, clientSession, codeData);
KeycloakUriBuilder uriBuilder = KeycloakUriBuilder.fromUri(service);
- uriBuilder.queryParam(TICKET_RESPONSE_PARAM, SERVICE_TICKET_PREFIX + code);
+
+ String loginTicket = SERVICE_TICKET_PREFIX + code;
+
+ if (authSession.getClientNotes().containsKey(CASLoginProtocol.TARGET_PARAM)) {
+ // This was a SAML 1.1 auth request so return the ticket ID as "SAMLart" instead of "ticket"
+ uriBuilder.queryParam(SAMLART_RESPONSE_PARAM, loginTicket);
+ } else {
+ uriBuilder.queryParam(TICKET_RESPONSE_PARAM, loginTicket);
+ }
URI redirectUri = uriBuilder.build();
@@ -111,11 +123,16 @@
@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
- public void backchannelLogout(UserSessionModel userSession, AuthenticatedClientSessionModel clientSession) {
+ public Response 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)
@@ -123,12 +140,13 @@
sendSingleLogoutRequest(logoutUrl, serviceTicket);
}
ClientModel client = clientSession.getClient();
- new ResourceAdminManager(session).logoutClientSession(uriInfo.getRequestUri(), realm, client, clientSession);
+ new ResourceAdminManager(session).logoutClientSession(realm, client, clientSession);
+ return Response.ok().build();
}
private void sendSingleLogoutRequest(String logoutUrl, String serviceTicket) {
- HttpEntity requestEntity = LogoutHelper.buildSingleLogoutRequest(serviceTicket);
try {
+ HttpEntity requestEntity = LogoutHelper.buildSingleLogoutRequest(serviceTicket);
LogoutHelper.postWithRedirect(session, logoutUrl, requestEntity);
logger.debug("Sent CAS single logout for service " + logoutUrl);
} catch (IOException e) {
@@ -143,19 +161,25 @@
}
@Override
- public Response finishLogout(UserSessionModel userSession) {
+ public Response finishBrowserLogout(UserSessionModel userSession, AuthenticationSessionModel logoutSession) {
String redirectUri = userSession.getNote(CASLoginProtocol.LOGOUT_REDIRECT_URI);
- event.event(EventType.LOGOUT);
- event.user(userSession.getUser()).session(userSession).success();
+ event.event(EventType.LOGOUT)
+ .user(userSession.getUser())
+ .session(userSession)
+ .detail(Details.USERNAME, userSession.getUser().getUsername());
if (redirectUri != null) {
+ event.detail(Details.REDIRECT_URI, redirectUri);
+ event.success();
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();
}
+
+ event.success();
+
+ LoginFormsProvider infoPage = session.getProvider(LoginFormsProvider.class).setSuccess("Logout successful");
+ infoPage.setAttribute("skipLink", true);
+ return infoPage.createInfoPage();
}
@Override
--
Gitblit v1.9.1