Merged revisions 34000-34001,34005,34007,34038 via svnmerge from

https://www.dev.java.net/svn/hudson/branches/rc

........
  r34000 | kohsuke | 2010-08-20 14:16:13 -0700 (Fri, 20 Aug 2010) | 2 lines
  
  [FIXED HUDSON-7216]
  Fixed a 1.372 regression in handling whitespace and other characters in label names.
........
  r34001 | kohsuke | 2010-08-20 14:26:55 -0700 (Fri, 20 Aug 2010) | 1 line
  
  foo*bar parses just like foo-bar parses OK.
........
  r34005 | kohsuke | 2010-08-20 20:08:26 -0700 (Fri, 20 Aug 2010) | 1 line
  
  [maven-release-plugin] prepare release hudson-1_373
........
  r34007 | kohsuke | 2010-08-20 20:08:40 -0700 (Fri, 20 Aug 2010) | 1 line
  
  [maven-release-plugin] prepare for next development iteration
........
  r34038 | kohsuke | 2010-08-23 11:02:55 -0700 (Mon, 23 Aug 2010) | 1 line
  
  updated changelog as a part of the release
........


git-svn-id: https://hudson.dev.java.net/svn/hudson/trunk/hudson/main@34118 71c3de6d-444a-0410-be80-ed276b4c234a
This commit is contained in:
kohsuke committed 2010-08-26 01:50:31 +00:00
1 parent 1baf25e939
commit 7320ce252f
20 files changed
+138 -34

No files matched your search

