From 479960d1eb936460b97ae2f8df21c536590ff08a Mon Sep 17 00:00:00 2001 From: Jacek Kowalski <Jacek@jacekk.info> Date: Mon, 27 Jun 2022 22:16:15 +0000 Subject: [PATCH] Add var project.build.outputTimestamp to enable reproducible builds --- src/main/java/org/keycloak/protocol/cas/CASLoginProtocol.java | 13 +++++++++++-- 1 files changed, 11 insertions(+), 2 deletions(-) diff --git a/src/main/java/org/keycloak/protocol/cas/CASLoginProtocol.java b/src/main/java/org/keycloak/protocol/cas/CASLoginProtocol.java index 14f276a..38d32f3 100644 --- a/src/main/java/org/keycloak/protocol/cas/CASLoginProtocol.java +++ b/src/main/java/org/keycloak/protocol/cas/CASLoginProtocol.java @@ -36,6 +36,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"; @@ -102,7 +103,15 @@ 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(); @@ -150,7 +159,7 @@ } @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); -- Gitblit v1.9.1