From 1cf376b3768c36548320e52b0d08391d75833af0 Mon Sep 17 00:00:00 2001
From: Matthias Piepkorn <mpiepk@gmail.com>
Date: Tue, 14 Nov 2017 19:53:17 +0000
Subject: [PATCH] prepare next development version

---
 src/main/java/org/keycloak/protocol/cas/endpoints/ValidateEndpoint.java |   64 ++++++++++++++++++++++++--------
 1 files changed, 48 insertions(+), 16 deletions(-)

diff --git a/src/main/java/org/keycloak/protocol/cas/endpoints/ValidateEndpoint.java b/src/main/java/org/keycloak/protocol/cas/endpoints/ValidateEndpoint.java
index 28fbd50..c250578 100644
--- a/src/main/java/org/keycloak/protocol/cas/endpoints/ValidateEndpoint.java
+++ b/src/main/java/org/keycloak/protocol/cas/endpoints/ValidateEndpoint.java
@@ -18,9 +18,10 @@
 
 import javax.ws.rs.GET;
 import javax.ws.rs.core.*;
+import java.lang.reflect.Method;
 
 public class ValidateEndpoint {
-    protected static final Logger logger = Logger.getLogger(org.keycloak.protocol.oidc.endpoints.LogoutEndpoint.class);
+    protected static final Logger logger = Logger.getLogger(ValidateEndpoint.class);
 
     private static final String RESPONSE_OK = "yes\n";
     private static final String RESPONSE_FAILED = "no\n";
@@ -43,7 +44,7 @@
     protected RealmModel realm;
     protected EventBuilder event;
     protected ClientModel client;
-    protected ClientSessionModel clientSession;
+    protected AuthenticatedClientSessionModel clientSession;
 
     public ValidateEndpoint(RealmModel realm, EventBuilder event) {
         this.realm = realm;
@@ -56,7 +57,7 @@
         MultivaluedMap<String, String> params = uriInfo.getQueryParameters();
         String service = params.getFirst(CASLoginProtocol.SERVICE_PARAM);
         String ticket = params.getFirst(CASLoginProtocol.TICKET_PARAM);
-        boolean renew = "true".equalsIgnoreCase(params.getFirst(CASLoginProtocol.RENEW_PARAM));
+        boolean renew = params.containsKey(CASLoginProtocol.RENEW_PARAM);
 
         event.event(EventType.CODE_TO_TOKEN);
 
@@ -131,28 +132,59 @@
 
         String code = ticket.substring(CASLoginProtocol.SERVICE_TICKET_PREFIX.length());
 
-        ClientSessionCode.ParseResult parseResult = ClientSessionCode.parseResult(code, session, realm);
-        if (parseResult.isClientSessionNotFound() || parseResult.isIllegalHash()) {
-            String[] parts = code.split("\\.");
-            if (parts.length == 2) {
-                event.detail(Details.CODE_ID, parts[1]);
-            }
+        String[] parts = code.split("\\.");
+        if (parts.length == 4) {
+            event.detail(Details.CODE_ID, parts[2]);
+        }
+
+        ClientSessionCode.ParseResult<AuthenticatedClientSessionModel> parseResult;
+        try {
+            // Keycloak >3.4 branch: Parameter event was added to ClientSessionCode.parseResult
+            Method parseResultMethod = ClientSessionCode.class.getMethod("parseResult",
+                    String.class, KeycloakSession.class, RealmModel.class, EventBuilder.class, Class.class);
+            parseResult = (ClientSessionCode.ParseResult<AuthenticatedClientSessionModel>) parseResultMethod.invoke(
+                    null, code, session, realm, event, AuthenticatedClientSessionModel.class);
+        } catch (ReflectiveOperationException e) {
+            // Keycloak <=3.3 branch
+            parseResult = ClientSessionCode.parseResult(code, session, realm, AuthenticatedClientSessionModel.class);
+        }
+        if (parseResult.isAuthSessionNotFound() || parseResult.isIllegalHash()) {
             event.error(Errors.INVALID_CODE);
-            if (parseResult.getClientSession() != null) {
-                session.sessions().removeClientSession(realm, parseResult.getClientSession());
+
+            // Attempt to use same code twice should invalidate existing clientSession
+            AuthenticatedClientSessionModel clientSession = parseResult.getClientSession();
+            if (clientSession != null) {
+                clientSession.setUserSession(null);
             }
+
             throw new CASValidationException(CASErrorCode.INVALID_TICKET, "Code not valid", Response.Status.BAD_REQUEST);
         }
 
         clientSession = parseResult.getClientSession();
-        event.detail(Details.CODE_ID, clientSession.getId());
 
-        if (!parseResult.getCode().isValid(ClientSessionModel.Action.CODE_TO_TOKEN.name(), ClientSessionCode.ActionType.CLIENT)) {
-            event.error(Errors.INVALID_CODE);
-            throw new CASValidationException(CASErrorCode.INVALID_TICKET, "Code is expired", Response.Status.BAD_REQUEST);
+        try {
+            // Keycloak >3.4 branch: Method isExpiredToken was added
+            Method isExpiredToken = ClientSessionCode.ParseResult.class.getMethod("isExpiredToken");
+            if ((Boolean) isExpiredToken.invoke(parseResult)) {
+                event.error(Errors.EXPIRED_CODE);
+                throw new CASValidationException(CASErrorCode.INVALID_TICKET, "Code is expired", Response.Status.BAD_REQUEST);
+            }
+        } catch (ReflectiveOperationException e) {
+            // Keycloak <=3.3 branch
+            if (!parseResult.getCode().isValid(AuthenticatedClientSessionModel.Action.CODE_TO_TOKEN.name(), ClientSessionCode.ActionType.CLIENT)) {
+                event.error(Errors.INVALID_CODE);
+                throw new CASValidationException(CASErrorCode.INVALID_TICKET, "Code is expired", Response.Status.BAD_REQUEST);
+            }
+
+            parseResult.getCode().setAction(null);
         }
 
-        parseResult.getCode().setAction(null);
+        clientSession.setNote(CASLoginProtocol.SESSION_SERVICE_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);
+        }
 
         UserSessionModel userSession = clientSession.getUserSession();
 

--
Gitblit v1.9.1