nicolabs/ldap-plugin
1
0
Fork 0
mirror of https://github.com/nicolabs/ldap-plugin.git synced 2026-05-06 12:08:12 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

[ZD-21561] Do not make idempotent updates

Browse source 
addProperty() results in a costly save operation, so don't do that unless we think the value has changed.
This is significant because this code gets called every time the user logs in, including every time the HTTP basic auth happens.
This commit is contained in:
Kohsuke Kawaguchi 2014-09-25 11:27:42 -07:00
parent 6ab61de8a9
commit f3fe030951
1 changed files with 5 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
src/main/java/hudson/security/LDAPSecurityRealm.java
View file

@ -37,6 +37,7 @@ import hudson.model.Descriptor;
import hudson.model.User;
import hudson.tasks.MailAddressResolver;
import hudson.tasks.Mailer;
import hudson.tasks.Mailer.UserProperty;
import hudson.util.FormValidation;
import hudson.util.ListBoxModel;
import hudson.util.Scrambler;
@ -688,7 +689,7 @@ public class LDAPSecurityRealm extends AbstractPasswordBasedSecurityRealm {
try {
Attribute attribute = d.getAttributes().get(getDisplayNameAttributeName());
String displayName = attribute == null ? null : (String) attribute.get();
if (StringUtils.isNotBlank(displayName) && u.getId().equals(u.getFullName())) {
if (StringUtils.isNotBlank(displayName) && u.getId().equals(u.getFullName()) && !u.getFullName().equals(displayName)) {
u.setFullName(displayName);
}
} catch (NamingException e) {
@ -699,7 +700,9 @@ public class LDAPSecurityRealm extends AbstractPasswordBasedSecurityRealm {
Attribute attribute = d.getAttributes().get(getMailAddressAttributeName());
String mailAddress = attribute == null ? null : (String) attribute.get();
if (StringUtils.isNotBlank(mailAddress)) {
u.addProperty(new Mailer.UserProperty(mailAddress));
UserProperty existing = u.getProperty(UserProperty.class);
if (existing==null || !existing.hasExplicitlyConfiguredAddress())
u.addProperty(new Mailer.UserProperty(mailAddress));
}
} catch (NamingException e) {
LOGGER.log(Level.FINEST, "Could not retrieve email address attribute", e);