opendev/gerrit
Code Issues Proposed changes

Merge "Improve LDAP login times, transfer 40x less data."

Browse Source
This commit is contained in:
Shawn Pearce
2015-01-30 05:47:36 +00:00
committed by Gerrit Code Review
parent 964f6b8ff6 f1c813ae7f
commit ad84028093
1 changed files with 6 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
gerrit-server/src/main/java/com/google/gerrit/server/auth/ldap/Helper.java
View File

@@ -279,7 +279,8 @@ import javax.security.auth.login.LoginException;
try {
final Name compositeGroupName = new CompositeName().add(groupDN);
final Attribute in =
ctx.getAttributes(compositeGroupName).get(schema.accountMemberField);
ctx.getAttributes(compositeGroupName, schema.accountMemberFieldArray)
.get(schema.accountMemberField);
if (in != null) {
final NamingEnumeration<?> groups = in.getAll();
try {
@@ -308,6 +309,7 @@ import javax.security.auth.login.LoginException;
final ParameterizedString accountEmailAddress;
final ParameterizedString accountSshUserName;
final String accountMemberField;
final String[] accountMemberFieldArray;
final List<LdapQuery> accountQueryList;
final List<String> groupBases;
@@ -372,7 +374,10 @@ import javax.security.auth.login.LoginException;
accountMemberField =
LdapRealm.optdef(config, "accountMemberField", type.accountMemberField());
if (accountMemberField != null) {
accountMemberFieldArray = new String[] {accountMemberField};
accountAtts.add(accountMemberField);
} else {
accountMemberFieldArray = null;
}
final SearchScope accountScope = LdapRealm.scope(config, "accountScope");