diff --git a/cli/pom.xml b/cli/pom.xml
index 442099c6d7..384d118be0 100644
--- a/cli/pom.xml
+++ b/cli/pom.xml
@@ -4,7 +4,7 @@
pom
org.jvnet.hudson.main
- 1.373-SNAPSHOT
+ 1.374-SNAPSHOT
cli
Hudson CLI
diff --git a/core/pom.xml b/core/pom.xml
index f0feefa747..bebfe8b62e 100644
--- a/core/pom.xml
+++ b/core/pom.xml
@@ -28,7 +28,7 @@ THE SOFTWARE.
org.jvnet.hudson.main
pom
- 1.373-SNAPSHOT
+ 1.374-SNAPSHOT
../pom.xml
diff --git a/core/src/main/grammar/labelExpr.g b/core/src/main/grammar/labelExpr.g
index e9cefc92b5..bbfa77784e 100644
--- a/core/src/main/grammar/labelExpr.g
+++ b/core/src/main/grammar/labelExpr.g
@@ -76,8 +76,9 @@ options { generateAmbigWarnings=false; }
: LPAREN l=term1 RPAREN
{ l=l.paren(); }
| a:ATOM
- { LabelAtom.isValidName(a.getText()) }?
{ l=LabelAtom.get(a.getText()); }
+ | s:STRINGLITERAL
+ { l=LabelAtom.get(hudson.util.QuotedStringTokenizer.unquote(s.getText())); }
;
class LabelExpressionLexer extends Lexer;
@@ -92,7 +93,7 @@ RPAREN: ")";
protected
IDENTIFIER_PART
- : ~( '&' | '|' | '!' | '<' | '>' | '(' | ')' | ' ' | '\t')
+ : ~( '&' | '|' | '!' | '<' | '>' | '(' | ')' | ' ' | '\t' | '\"' | '\'' )
;
ATOM
@@ -104,3 +105,11 @@ WS
: (' '|'\t')+
{ $setType(Token.SKIP); }
;
+
+STRINGLITERAL
+ : '"'
+ ( '\\' ( 'b' | 't' | 'n' | 'f' | 'r' | '\"' | '\'' | '\\' ) /* escape */
+ | ~( '\\' | '"' | '\r' | '\n' )
+ )*
+ '"'
+ ;
diff --git a/core/src/main/java/hudson/model/AbstractProject.java b/core/src/main/java/hudson/model/AbstractProject.java
index e713fe447d..01fcdcf0d2 100644
--- a/core/src/main/java/hudson/model/AbstractProject.java
+++ b/core/src/main/java/hudson/model/AbstractProject.java
@@ -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
,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
,R extends A
} else {
canRoam = false;
if(l==Hudson.getInstance().getSelfLabel()) assignedNode = null;
- else assignedNode = l.getName();
+ else assignedNode = l.getExpression();
}
save();
}
diff --git a/core/src/main/java/hudson/model/Hudson.java b/core/src/main/java/hudson/model/Hudson.java
index a319fc9955..89245e7e6e 100644
--- a/core/src/main/java/hudson/model/Hudson.java
+++ b/core/src/main/java/hudson/model/Hudson.java
@@ -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, 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, 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);
diff --git a/core/src/main/java/hudson/model/Label.java b/core/src/main/java/hudson/model/Label.java
index ca8f92e665..528c591178 100644
--- a/core/src/main/java/hudson/model/Label.java
+++ b/core/src/main/java/hudson/model/Label.java
@@ -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, ModelObject {
+ /**
+ * Display name of this label.
+ */
protected transient final String name;
private transient volatile Set nodes;
private transient volatile Set clouds;
@@ -92,15 +96,26 @@ public abstract class Label extends Actionable implements Comparable, 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, 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, Mod
Set r = new TreeSet();
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;
}
diff --git a/core/src/main/java/hudson/model/labels/LabelAtom.java b/core/src/main/java/hudson/model/labels/LabelAtom.java
index 51db3ffe36..b9a38b67a0 100644
--- a/core/src/main/java/hudson/model/labels/LabelAtom.java
+++ b/core/src/main/java/hudson/model/labels/LabelAtom.java
@@ -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
All operators are left-associative (i.e., a->b->c <-> (a->b)->c )
An expression can contain whitespace for better readability, and it'll be ignored.
+
+
+ Label names or slave names can be quoted if they contain unsafe characters. For example,
+ "hudson-solaris (Solaris)" || "Windows 2008"
\ No newline at end of file
diff --git a/debian/debian/changelog b/debian/debian/changelog
index 4429e3e18e..4c197882d7 100644
--- a/debian/debian/changelog
+++ b/debian/debian/changelog
@@ -1,3 +1,9 @@
+hudson (1.373) unstable; urgency=low
+
+ * See http://hudson.dev.java.net/changelog.html for more details.
+
+ -- Kohsuke Kawaguchi Mon, 23 Aug 2010 11:01:23 -0700
+
hudson (1.372) unstable; urgency=low
* See http://hudson.dev.java.net/changelog.html for more details.
diff --git a/maven-agent/pom.xml b/maven-agent/pom.xml
index f5fdc7d7e1..477bd57100 100644
--- a/maven-agent/pom.xml
+++ b/maven-agent/pom.xml
@@ -27,7 +27,7 @@ THE SOFTWARE.
org.jvnet.hudson.main
pom
- 1.373-SNAPSHOT
+ 1.374-SNAPSHOT
../pom.xml
diff --git a/maven-interceptor/pom.xml b/maven-interceptor/pom.xml
index 38d32cf5ce..395298be17 100644
--- a/maven-interceptor/pom.xml
+++ b/maven-interceptor/pom.xml
@@ -27,7 +27,7 @@ THE SOFTWARE.
org.jvnet.hudson.main
pom
- 1.373-SNAPSHOT
+ 1.374-SNAPSHOT
../pom.xml
diff --git a/maven-plugin/pom.xml b/maven-plugin/pom.xml
index 81d2ecdf57..8c56392d60 100644
--- a/maven-plugin/pom.xml
+++ b/maven-plugin/pom.xml
@@ -27,7 +27,7 @@ THE SOFTWARE.
org.jvnet.hudson.main
pom
- 1.373-SNAPSHOT
+ 1.374-SNAPSHOT
maven-plugin
diff --git a/pom.xml b/pom.xml
index 3b2ae5eb22..e5a19ba3bb 100644
--- a/pom.xml
+++ b/pom.xml
@@ -33,7 +33,7 @@ THE SOFTWARE.
org.jvnet.hudson.main
pom
- 1.373-SNAPSHOT
+ 1.374-SNAPSHOT
pom
Hudson main module
diff --git a/remoting/pom.xml b/remoting/pom.xml
index 68732774c3..3b54019ae5 100644
--- a/remoting/pom.xml
+++ b/remoting/pom.xml
@@ -27,7 +27,7 @@ THE SOFTWARE.
org.jvnet.hudson.main
pom
- 1.373-SNAPSHOT
+ 1.374-SNAPSHOT
../pom.xml
diff --git a/test/pom.xml b/test/pom.xml
index 831177e897..6e1b279490 100644
--- a/test/pom.xml
+++ b/test/pom.xml
@@ -27,7 +27,7 @@ THE SOFTWARE.
pom
org.jvnet.hudson.main
- 1.373-SNAPSHOT
+ 1.374-SNAPSHOT
4.0.0
org.jvnet.hudson.main
diff --git a/test/src/main/java/org/jvnet/hudson/test/HudsonTestCase.java b/test/src/main/java/org/jvnet/hudson/test/HudsonTestCase.java
index 876cd490ad..4ee7d7b542 100644
--- a/test/src/main/java/org/jvnet/hudson/test/HudsonTestCase.java
+++ b/test/src/main/java/org/jvnet/hudson/test/HudsonTestCase.java
@@ -554,7 +554,7 @@ public abstract class HudsonTestCase extends TestCase implements RootAction {
}
public DumbSlave createSlave(Label l, EnvVars env) throws Exception {
- return createSlave(l==null ? null : l.getName(), env);
+ return createSlave(l==null ? null : l.getExpression(), env);
}
/**
diff --git a/test/src/test/java/hudson/model/labels/LabelExpressionTest.java b/test/src/test/java/hudson/model/labels/LabelExpressionTest.java
index 7248fe4bda..21a10ffbb0 100644
--- a/test/src/test/java/hudson/model/labels/LabelExpressionTest.java
+++ b/test/src/test/java/hudson/model/labels/LabelExpressionTest.java
@@ -26,15 +26,21 @@ package hudson.model.labels;
import antlr.ANTLRException;
import hudson.Launcher;
import hudson.model.AbstractBuild;
+import hudson.model.AbstractProject;
import hudson.model.BuildListener;
import hudson.model.FreeStyleBuild;
import hudson.model.FreeStyleProject;
+import hudson.model.Label;
+import hudson.model.Node.Mode;
import hudson.slaves.DumbSlave;
+import hudson.slaves.RetentionStrategy;
import org.jvnet.hudson.test.HudsonTestCase;
import org.jvnet.hudson.test.SequenceLock;
import org.jvnet.hudson.test.TestBuilder;
import java.io.IOException;
+import java.lang.reflect.Field;
+import java.util.Collections;
import java.util.concurrent.Future;
/**
@@ -135,7 +141,40 @@ public class LabelExpressionTest extends HudsonTestCase {
public void testParserError() throws Exception {
parseShouldFail("foo bar");
- parseShouldFail("foo*bar");
+ parseShouldFail("foo (bar)");
+ }
+
+ public void testLaxParsing() {
+ // this should parse as an atom
+ LabelAtom l = (LabelAtom)hudson.getLabel("lucene.zones.apache.org (Solaris 10)");
+ assertEquals(l.getName(),"lucene.zones.apache.org (Solaris 10)");
+ assertEquals(l.getExpression(),"\"lucene.zones.apache.org (Solaris 10)\"");
+ }
+
+ public void testDataCompatibilityWithHostNameWithWhitespace() throws Exception {
+ DumbSlave slave = new DumbSlave("abc def (xyz) : test", "dummy",
+ createTmpDir().getPath(), "1", Mode.NORMAL, "", createComputerLauncher(null), RetentionStrategy.NOOP, Collections.EMPTY_LIST);
+ hudson.addNode(slave);
+
+
+ FreeStyleProject p = createFreeStyleProject();
+ p.setAssignedLabel(hudson.getLabel("abc def"));
+ assertEquals("abc def",p.getAssignedLabel().getName());
+ assertEquals("\"abc def\"",p.getAssignedLabel().getExpression());
+
+ // expression should be persisted, not the name
+ Field f = AbstractProject.class.getDeclaredField("assignedNode");
+ f.setAccessible(true);
+ assertEquals("\"abc def\"",f.get(p));
+
+ // but if the name is set, we'd still like to parse it
+ f.set(p,"a:b c");
+ assertEquals("a:b c",p.getAssignedLabel().getName());
+ }
+
+ public void testQuote() {
+ Label l = hudson.getLabel("\"abc\\\\\\\"def\"");
+ assertEquals("abc\\\"def",l.getName());
}
/**
@@ -155,7 +194,7 @@ public class LabelExpressionTest extends HudsonTestCase {
private void parseShouldFail(String expr) {
try {
LabelExpression.parseExpression(expr);
- fail();
+ fail(expr + " should fail to parse");
} catch (ANTLRException e) {
// expected
}
diff --git a/ui-samples-plugin/pom.xml b/ui-samples-plugin/pom.xml
index 19227a9ec0..b223266498 100644
--- a/ui-samples-plugin/pom.xml
+++ b/ui-samples-plugin/pom.xml
@@ -27,7 +27,7 @@ THE SOFTWARE.
org.jvnet.hudson.main
pom
- 1.373-SNAPSHOT
+ 1.374-SNAPSHOT
ui-samples-plugin
diff --git a/war/pom.xml b/war/pom.xml
index 50dd35cc65..96e9b06e0a 100644
--- a/war/pom.xml
+++ b/war/pom.xml
@@ -27,7 +27,7 @@ THE SOFTWARE.
org.jvnet.hudson.main
pom
- 1.373-SNAPSHOT
+ 1.374-SNAPSHOT
../pom.xml