From 34d1e0b37876155466682ee6ca68e2ede0ed786c Mon Sep 17 00:00:00 2001
From: github-actions <41898282+github-actions[bot]@users.noreply.github.com>
Date: Mon, 20 Feb 2023 08:48:00 +0000
Subject: [PATCH] Update to Keycloak 20.0.4
---
src/main/java/org/keycloak/protocol/cas/endpoints/AuthorizationEndpoint.java | 13 ++++++++++++-
1 files changed, 12 insertions(+), 1 deletions(-)
diff --git a/src/main/java/org/keycloak/protocol/cas/endpoints/AuthorizationEndpoint.java b/src/main/java/org/keycloak/protocol/cas/endpoints/AuthorizationEndpoint.java
index 1526d21..f3cd9fd 100644
--- a/src/main/java/org/keycloak/protocol/cas/endpoints/AuthorizationEndpoint.java
+++ b/src/main/java/org/keycloak/protocol/cas/endpoints/AuthorizationEndpoint.java
@@ -35,6 +35,13 @@
public Response build() {
MultivaluedMap<String, String> params = session.getContext().getUri().getQueryParameters();
String service = params.getFirst(CASLoginProtocol.SERVICE_PARAM);
+
+ boolean isSaml11Request = false;
+ if (service == null && params.containsKey(CASLoginProtocol.TARGET_PARAM)) {
+ // SAML 1.1 authorization uses the TARGET parameter instead of service
+ service = params.getFirst(CASLoginProtocol.TARGET_PARAM);
+ isSaml11Request = true;
+ }
boolean renew = params.containsKey(CASLoginProtocol.RENEW_PARAM);
boolean gateway = params.containsKey(CASLoginProtocol.GATEWAY_PARAM);
@@ -54,6 +61,10 @@
if (gateway) {
authenticationSession.setClientNote(CASLoginProtocol.GATEWAY_PARAM, "true");
}
+ if (isSaml11Request) {
+ // Flag the session so we can return the ticket as "SAMLart" in the response
+ authenticationSession.setClientNote(CASLoginProtocol.TARGET_PARAM, "true");
+ }
this.event.event(EventType.LOGIN);
return handleBrowserAuthenticationRequest(authenticationSession, new CASLoginProtocol(session, realm, session.getContext().getUri(), headers, event), gateway, false);
@@ -65,7 +76,7 @@
throw new ErrorPageException(session, Response.Status.BAD_REQUEST, Messages.MISSING_PARAMETER, CASLoginProtocol.SERVICE_PARAM);
}
- client = realm.getClients().stream()
+ client = realm.getClientsStream()
.filter(c -> CASLoginProtocol.LOGIN_PROTOCOL.equals(c.getProtocol()))
.filter(c -> RedirectUtils.verifyRedirectUri(session, service, c) != null)
.findFirst().orElse(null);
--
Gitblit v1.9.1