From 0dd6a08579adb4f5a92fc6bc338935a348528e6f Mon Sep 17 00:00:00 2001
From: github-actions <41898282+github-actions[bot]@users.noreply.github.com>
Date: Tue, 21 Feb 2023 08:47:25 +0000
Subject: [PATCH] Update to Keycloak 20.0.5

---
 src/main/java/org/keycloak/protocol/cas/endpoints/AuthorizationEndpoint.java |   16 +++++++++++++++-
 1 files changed, 15 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 2981732..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);
 
@@ -51,6 +58,13 @@
         if (renew) {
             authenticationSession.setClientNote(CASLoginProtocol.RENEW_PARAM, "true");
         }
+        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);
@@ -62,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