From b8d686069c3249e4bd11eb5eef95f5bd51ea58fb Mon Sep 17 00:00:00 2001
From: Matthias Piepkorn <mpiepk@gmail.com>
Date: Sun, 17 Jun 2018 10:13:40 +0000
Subject: [PATCH] update for KEYCLOAK-6630 Client scopes initial support
---
src/main/java/org/keycloak/protocol/cas/endpoints/ValidateEndpoint.java | 32 ++++++++++++++++++--------------
1 files changed, 18 insertions(+), 14 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 edfa129..6145334 100644
--- a/src/main/java/org/keycloak/protocol/cas/endpoints/ValidateEndpoint.java
+++ b/src/main/java/org/keycloak/protocol/cas/endpoints/ValidateEndpoint.java
@@ -20,7 +20,7 @@
import javax.ws.rs.core.*;
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 +43,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;
@@ -131,28 +131,32 @@
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 = ClientSessionCode.parseResult(code, null, session, realm, client, event, 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.detachFromUserSession();
}
+
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);
+ if (parseResult.isExpiredToken()) {
+ event.error(Errors.EXPIRED_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);
if (requireReauth && AuthenticationManager.isSSOAuthentication(clientSession)) {
event.error(Errors.SESSION_EXPIRED);
--
Gitblit v1.9.1