opendev/gerrit
Code Issues Proposed changes

Merge "Detect LDAP misconfiguration and fail earlier"

Browse Source
This commit is contained in:
David Pursehouse 2015-09-16 05:54:40 +00:00 committed by Gerrit Code Review
commit ecbaf100a6
1 changed files with 11 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
gerrit-server/src/main/java/com/google/gerrit/server/auth/ldap/LdapRealm.java
View File

@ -163,6 +163,7 @@ public class LdapRealm extends AbstractRealm {
return null;
} else {
checkBackendCompliance(n, v[0], Strings.isNullOrEmpty(d));
return v[0];
}
}
@ -186,6 +187,16 @@ public class LdapRealm extends AbstractRealm {
}
}
private static void checkBackendCompliance(String configOption,
String suppliedValue, boolean disabledByBackend) {
if (disabledByBackend && !Strings.isNullOrEmpty(suppliedValue)) {
String msg = String.format("LDAP backend doesn't support: ldap.%s",
configOption);
log.error(msg);
throw new IllegalArgumentException(msg);
}
}
@Override
public boolean allowsEdit(final Account.FieldName field) {
return !readOnlyAccountFields.contains(field);