Merge pull request #1210 from hashicorp/b-task-dashes

Validate that tasks don't contain slashes
hashicorp · May 28, 2016 · e06aefb · e06aefb
2 parents 47979c4 + e416624
commit e06aefb
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 0 deletions.
diff --git a/nomad/structs/structs.go b/nomad/structs/structs.go
@@ -1741,6 +1741,9 @@ func (t *Task) Validate() error {
 	if t.Name == "" {
 		mErr.Errors = append(mErr.Errors, errors.New("Missing task name"))
 	}
+	if strings.ContainsAny(t.Name, `/\`) {
+		mErr.Errors = append(mErr.Errors, errors.New("Task name can not include slashes"))
+	}
 	if t.Driver == "" {
 		mErr.Errors = append(mErr.Errors, errors.New("Missing task driver"))
 	}

diff --git a/nomad/structs/structs_test.go b/nomad/structs/structs_test.go
@@ -258,6 +258,13 @@ func TestTask_Validate(t *testing.T) {
 		t.Fatalf("err: %s", err)
 	}
 
+	task = &Task{Name: "web/foo"}
+	err = task.Validate()
+	mErr = err.(*multierror.Error)
+	if !strings.Contains(mErr.Errors[0].Error(), "slashes") {
+		t.Fatalf("err: %s", err)
+	}
+
 	task = &Task{
 		Name:   "web",
 		Driver: "docker",