Make sure the component resolves to a UPConfig before cloning it

Closes keycloak#26308
tnorimat · Jan 18, 2024 · 62020ff · 62020ff
1 parent 70b4c6b
commit 62020ff
Showing 1 changed file with 7 additions and 2 deletions.
diff --git a/services/src/main/java/org/keycloak/userprofile/DeclarativeUserProfileProvider.java b/services/src/main/java/org/keycloak/userprofile/DeclarativeUserProfileProvider.java
@@ -201,8 +201,13 @@ public UPConfig getConfiguration() {
         Optional<ComponentModel> component = getComponentModel();
 
         if (component.isPresent()) {
-            UPConfig cfg = getConfigFromComponentModel(component.get()).clone();
-            return cfg == null ? parsedDefaultRawConfig.clone() : cfg;
+            UPConfig cfg = getConfigFromComponentModel(component.get());
+
+            if (cfg == null) {
+                cfg = parsedDefaultRawConfig;
+            }
+
+            return cfg.clone();
         }
 
         return parsedDefaultRawConfig.clone();