From 1293d5189bfdc7c46fc456f52126b81febf23df8 Mon Sep 17 00:00:00 2001
From: Matthias Piepkorn <mpiepk@gmail.com>
Date: Mon, 22 Jan 2018 12:00:27 +0000
Subject: [PATCH] remove dependency on internal SAML packages
---
src/main/java/org/keycloak/protocol/cas/endpoints/ValidateEndpoint.java | 32 +++++++++++++++++++++++++++-----
1 files changed, 27 insertions(+), 5 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 ed9d5fa..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,6 +18,7 @@
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(ValidateEndpoint.class);
@@ -136,7 +137,17 @@
event.detail(Details.CODE_ID, parts[2]);
}
- ClientSessionCode.ParseResult<AuthenticatedClientSessionModel> parseResult = ClientSessionCode.parseResult(code, session, realm, AuthenticatedClientSessionModel.class);
+ 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);
@@ -151,13 +162,24 @@
clientSession = parseResult.getClientSession();
- 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);
+ 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);
}
clientSession.setNote(CASLoginProtocol.SESSION_SERVICE_TICKET, ticket);
- parseResult.getCode().setAction(null);
if (requireReauth && AuthenticationManager.isSSOAuthentication(clientSession)) {
event.error(Errors.SESSION_EXPIRED);
--
Gitblit v1.10.0