From 8637a8200ccef6985297b6a8c738f56927bc2d27 Mon Sep 17 00:00:00 2001
From: github-actions <41898282+github-actions[bot]@users.noreply.github.com>
Date: Sat, 16 Dec 2023 08:47:13 +0000
Subject: [PATCH] Update to Keycloak 23.0.3
---
src/main/java/org/keycloak/protocol/cas/endpoints/AbstractValidateEndpoint.java | 30 ++++++++++++------------------
1 files changed, 12 insertions(+), 18 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 dd6e1b3..6ad1ad5 100644
--- a/src/main/java/org/keycloak/protocol/cas/endpoints/AbstractValidateEndpoint.java
+++ b/src/main/java/org/keycloak/protocol/cas/endpoints/AbstractValidateEndpoint.java
@@ -1,8 +1,8 @@
package org.keycloak.protocol.cas.endpoints;
+import jakarta.ws.rs.core.Response;
import org.jboss.logging.Logger;
-import org.jboss.resteasy.spi.HttpRequest;
-import org.keycloak.common.ClientConnection;
+import org.keycloak.events.Details;
import org.keycloak.events.Errors;
import org.keycloak.events.EventBuilder;
import org.keycloak.models.*;
@@ -16,35 +16,27 @@
import org.keycloak.services.managers.AuthenticationManager;
import org.keycloak.services.util.DefaultClientSessionContext;
-import javax.ws.rs.core.Context;
-import javax.ws.rs.core.HttpHeaders;
-import javax.ws.rs.core.Response;
import java.util.HashMap;
import java.util.Map;
import java.util.Set;
+import java.util.stream.Collectors;
public abstract class AbstractValidateEndpoint {
protected final Logger logger = Logger.getLogger(getClass());
- @Context
protected KeycloakSession session;
- @Context
- protected ClientConnection clientConnection;
- @Context
- protected HttpRequest request;
- @Context
- protected HttpHeaders headers;
protected RealmModel realm;
protected EventBuilder event;
protected ClientModel client;
protected AuthenticatedClientSessionModel clientSession;
- public AbstractValidateEndpoint(RealmModel realm, EventBuilder event) {
+ public AbstractValidateEndpoint(KeycloakSession session, RealmModel realm, EventBuilder event) {
+ this.session = session;
this.realm = realm;
this.event = event;
}
protected void checkSsl() {
- if (!session.getContext().getUri().getBaseUri().getScheme().equals("https") && realm.getSslRequired().isRequired(clientConnection)) {
+ if (!session.getContext().getUri().getBaseUri().getScheme().equals("https") && realm.getSslRequired().isRequired(session.getContext().getConnection())) {
throw new CASValidationException(CASErrorCode.INVALID_REQUEST, "HTTPS required", Response.Status.FORBIDDEN);
}
}
@@ -61,9 +53,11 @@
throw new CASValidationException(CASErrorCode.INVALID_REQUEST, "Missing parameter: " + CASLoginProtocol.SERVICE_PARAM, Response.Status.BAD_REQUEST);
}
- client = realm.getClients().stream()
+ event.detail(Details.REDIRECT_URI, service);
+
+ client = realm.getClientsStream()
.filter(c -> CASLoginProtocol.LOGIN_PROTOCOL.equals(c.getProtocol()))
- .filter(c -> RedirectUtils.verifyRedirectUri(session.getContext().getUri(), service, realm, c) != null)
+ .filter(c -> RedirectUtils.verifyRedirectUri(session, service, c) != null)
.findFirst().orElse(null);
if (client == null) {
event.error(Errors.CLIENT_NOT_FOUND);
@@ -153,9 +147,9 @@
protected Map<String, Object> getUserAttributes() {
UserSessionModel userSession = clientSession.getUserSession();
// CAS protocol does not support scopes, so pass null scopeParam
- ClientSessionContext clientSessionCtx = DefaultClientSessionContext.fromClientSessionAndScopeParameter(clientSession, null);
+ ClientSessionContext clientSessionCtx = DefaultClientSessionContext.fromClientSessionAndScopeParameter(clientSession, null, session);
- Set<ProtocolMapperModel> mappings = clientSessionCtx.getProtocolMappers();
+ Set<ProtocolMapperModel> mappings = clientSessionCtx.getProtocolMappersStream().collect(Collectors.toSet());
KeycloakSessionFactory sessionFactory = session.getKeycloakSessionFactory();
Map<String, Object> attributes = new HashMap<>();
for (ProtocolMapperModel mapping : mappings) {
--
Gitblit v1.9.1