From b92028de86e6b25a87c12ff34ae00338a455308d Mon Sep 17 00:00:00 2001
From: Laurent Meunier <lme@atolcd.com>
Date: Fri, 21 Jun 2024 11:50:28 +0000
Subject: [PATCH] Fix NPE in backchannel logout
---
src/main/java/org/keycloak/protocol/cas/CASLoginProtocolService.java | 49 +++++++++++++++++--------------------------------
1 files changed, 17 insertions(+), 32 deletions(-)
diff --git a/src/main/java/org/keycloak/protocol/cas/CASLoginProtocolService.java b/src/main/java/org/keycloak/protocol/cas/CASLoginProtocolService.java
index 861742a..a985901 100644
--- a/src/main/java/org/keycloak/protocol/cas/CASLoginProtocolService.java
+++ b/src/main/java/org/keycloak/protocol/cas/CASLoginProtocolService.java
@@ -1,34 +1,22 @@
package org.keycloak.protocol.cas;
-import org.jboss.resteasy.spi.HttpRequest;
-import org.jboss.resteasy.spi.ResteasyProviderFactory;
+import jakarta.ws.rs.Path;
+import jakarta.ws.rs.core.Response;
+import jakarta.ws.rs.core.UriBuilder;
import org.keycloak.events.EventBuilder;
import org.keycloak.models.KeycloakSession;
import org.keycloak.models.RealmModel;
-import org.keycloak.protocol.cas.endpoints.AuthorizationEndpoint;
-import org.keycloak.protocol.cas.endpoints.LogoutEndpoint;
-import org.keycloak.protocol.cas.endpoints.ServiceValidateEndpoint;
-import org.keycloak.protocol.cas.endpoints.ValidateEndpoint;
+import org.keycloak.protocol.cas.endpoints.*;
import org.keycloak.services.resources.RealmsResource;
-import javax.ws.rs.Path;
-import javax.ws.rs.core.*;
-
public class CASLoginProtocolService {
+ private KeycloakSession session;
private RealmModel realm;
private EventBuilder event;
- @Context
- private KeycloakSession session;
-
- @Context
- private HttpHeaders headers;
-
- @Context
- private HttpRequest request;
-
- public CASLoginProtocolService(RealmModel realm, EventBuilder event) {
- this.realm = realm;
+ public CASLoginProtocolService(KeycloakSession session, EventBuilder event) {
+ this.session = session;
+ this.realm = session.getContext().getRealm();
this.event = event;
}
@@ -38,30 +26,27 @@
@Path("login")
public Object login() {
- AuthorizationEndpoint endpoint = new AuthorizationEndpoint(realm, event);
- ResteasyProviderFactory.getInstance().injectProperties(endpoint);
- return endpoint;
+ return new AuthorizationEndpoint(session, event);
}
@Path("logout")
public Object logout() {
- LogoutEndpoint endpoint = new LogoutEndpoint(realm, event);
- ResteasyProviderFactory.getInstance().injectProperties(endpoint);
- return endpoint;
+ return new LogoutEndpoint(session, realm);
}
@Path("validate")
public Object validate() {
- ValidateEndpoint endpoint = new ValidateEndpoint(realm, event);
- ResteasyProviderFactory.getInstance().injectProperties(endpoint);
- return endpoint;
+ return new ValidateEndpoint(session, realm, event);
+ }
+
+ @Path("samlValidate")
+ public Object validateSaml11() {
+ return new SamlValidateEndpoint(session, realm, event);
}
@Path("serviceValidate")
public Object serviceValidate() {
- ServiceValidateEndpoint endpoint = new ServiceValidateEndpoint(realm, event);
- ResteasyProviderFactory.getInstance().injectProperties(endpoint);
- return endpoint;
+ return new ServiceValidateEndpoint(session, realm, event);
}
@Path("proxyValidate")
--
Gitblit v1.9.1