Skip to content
Draft
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
48 changes: 48 additions & 0 deletions store/src/java/com/zimbra/cs/account/ldap/LdapProvisioning.java
Original file line number Diff line number Diff line change
Expand Up @@ -9715,7 +9715,55 @@ private void searchZimbraLdap(String base, String query, String[] returnAttrs,
LdapClient.closeContext(zlc);
}
}
////New changes

public List<Account> searchLdapAccountsOnReplica(String base, ZLdapFilter filter, String[] returnAttrs)
throws ServiceException {
List<ZSearchResultEntry> result = searchZimbraLdapReplica(base, filter, returnAttrs, false);
List <Account> accounts = new ArrayList<>();
for (ZSearchResultEntry e : result) {
accounts.add(makeAccount(e.getDN(), e.getAttributes()));
}
return accounts;
}

private List<ZSearchResultEntry> searchZimbraLdapReplica(String base, ZLdapFilter filter,
String[] returnAttrs, boolean useMaster)
throws ServiceException {

ZLdapContext zlc = null;
try {
zlc = LdapClient.getContext(LdapServerType.get(useMaster), LdapUsage.SEARCH);
return searchRawWithContextOnReplica(zlc, base, filter, returnAttrs);
} finally {
LdapClient.closeContext(zlc);
}
}

private List<ZSearchResultEntry> searchRawWithContextOnReplica(ZLdapContext zlc, String base,
ZLdapFilter filter, String[] attrs)
throws ServiceException {
List<ZSearchResultEntry> results = new ArrayList<>();
List<Account> accounts = new ArrayList<>();
try {
ZSearchControls searchControls = ZSearchControls.createSearchControls(
ZSearchScope.SEARCH_SCOPE_SUBTREE,
ZSearchControls.SIZE_UNLIMITED,
attrs
);

ZSearchResultEnumeration enumeration = zlc.searchDir(base, zFilter, searchControls);

while (enumeration.hasMore()) {
results.add(enumeration.next());
}

} catch (Exception e) {
throw ServiceException.FAILURE("Raw LDAP search failed for filter: " + filter, e);
}
return results;
}
//// New changes end
@Override
public void waitForLdapServer() {
LdapClient.waitForLdapServer();
Expand Down
12 changes: 12 additions & 0 deletions store/src/java/com/zimbra/cs/ldap/ZLdapFilterFactory.java
Original file line number Diff line number Diff line change
Expand Up @@ -190,6 +190,10 @@ public static enum FilterId {
ZMCONFIGD("ZMCONFIGD"),

TODO("TODO"),
ALL_COS_FILTER(SINGLETON.allCOSFilter()),
ALL_DOMAIN_FILTER(SINGLETON.allDomainFilter()),
GLOBAL_CONFIG_FILTER(SINGLETON.globalConfigFilter()),
ALL_ACCOUNTS_FILTER(SINGLETON.allAccountsFilter()),

/*
* Licensing
Expand Down Expand Up @@ -571,4 +575,12 @@ public abstract ZLdapFilter velodromeAllCalendarResourcesByDomainAndServer(
* HAB
*/
public abstract ZLdapFilter habOrgUnitByName(String name);

public abstract ZLdapFilter allCOSFilter();

public abstract ZLdapFilter allDomainFilter();

public abstract ZLdapFilter globalConfigFilter();

public abstract ZLdapFilter allAccountsFilter();
}
Original file line number Diff line number Diff line change
Expand Up @@ -1669,4 +1669,47 @@ public ZLdapFilter addressListByName(String name) {
Filter.createEqualityFilter(Provisioning.A_uid, name),
FILTER_ALL_ADDRESS_LISTS));
}

public ZLdapFilter allCOSFilter() {
return new UBIDLdapFilter(
FilterId.ALL_COS_FILTER,
Filter.createEqualityFilter(
LdapConstants.ATTR_objectClass, "zimbraCOS"));
}

public ZLdapFilter allDomainFilter () {
return new UBIDLdapFilter(
FilterId.ALL_DOMAIN_FILTER,
Filter.createEqualityFilter(
LdapConstants.ATTR_objectClass, "zimbraDomain"));
}

public ZLdapFilter globalConfigFilter() {
return new UBIDLdapFilter(
FilterId.GLOBAL_CONFIG_FILTER,
Filter.createEqualityFilter(
LdapConstants.ATTR_objectClass, "zimbraGlobalConfig"));
}

public ZLdapFilter allAccountsFilter() {
return new UBIDLdapFilter(
FilterId.ALL_ACCOUNTS_FILTER,
Filter.createEqualityFilter(
LdapConstants.ATTR_objectClass, "zimbraAccount"));
}

// accountExceptionsFilter = Filter.createANDFilter(
// Filter.createNOTFilter(Filter.createEqualityFilter(ACCOUNT_TYPE_ATTRS.SYSTEM_ACCOUNT.getValue(),
// UsageCollectorConstants.TRUE_STR)),
// Filter.createNOTFilter(Filter.createEqualityFilter(ACCOUNT_TYPE_ATTRS.SYSTEM_RES.getValue(),
// UsageCollectorConstants.TRUE_STR)),
// Filter.createNOTFilter(Filter.createEqualityFilter(UsageCollectorConstants.OBJECT_CLASS,
// OBJECT_CLASSES.CAL_RESOURCE.getValue())),
// Filter.createNOTFilter(Filter.createEqualityFilter(ACCOUNT_TYPE_ATTRS.EXT_VIRTUAL_ACCOUNT.getValue(),
// UsageCollectorConstants.TRUE_STR)));
//
// allInternalAccountsFilter = Filter.createANDFilter(allAccountsFilter, accountExceptionsFilter);
//
// defaultCOSDomainFilter = Filter.createANDFilter(
// Filter.createNOTFilter(Filter.createPresenceFilter(UsageCollectorConstants.ZIMBRA_DOMAIN_DEFUALT_COS_ID)), allDomainFilter);

Copy link
Copy Markdown

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

🚫 [checkstyle] <com.puppycrawl.tools.checkstyle.checks.regexp.RegexpSinglelineJavaCheck> reported by reviewdog 🐶
Line exceeds 120 characters in comments

Copy link
Copy Markdown

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

🚫 [checkstyle] <com.puppycrawl.tools.checkstyle.checks.sizes.LineLengthCheck> reported by reviewdog 🐶
Line is longer than 120 characters (found 138).

}