root
/
jenkins
mirror of https://github.com/jenkinsci/jenkins.git
1
0
Fork 0
Code Issues Actions 2 Packages Projects Releases Wiki Activity

[FIXED HUDSON-3964] Can escape characters in username to make an ID, but retain the original form for display & email purposes. 

git-svn-id: https://hudson.dev.java.net/svn/hudson/trunk/hudson/main@19322 71c3de6d-444a-0410-be80-ed276b4c234a
This commit is contained in:
jglick 2009-06-30 16:31:44 +00:00
parent 1e9cc3b4e3
commit aad955d515
2 changed files with 14 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

23
core/src/main/java/hudson/model/User.java
View File

@ -40,7 +40,6 @@ import net.sf.json.JSONObject;
import org.acegisecurity.Authentication;
import org.acegisecurity.providers.anonymous.AnonymousAuthenticationToken;
import org.kohsuke.stapler.Stapler;
import org.kohsuke.stapler.StaplerRequest;
import org.kohsuke.stapler.StaplerResponse;
import org.kohsuke.stapler.export.Exported;
@ -104,9 +103,9 @@ public class User extends AbstractModelObject implements AccessControlled, Savea
private volatile List<UserProperty> properties = new ArrayList<UserProperty>();
private User(String id) {
private User(String id, String fullName) {
this.id = id;
this.fullName = id; // fullName defaults to name
this.fullName = fullName;
load();
}
@ -257,7 +256,7 @@ public class User extends AbstractModelObject implements AccessControlled, Savea
}
/**
* Gets the {@link User} object by its id.
* Gets the {@link User} object by its id or full name.
*
* @param create
* If true, this method will never return null for valid input
@ -265,15 +264,15 @@ public class User extends AbstractModelObject implements AccessControlled, Savea
* If false, this method will return null if {@link User} object
* with the given name doesn't exist.
*/
public static User get(String id, boolean create) {
if(id==null)
public static User get(String idOrFullName, boolean create) {
if(idOrFullName==null)
return null;
id = id.replace('\\', '_').replace('/', '_').replace('<','_');
String id = idOrFullName.replace('\\', '_').replace('/', '_').replace('<','_');
synchronized(byName) {
User u = byName.get(id);
if(u==null && create) {
u = new User(id);
u = new User(id, idOrFullName);
byName.put(id,u);
}
return u;
@ -281,10 +280,10 @@ public class User extends AbstractModelObject implements AccessControlled, Savea
}
/**
* Gets the {@link User} object by its id.
* Gets the {@link User} object by its id or full name.
*/
public static User get(String id) {
return get(id,true);
public static User get(String idOrFullName) {
return get(idOrFullName,true);
}
/**
@ -370,7 +369,7 @@ public class User extends AbstractModelObject implements AccessControlled, Savea
return r;
}
public String toString() {
public @Override String toString() {
return fullName;
}

6
core/src/main/java/hudson/tasks/MailAddressResolver.java
View File

@ -88,13 +88,13 @@ public abstract class MailAddressResolver implements ExtensionPoint {
}
// fall back logic
String extractedAddress = extractAddressFromId(u.getId());
String extractedAddress = extractAddressFromId(u.getFullName());
if (extractedAddress != null)
return extractedAddress;
if(u.getId().contains("@"))
if(u.getFullName().contains("@"))
// this already looks like an e-mail ID
return u.getId();
return u.getFullName();
String ds = Mailer.descriptor().getDefaultSuffix();
if(ds!=null)