@@ -43,6 +43,8 @@ import hudson.model.Fingerprint.RangeSet;
import hudson.model.Queue.Executable;
import hudson.model.Queue.WaitingItem;
import hudson.model.RunMap.Constructor;
import hudson.model.labels.LabelAtom;
import hudson.model.labels.LabelExpression;
import hudson.model.queue.CauseOfBlockage;
import hudson.scm.ChangeLogSet;
import hudson.scm.ChangeLogSet.Entry;
@@ -299,8 +301,14 @@ public abstract class AbstractProject<P extends AbstractProject<P,R>,R extends A
* Gets the textual representation of the assigned label as it was entered by the user.
*/
public String getAssignedLabelString() {
if (canRoam) return null;
return assignedNode;
if (canRoam || assignedNode==null) return null;
try {
LabelExpression.parseExpression(assignedNode);
return assignedNode;
} catch (ANTLRException e) {
// must be old label or host name that includes whitespace or other unsafe chars
return LabelAtom.escape(assignedNode);
}
}
/**
@@ -313,7 +321,7 @@ public abstract class AbstractProject<P extends AbstractProject<P,R>,R extends A
} else {
canRoam = false;
if(l==Hudson.getInstance().getSelfLabel()) assignedNode = null;
else assignedNode = l.getName();
else assignedNode = l.getExpression();
}
save();
}
+2 -6
View File
@@ -76,7 +76,6 @@ import hudson.remoting.LocalChannel;
import hudson.remoting.VirtualChannel;
import hudson.scm.RepositoryBrowser;
import hudson.scm.SCM;
import hudson.scm.SCMDescriptor;
import hudson.search.CollectionSearchIndex;
import hudson.search.SearchIndexBuilder;
import hudson.security.ACL;
@@ -105,8 +104,6 @@ import hudson.tasks.BuildWrapper;
import hudson.tasks.Builder;
import hudson.tasks.Mailer;
import hudson.tasks.Publisher;
import hudson.tools.ToolDescriptor;
import hudson.tools.ToolInstallation;
import hudson.triggers.Trigger;
import hudson.triggers.TriggerDescriptor;
import hudson.util.AdministrativeError;
@@ -1378,7 +1375,8 @@ public final class Hudson extends Node implements ItemGroup<TopLevelItem>, Stapl
try {
labels.putIfAbsent(expr,Label.parseExpression(expr));
} catch (ANTLRException e) {
throw new IllegalArgumentException("Invalid label expression: "+expr,e);
// laxly accept it as a single label atom for backward compatibility
return getLabelAtom(expr);
}
}
}
@@ -1388,8 +1386,6 @@ public final class Hudson extends Node implements ItemGroup<TopLevelItem>, Stapl
*/
public LabelAtom getLabelAtom(String name) {
if (name==null) return null;
if (!LabelAtom.isValidName(name))
throw new IllegalArgumentException("Illegal character in a token: "+name);
while(true) {
Label l = labels.get(name);
+19 -4
View File
@@ -34,6 +34,7 @@ import hudson.model.labels.LabelExpressionParser;
import hudson.model.labels.LabelOperatorPrecedence;
import hudson.slaves.NodeProvisioner;
import hudson.slaves.Cloud;
import hudson.util.QuotedStringTokenizer;
import hudson.util.VariableResolver;
import org.kohsuke.stapler.export.Exported;
import org.kohsuke.stapler.export.ExportedBean;
@@ -62,6 +63,9 @@ import com.thoughtworks.xstream.io.HierarchicalStreamReader;
*/
@ExportedBean
public abstract class Label extends Actionable implements Comparable<Label>, ModelObject {
/**
* Display name of this label.
*/
protected transient final String name;
private transient volatile Set<Node> nodes;
private transient volatile Set<Cloud> clouds;
@@ -92,15 +96,26 @@ public abstract class Label extends Actionable implements Comparable<Label>, Mod
this.nodeProvisioner = new NodeProvisioner(this, loadStatistics);
}
/**
* Alias for {@link #getDisplayName()}.
*/
@Exported
public String getName() {
return name;
public final String getName() {
return getDisplayName();
}
/**
* Returns a human-readable text that represents this label.
*/
public String getDisplayName() {
return name;
}
/**
* Returns a label expression that represents this label.
*/
public abstract String getExpression();
/**
* Relative URL from the context path, that ends with '/'.
*/
@@ -425,7 +440,7 @@ public abstract class Label extends Actionable implements Comparable<Label>, Mod
public void marshal(Object source, HierarchicalStreamWriter writer, MarshallingContext context) {
Label src = (Label) source;
writer.setValue(src.getName());
writer.setValue(src.getExpression());
}
public Object unmarshal(HierarchicalStreamReader reader, final UnmarshallingContext context) {
@@ -447,7 +462,7 @@ public abstract class Label extends Actionable implements Comparable<Label>, Mod
Set<LabelAtom> r = new TreeSet<LabelAtom>();
labels = fixNull(labels);
if(labels.length()>0)
for( String l : labels.split(" +"))
for( String l : new QuotedStringTokenizer(labels).toArray())
r.add(Hudson.getInstance().getLabelAtom(l));
return r;
}
@@ -31,9 +31,11 @@ import hudson.model.Descriptor.FormException;
import hudson.model.Failure;
import hudson.model.Hudson;
import hudson.model.Label;
import hudson.model.Messages;
import hudson.model.Saveable;
import hudson.model.listeners.SaveableListener;
import hudson.util.DescribableList;
import hudson.util.QuotedStringTokenizer;
import hudson.util.VariableResolver;
import org.kohsuke.stapler.StaplerRequest;
import org.kohsuke.stapler.StaplerResponse;
@@ -66,6 +68,14 @@ public class LabelAtom extends Label implements Saveable {
load();
}
/**
* If the label contains 'unsafe' chars, escape them.
*/
@Override
public String getExpression() {
return escape(name);
}
/**
* {@inheritDoc}
*
@@ -189,14 +199,26 @@ public class LabelAtom extends Label implements Saveable {
return Hudson.getInstance().getLabelAtom(l);
}
public static boolean isValidName(String name) {
public static boolean needsEscape(String name) {
try {
Hudson.checkGoodName(name);
return true;
} catch (Failure failure) {
// additional restricted chars
for( int i=0; i<name.length(); i++ ) {
char ch = name.charAt(i);
if(" ()\t\n".indexOf(ch)!=-1)
return true;
}
return false;
} catch (Failure failure) {
return true;
}
}
public static String escape(String name) {
if (needsEscape(name))
return QuotedStringTokenizer.quote(name);
return name;
}
private static final Logger LOGGER = Logger.getLogger(LabelAtom.class.getName());
}
@@ -37,6 +37,11 @@ public abstract class LabelExpression extends Label {
super(name);
}
@Override
public String getExpression() {
return getDisplayName();
}
public static class Not extends LabelExpression {
private final Label base;
@@ -63,7 +68,7 @@ public abstract class LabelExpression extends Label {
private final Label base;
public Paren(Label base) {
super('('+base.getName()+')');
super('('+base.getExpression()+')');
this.base = base;
}
@@ -83,8 +88,8 @@ public abstract class LabelExpression extends Label {
*/
static String paren(LabelOperatorPrecedence op, Label l) {
if (op.compareTo(l.precedence())<0)
return '('+l.getName()+')';
return l.getName();
return '('+l.getExpression()+')';
return l.getExpression();
}
public static abstract class Binary extends LabelExpression {