From b3e128c6ef0d71e22ca917d582702d71160dbdbb Mon Sep 17 00:00:00 2001
From: Jacek Kowalski <Jacek@jacekk.info>
Date: Tue, 03 Nov 2026 21:04:42 +0000
Subject: [PATCH] Store single logout ticket only after successful validation

---
 src/main/java/org/keycloak/protocol/cas/endpoints/AbstractValidateEndpoint.java |   50 ++++++++++++++++++++++++++++++++++++++++----------
 1 files changed, 40 insertions(+), 10 deletions(-)

diff --git a/src/main/java/org/keycloak/protocol/cas/endpoints/AbstractValidateEndpoint.java b/src/main/java/org/keycloak/protocol/cas/endpoints/AbstractValidateEndpoint.java
index afc9c2c..6a93fac 100644
--- a/src/main/java/org/keycloak/protocol/cas/endpoints/AbstractValidateEndpoint.java
+++ b/src/main/java/org/keycloak/protocol/cas/endpoints/AbstractValidateEndpoint.java
@@ -18,6 +18,7 @@
 import org.keycloak.services.managers.UserSessionCrossDCManager;
 import org.keycloak.services.util.DefaultClientSessionContext;
 
+import java.net.URI;
 import java.nio.charset.StandardCharsets;
 import java.util.HashMap;
 import java.util.HexFormat;
@@ -27,15 +28,25 @@
 import java.util.UUID;
 import java.util.regex.Pattern;
 import java.util.stream.Collectors;
+import org.apache.http.client.HttpClient;
+import org.apache.http.client.config.RequestConfig;
 import org.apache.http.client.utils.URIBuilder;
 import org.apache.http.client.methods.HttpGet;
 import org.apache.http.HttpResponse;
-import org.apache.http.impl.client.HttpClientBuilder;
+import org.apache.http.util.EntityUtils;
+import org.keycloak.connections.httpclient.HttpClientProvider;
 
 public abstract class AbstractValidateEndpoint {
     protected final Logger logger = Logger.getLogger(getClass());
     private static final Pattern DOT = Pattern.compile("\\.");
     private static final Pattern SEPERATION_PATTERN = Pattern.compile("--");
+    private static final int PGT_CALLBACK_TIMEOUT_MS = 5000;
+    private static final RequestConfig PGT_CALLBACK_REQUEST_CONFIG = RequestConfig.custom()
+            .setConnectTimeout(PGT_CALLBACK_TIMEOUT_MS)
+            .setConnectionRequestTimeout(PGT_CALLBACK_TIMEOUT_MS)
+            .setSocketTimeout(PGT_CALLBACK_TIMEOUT_MS)
+            .setRedirectsEnabled(false)
+            .build();
     protected KeycloakSession session;
     protected RealmModel realm;
     protected EventBuilder event;
@@ -175,8 +186,6 @@
             throw new CASValidationException(CASErrorCode.INVALID_SERVICE, "Ticket was not issued for this service", Response.Status.BAD_REQUEST);
         }
 
-        clientSession.setNote(CASLoginProtocol.SESSION_TICKET, ticket);
-
         if (requireReauth && AuthenticationManager.isSSOAuthentication(clientSession)) {
             event.error(Errors.SESSION_EXPIRED);
             throw new CASValidationException(CASErrorCode.INVALID_TICKET, "Interactive authentication was requested but not performed", Response.Status.BAD_REQUEST);
@@ -215,28 +224,49 @@
             throw new CASValidationException(CASErrorCode.INVALID_TICKET, "Session not active", Response.Status.BAD_REQUEST);
         }
 
+        // Single logout refers to the service ticket the client session was established with
+        if (prefix.equals(CASLoginProtocol.SERVICE_TICKET_PREFIX)) {
+            clientSession.setNote(CASLoginProtocol.SESSION_TICKET, ticket);
+        }
     }
 
     protected void createProxyGrant(String pgtUrl) {
-        if ( RedirectUtils.verifyRedirectUri(session, pgtUrl, client) == null ) {
+        String verifiedPgtUrl = RedirectUtils.verifyRedirectUri(session, pgtUrl, client);
+        if (verifiedPgtUrl == null) {
             event.error(Errors.INVALID_REQUEST);
             throw new CASValidationException(CASErrorCode.INVALID_PROXY_CALLBACK, "Proxy callback is invalid", Response.Status.BAD_REQUEST);
         }
 
+        // The callback receives a PGT, so require HTTPS unless the realm's "Require SSL" setting allows plain HTTP for the host
+        URI pgtUri = URI.create(verifiedPgtUrl);
+        boolean isHttps = "https".equalsIgnoreCase(pgtUri.getScheme());
+        boolean isHttp = "http".equalsIgnoreCase(pgtUri.getScheme());
+        if (pgtUri.getHost() == null || !(isHttps || (isHttp && !realm.getSslRequired().isRequired(pgtUri.getHost())))) {
+            event.error(Errors.INVALID_REQUEST);
+            throw new CASValidationException(CASErrorCode.INVALID_PROXY_CALLBACK, "Proxy callback must use HTTPS", Response.Status.BAD_REQUEST);
+        }
+
         String pgtIou = getPGTIOU();
-        String pgtId  = getPGT(session, clientSession, pgtUrl);
+        String pgtId  = getPGT(session, clientSession, verifiedPgtUrl);
 
         try {
-            HttpResponse response = HttpClientBuilder.create().build().execute(
-                new HttpGet(new URIBuilder(pgtUrl).setParameter("pgtIou",pgtIou).setParameter("pgtId",pgtId).build())
-            );
+            HttpGet request = new HttpGet(new URIBuilder(verifiedPgtUrl).setParameter("pgtIou",pgtIou).setParameter("pgtId",pgtId).build());
+            request.setConfig(PGT_CALLBACK_REQUEST_CONFIG);
 
-            if (response.getStatusLine().getStatusCode() != 200) {
-                throw new Exception();
+            HttpClient httpClient = session.getProvider(HttpClientProvider.class).getHttpClient();
+            HttpResponse response = httpClient.execute(request);
+            try {
+                if (response.getStatusLine().getStatusCode() != 200) {
+                    throw new Exception();
+                }
+            } finally {
+                EntityUtils.consumeQuietly(response.getEntity());
             }
 
             this.pgtIou = pgtIou;
         } catch (Exception e) {
+            // The PGT was not delivered, so do not leave it usable
+            session.singleUseObjects().remove(pgtId.substring(0, pgtId.indexOf("--")));
             event.error(Errors.INVALID_REQUEST);
             throw new CASValidationException(CASErrorCode.PROXY_CALLBACK_ERROR, "Proxy callback returned an error", Response.Status.BAD_REQUEST);
         }

--
Gitblit v1.10.0