Don't insert ou=pairwiseIdentifiers tree node into persistence which …

…not supports tree model #1233
GluuFederation · Jan 22, 2020 · 0c0a179 · 0c0a179
1 parent d4a9dda
commit 0c0a179
Show file tree

Hide file tree

Showing 3 changed files with 18 additions and 8 deletions.
diff --git a/Server/src/main/java/org/gluu/oxauth/service/PairwiseIdentifierService.java b/Server/src/main/java/org/gluu/oxauth/service/PairwiseIdentifierService.java
@@ -1,12 +1,5 @@
 package org.gluu.oxauth.service;
 
-import java.net.URI;
-import java.util.List;
-
-import javax.ejb.Stateless;
-import javax.inject.Inject;
-import javax.inject.Named;
-
 import org.gluu.oxauth.model.common.PairwiseIdType;
 import org.gluu.oxauth.model.configuration.AppConfiguration;
 import org.gluu.oxauth.model.util.SubjectIdentifierGenerator;
@@ -16,7 +9,12 @@
 import org.gluu.util.StringHelper;
 import org.oxauth.persistence.model.PairwiseIdentifier;
 import org.slf4j.Logger;
-import org.gluu.oxauth.service.UserService;
+
+import javax.ejb.Stateless;
+import javax.inject.Inject;
+import javax.inject.Named;
+import java.net.URI;
+import java.util.List;
 
 /**
  * @author Javier Rojas Blum
@@ -51,6 +49,10 @@ public boolean containsBranch(final String userInum) {
     }
 
     public void prepareBranch(final String userInum) {
+        if (!ldapEntryManager.hasBranchesSupport(userService.getDnForUser(userInum))) {
+            return;
+        }
+
         // Create pairwise identifier branch if needed
         if (!containsBranch(userInum)) {
             addBranch(userInum);

diff --git a/Server/src/main/java/org/gluu/oxauth/uma/service/UmaPctService.java b/Server/src/main/java/org/gluu/oxauth/uma/service/UmaPctService.java
@@ -147,6 +147,10 @@ public void remove(List<UmaPCT> pctList) {
     }
 
     private void prepareBranch() {
+        if (!ldapEntryManager.hasBranchesSupport(branchBaseDn())) {
+            return;
+        }
+
         if (!ldapEntryManager.contains(branchBaseDn(), SimpleBranch.class)) {
             addBranch();
         }

diff --git a/Server/src/main/java/org/gluu/oxauth/uma/service/UmaResourceService.java b/Server/src/main/java/org/gluu/oxauth/uma/service/UmaResourceService.java
@@ -182,6 +182,10 @@ public Set<String> getResourceScopes(Set<String> resourceIds) {
     }
 
     private void prepareBranch() {
+        if (!ldapEntryManager.hasBranchesSupport(getDnForResource(null))) {
+            return;
+        }
+
         // Create resource description branch if needed
         if (!ldapEntryManager.contains(getDnForResource(null), SimpleBranch.class)) {
             addBranch();