opendev/gerrit
Code Issues Proposed changes

Merge "Expand capabilities of ldap.groupMemberPattern"

Browse Source
This commit is contained in:
Shawn Pearce
2013-08-12 23:41:01 +00:00
committed by Gerrit Code Review
parent 61c3cf69f7 50457503f2
commit f62f573b67
3 changed files with 9 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -197,13 +197,11 @@ import javax.security.auth.login.LoginException;
if (!schema.groupMemberQueryList.isEmpty()) {
final HashMap<String, String> params = new HashMap<String, String>();
if (schema.groupNeedsAccount) {
if (account == null) {
account = findAccount(schema, ctx, username);
}
for (String name : schema.groupMemberQueryList.get(0).getParameters()) {
params.put(name, account.get(name));
}
if (account == null) {
account = findAccount(schema, ctx, username);
}
for (String name : schema.groupMemberQueryList.get(0).getParameters()) {
params.put(name, account.get(name));
}
params.put(LdapRealm.USERNAME, username);
@@ -286,7 +284,6 @@ import javax.security.auth.login.LoginException;
final String accountMemberField;
final List<LdapQuery> accountQueryList;
boolean groupNeedsAccount;
final List<String> groupBases;
final SearchScope groupScope;
final ParameterizedString groupPattern;
@@ -321,10 +318,7 @@ import javax.security.auth.login.LoginException;
}
for (final String name : groupMemberQuery.getParameters()) {
if (!LdapRealm.USERNAME.equals(name)) {
groupNeedsAccount = true;
accountAtts.add(name);
}
accountAtts.add(name);
}
groupMemberQueryList.add(groupMemberQuery);

2
gerrit-server/src/main/java/com/google/gerrit/server/auth/ldap/LdapType.java
View File

@@ -57,7 +57,7 @@ abstract class LdapType {
@Override
String groupMemberPattern() {
return "(memberUid=${username})";
return "(|(memberUid=${username})(gidNumber=${gidNumber}))";
}
@Override