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/representations/CASServiceResponseAuthenticationSuccess.java | 27 +++++++++++++++------------
1 files changed, 15 insertions(+), 12 deletions(-)
diff --git a/src/main/java/org/keycloak/protocol/cas/representations/CASServiceResponseAuthenticationSuccess.java b/src/main/java/org/keycloak/protocol/cas/representations/CASServiceResponseAuthenticationSuccess.java
index 30a37c6..94d34b1 100644
--- a/src/main/java/org/keycloak/protocol/cas/representations/CASServiceResponseAuthenticationSuccess.java
+++ b/src/main/java/org/keycloak/protocol/cas/representations/CASServiceResponseAuthenticationSuccess.java
@@ -1,21 +1,24 @@
package org.keycloak.protocol.cas.representations;
+import jakarta.xml.bind.annotation.XmlAccessType;
+import jakarta.xml.bind.annotation.XmlAccessorType;
+import jakarta.xml.bind.annotation.XmlElement;
+import jakarta.xml.bind.annotation.XmlElementWrapper;
+import jakarta.xml.bind.annotation.adapters.XmlJavaTypeAdapter;
import org.keycloak.protocol.cas.utils.AttributesMapAdapter;
-import javax.xml.bind.annotation.*;
-import javax.xml.bind.annotation.adapters.XmlJavaTypeAdapter;
import java.util.List;
import java.util.Map;
@XmlAccessorType(XmlAccessType.FIELD)
public class CASServiceResponseAuthenticationSuccess {
private String user;
+ @XmlJavaTypeAdapter(AttributesMapAdapter.class)
+ private Map<String, Object> attributes;
private String proxyGrantingTicket;
@XmlElementWrapper
@XmlElement(name="proxy")
private List<String> proxies;
- @XmlJavaTypeAdapter(AttributesMapAdapter.class)
- private Map<String, Object> attributes;
public String getUser() {
return this.user;
@@ -23,6 +26,14 @@
public void setUser(final String user) {
this.user = user;
+ }
+
+ public Map<String, Object> getAttributes() {
+ return this.attributes;
+ }
+
+ public void setAttributes(final Map<String, Object> attributes) {
+ this.attributes = attributes;
}
public String getProxyGrantingTicket() {
@@ -39,13 +50,5 @@
public void setProxies(final List<String> proxies) {
this.proxies = proxies;
- }
-
- public Map<String, Object> getAttributes() {
- return this.attributes;
- }
-
- public void setAttributes(final Map<String, Object> attributes) {
- this.attributes = attributes;
}
}
--
Gitblit v1.9.1