From e073d331fdba9a030d644aeec9ed2cda0ad4f594 Mon Sep 17 00:00:00 2001 From: James Nord Date: Wed, 20 Apr 2016 18:54:07 +0100 Subject: [PATCH] [FIXED SECURITY-243] Prefer resolving users by IDs first and foremost. When looking up users we must always try to use the id first and fallback to other methods only if this is unsucessful. --- core/src/main/java/hudson/model/User.java | 45 +++++++++++++++++++++++ 1 file changed, 45 insertions(+) diff --git a/core/src/main/java/hudson/model/User.java b/core/src/main/java/hudson/model/User.java index 85e4df752b..36ea3ab5d4 100644 --- a/core/src/main/java/hudson/model/User.java +++ b/core/src/main/java/hudson/model/User.java @@ -52,6 +52,8 @@ import org.acegisecurity.providers.anonymous.AnonymousAuthenticationToken; import org.acegisecurity.userdetails.UserDetails; import org.acegisecurity.userdetails.UsernameNotFoundException; import org.springframework.dao.DataAccessException; +import org.kohsuke.accmod.Restricted; +import org.kohsuke.accmod.restrictions.NoExternalUse; import org.kohsuke.stapler.StaplerRequest; import org.kohsuke.stapler.StaplerResponse; import org.kohsuke.stapler.export.Exported; @@ -996,6 +998,49 @@ public class User extends AbstractModelObject implements AccessControlled, Descr } } + + /** + * Resolve user ID from id. + * @since TODO + */ + @Extension + @Restricted(NoExternalUse.class) + public static class UserIDCanonicalIdResolver extends User.CanonicalIdResolver { + + @Override + public String resolveCanonicalId(String idOrFullName, Map context) { + // use the same as DefaultUserCanonicalIdResolver + String _id = idOrFullName.replace('\\', '_').replace('/', '_').replace('<','_') + .replace('>', '_'); // 4 replace() still faster than regex + Jenkins j = Jenkins.getInstance(); + if (j == null) { + return null; + } + IdStrategy userIdStrategy = j.getSecurityRealm().getUserIdStrategy(); + Collection users = User.getAll(); + for (User u : users) { + if (userIdStrategy.equals(u.getId(), _id)) { + return u.getId(); + } + } + + // XXX I have seen files created in AD that are in the form DOMAIN\User so not sure why they get through but lets also try those... + for (User u : users) { + if (userIdStrategy.equals(u.getId(), idOrFullName)) { + return u.getId(); + } + } + return null; + } + + @Override + public int getPriority() { + // should always come first so that ID that are ids get mapped correctly + return Integer.MAX_VALUE; + } + + } + /** * Jenkins now refuses to let the user login if he/she doesn't exist in {@link SecurityRealm}, * which was necessary to make sure users removed from the backend will get removed from the frontend.