From 163aaee92cd9fc610e833d8adc76caef68b9c20d Mon Sep 17 00:00:00 2001
From: Updater Bot <updater@travis-ci.org>
Date: Tue, 11 Sep 2018 17:52:45 +0000
Subject: [PATCH] Update to Keycloak 4.4.0.Final
---
src/main/java/org/keycloak/protocol/cas/endpoints/ValidateEndpoint.java | 48 +++++++++++++++++++++++++++---------------------
1 files changed, 27 insertions(+), 21 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..9e84f0c 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";
@@ -37,13 +37,10 @@
@Context
protected HttpHeaders headers;
- @Context
- protected UriInfo uriInfo;
-
protected RealmModel realm;
protected EventBuilder event;
protected ClientModel client;
- protected ClientSessionModel clientSession;
+ protected AuthenticatedClientSessionModel clientSession;
public ValidateEndpoint(RealmModel realm, EventBuilder event) {
this.realm = realm;
@@ -53,10 +50,10 @@
@GET
@NoCache
public Response build() {
- MultivaluedMap<String, String> params = uriInfo.getQueryParameters();
+ MultivaluedMap<String, String> params = session.getContext().getUri().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);
@@ -83,7 +80,7 @@
}
private void checkSsl() {
- if (!uriInfo.getBaseUri().getScheme().equals("https") && realm.getSslRequired().isRequired(clientConnection)) {
+ if (!session.getContext().getUri().getBaseUri().getScheme().equals("https") && realm.getSslRequired().isRequired(clientConnection)) {
throw new CASValidationException(CASErrorCode.INVALID_REQUEST, "HTTPS required", Response.Status.FORBIDDEN);
}
}
@@ -102,7 +99,7 @@
client = realm.getClients().stream()
.filter(c -> CASLoginProtocol.LOGIN_PROTOCOL.equals(c.getProtocol()))
- .filter(c -> RedirectUtils.verifyRedirectUri(uriInfo, service, realm, c) != null)
+ .filter(c -> RedirectUtils.verifyRedirectUri(session.getContext().getUri(), service, realm, c) != null)
.findFirst().orElse(null);
if (client == null) {
event.error(Errors.CLIENT_NOT_FOUND);
@@ -131,28 +128,37 @@
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);
+ 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