opendev/gerrit
Code Issues Proposed changes

Merge branch 'stable-2.6' into stable-2.7

Browse Source 
* stable-2.6:
  Catch missing LDAP accounts in group membership
  Update patch status before skipping duplicate emails

Conflicts:
	gerrit-server/src/main/java/com/google/gerrit/server/change/Submit.java

Change-Id: If7173d50f09fa799e1cdd02e68b88aab00f1a1d9
This commit is contained in:
Shawn Pearce
2013-11-18 08:41:02 -08:00
parent 6a71917078 5174e35147
commit b3faa893a5
3 changed files with 25 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -198,7 +198,13 @@ import javax.security.auth.login.LoginException;
final HashMap<String, String> params = new HashMap<String, String>();
if (account == null) {
account = findAccount(schema, ctx, username);
try {
account = findAccount(schema, ctx, username);
} catch (AccountException e) {
LdapRealm.log.warn("Account " + username +
" not found, assuming empty group membership");
return Collections.emptySet();
}
}
for (String name : schema.groupMemberQueryList.get(0).getParameters()) {
params.put(name, account.get(name));
@@ -215,7 +221,13 @@ import javax.security.auth.login.LoginException;
if (schema.accountMemberField != null) {
if (account == null) {
account = findAccount(schema, ctx, username);
try {
account = findAccount(schema, ctx, username);
} catch (AccountException e) {
LdapRealm.log.warn("Account " + username +
" not found, assuming empty group membership");
return Collections.emptySet();
}
}
final Attribute groupAtt = account.getAll(schema.accountMemberField);