Merge branch 'rm1759' into 'master'

rm1759: fix group synchronization See merge request shared/runawfe-professional-server!131
processtech · Aug 2, 2020 · 24bc0ed · 24bc0ed
2 parents 0f9c54b + c7f8d51
commit 24bc0ed
Showing 1 changed file with 23 additions and 6 deletions.
diff --git a/wfe-core/src/main/java/ru/runa/wfe/security/logic/LdapLogic.java b/wfe-core/src/main/java/ru/runa/wfe/security/logic/LdapLogic.java
@@ -254,13 +254,30 @@ private int synchronizeGroups(DirContext dirContext, Map<String, Actor> actorsBy
         controls.setSearchScope(SearchControls.SUBTREE_SCOPE);
         Map<String, SearchResult> groupResultsByDistinguishedName = Maps.newHashMap();
         for (String ou : LdapProperties.getSynchronizationOrganizationUnits()) {
-            NamingEnumeration<SearchResult> list = dirContext.search(ou, OBJECT_CLASS_GROUP_FILTER, controls);
-            while (list.hasMore()) {
-                SearchResult searchResult = list.next();
-                if (searchResult.getAttributes().get(ATTR_GROUP_MEMBER) == null) {
-                    continue;
+            try {
+                NamingEnumeration<SearchResult> list = dirContext.search(ou, OBJECT_CLASS_GROUP_FILTER, controls);
+                while (list.hasMore()) {
+                    SearchResult searchResult = list.next();
+                    if (searchResult.getAttributes().get(ATTR_GROUP_MEMBER) == null) {
+                        continue;
+                    }
+                    groupResultsByDistinguishedName.put(searchResult.getNameInNamespace(), searchResult);
+                }
+                list.close();
+            } catch (SizeLimitExceededException e) {
+                for (String y : ALPHABETS) {
+                    NamingEnumeration<SearchResult> list = dirContext.search(ou,
+                            MessageFormat.format(LOGIN_FIRST_LETTER_FILTER, ATTR_GROUP_NAME, y, y.toLowerCase(), OBJECT_CLASS_GROUP_FILTER),
+                            controls);
+                    while (list.hasMore()) {
+                        SearchResult searchResult = list.next();
+                        if (searchResult.getAttributes().get(ATTR_GROUP_MEMBER) == null) {
+                            continue;
+                        }
+                        groupResultsByDistinguishedName.put(searchResult.getNameInNamespace(), searchResult);
+                    }
+                    list.close();
                 }
-                groupResultsByDistinguishedName.put(searchResult.getNameInNamespace(), searchResult);
             }
         }
         for (SearchResult searchResult : groupResultsByDistinguishedName.values()) {